summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-05-13 04:08:22 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-05-13 04:08:22 +0000
commitaf87d2873bcaaf5a93ccf25da80aa670f89fbe96 (patch)
tree42180666994be8f497d5312e8bcc44bd9c690f7e
parent00b75e94fdb3eedea225ff1192972db1a46c09bd (diff)
Tue May 13 04:03:53 UTC 2014
-rw-r--r--community/cinnamon-control-center/PKGBUILD6
-rw-r--r--community/cinnamon-desktop/PKGBUILD4
-rw-r--r--community/cinnamon-session/PKGBUILD6
-rw-r--r--community/doublecmd/PKGBUILD10
-rw-r--r--community/fcron/PKGBUILD11
-rw-r--r--community/kchmviewer/PKGBUILD18
-rw-r--r--community/kchmviewer/kchmviewer-build.patch23
-rw-r--r--community/kchmviewer/kchmviewer.changelog3
-rw-r--r--community/libfm/PKGBUILD24
-rw-r--r--community/libfm/hide-lxshortcut.patch22
-rw-r--r--community/libfm/libfm.install1
-rw-r--r--community/lxterminal/PKGBUILD35
-rw-r--r--community/lxterminal/fix-keybinds.patch183
-rw-r--r--community/lxterminal/shift-keybinds.patch39
-rw-r--r--community/menu-cache/PKGBUILD7
-rw-r--r--community/muffin/PKGBUILD6
-rw-r--r--community/pcmanfm/PKGBUILD12
-rw-r--r--community/tinc/PKGBUILD6
-rw-r--r--community/wireshark/PKGBUILD8
-rw-r--r--community/wxcam/PKGBUILD8
-rw-r--r--community/xnee/PKGBUILD8
-rw-r--r--community/xnee/xnee.changelog3
-rw-r--r--community/yaml-cpp/PKGBUILD7
-rw-r--r--extra/dovecot/PKGBUILD15
-rw-r--r--extra/dovecot/pop3_Access_sequence_numbers_correctly.diff36
-rw-r--r--extra/evolution-data-server/PKGBUILD8
-rw-r--r--extra/evolution/PKGBUILD7
-rw-r--r--extra/gtk3/PKGBUILD8
-rw-r--r--extra/libkscreen/PKGBUILD15
-rw-r--r--extra/libkscreen/fix-crash.patch53
-rw-r--r--extra/libomxil-bellagio/PKGBUILD38
-rw-r--r--extra/libomxil-bellagio/fedora-fixes.patch199
-rw-r--r--extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch121
-rw-r--r--extra/libxcb/PKGBUILD13
-rw-r--r--extra/mpd/PKGBUILD6
-rw-r--r--extra/perl-net-dns/PKGBUILD8
-rw-r--r--extra/pigeonhole/PKGBUILD8
37 files changed, 730 insertions, 255 deletions
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index c767eb8a9..7f2fd3391 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110561 2014-05-03 17:43:28Z faidoc $
+# $Id: PKGBUILD 111019 2014-05-12 01:26:13Z bgyorgy $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Based on gnome-control-center:
# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Jan de Groot <jgc@archlinux.org>
pkgname=cinnamon-control-center
-pkgver=2.2.4
+pkgver=2.2.7
pkgrel=1
pkgdesc="The Control Center for Cinnamon"
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ install=cinnamon-control-center.install
license=('GPL')
options=('!emptydirs')
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz")
-sha256sums=('cf3acbe6776398b2aa7b6519f21790c1b8ba7f62487dd062d89fd9f27cfce007')
+sha256sums=('9585a9920e91561d7f4d7a85fe4d3321835d685ca6cbcb1e62c5c1b1d140dfbd')
build() {
cd $pkgname-$pkgver
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
index 331786b65..9619d8faa 100644
--- a/community/cinnamon-desktop/PKGBUILD
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan de Groot <jan@archlinux.org>
pkgname=cinnamon-desktop
-pkgver=2.2.1
+pkgver=2.2.2
pkgrel=1
pkgdesc="Library with common API for various Cinnamon modules"
arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common)
url="https://github.com/linuxmint/cinnamon-desktop"
install=cinnamon-desktop.install
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
-sha256sums=('241b9649b6152a8437fe6f6d2174a1a1d2bb790b1087c557273f36a7aed357a1')
+sha256sums=('2680cc35b89e4e89bc78cbd11310a0efb1e6b42be628238585ddf8b121480db3')
build() {
cd $pkgname-$pkgver
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
index f921c56f9..6400707b9 100644
--- a/community/cinnamon-session/PKGBUILD
+++ b/community/cinnamon-session/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=cinnamon-session
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
pkgdesc="The Cinnamon Session Handler"
arch=(i686 x86_64)
license=(GPL LGPL)
@@ -15,7 +15,7 @@ install=cinnamon-session.install
url="https://github.com/linuxmint/cinnamon-session"
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
timeout.patch)
-sha256sums=('b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae'
+sha256sums=('357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e'
'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
prepare() {
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD
index bc7a16698..27623d62a 100644
--- a/community/doublecmd/PKGBUILD
+++ b/community/doublecmd/PKGBUILD
@@ -1,13 +1,13 @@
# vim:set ft=sh:
-# $Id: PKGBUILD 110953 2014-05-10 14:08:22Z idevolder $
+# $Id: PKGBUILD 111060 2014-05-12 18:14:23Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: (sirocco AT ngs.ru)
pkgbase=doublecmd
pkgname=('doublecmd-gtk2' 'doublecmd-qt')
-pkgver=0.5.9
+pkgver=0.5.10
_helpver=0.5.5
-pkgrel=2
+pkgrel=1
url="http://doublecmd.sourceforge.net/"
arch=('i686' 'x86_64')
license=('GPL')
@@ -71,6 +71,6 @@ package_doublecmd-qt() {
cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
}
-sha256sums=('d5b3c93b3029f4b0a45b7c9912d34f753445e031c93bc0268d4cb4c313d06ba4'
+sha256sums=('cc54a2d973836f46f6f99fff1b8dd631bc96d8aa8524c3cd9cfc60b0c7a3dc12'
'5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf'
- '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20')
+ '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20')
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index f43d56671..c13927264 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96423 2013-08-28 15:04:05Z seblu $
+# $Id: PKGBUILD 111045 2014-05-12 10:09:29Z seblu $
# Contributor: Giorgio Lando <lando at imap dot cc>
# Contributor: Sergej Pupykin
# Contributor: Thomas Bächler
@@ -6,8 +6,8 @@
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=fcron
-pkgver=3.1.2
-pkgrel=8
+pkgver=3.1.3
+pkgrel=1
pkgdesc='Feature-rich cron implementation'
arch=(i686 x86_64)
url='http://fcron.free.fr'
@@ -29,7 +29,7 @@ options=('emptydirs' '!makeflags')
install=$pkgname.install
source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
'systab.orig')
-md5sums=('36bf213e15f3a480f2274f8e46cced0a'
+md5sums=('b58ce88344eb4c80a353066547d20a24'
'afecbfd98caa49e8e4aa239fa1b19255')
build() {
@@ -70,6 +70,9 @@ package() {
install -d -m755 "$pkgdir/etc/cron.monthly"
install -d -m755 "$pkgdir/etc/cron.weekly"
+ # remove docs
+ rm -r "$pkgdir/usr/share/doc"
+
# avoid conflict with filesystem>=2012.06
rmdir "$pkgdir"/{var/,}run
diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD
index 3a41d670c..c43a8f4ae 100644
--- a/community/kchmviewer/PKGBUILD
+++ b/community/kchmviewer/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 85365 2013-03-01 10:34:18Z andrea $
+# $Id: PKGBUILD 111068 2014-05-12 20:33:22Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Bogdanov <andorn@gmail.com>
pkgname=kchmviewer
-pkgver=6.0
-pkgrel=3
+pkgver=6.1
+pkgrel=1
pkgdesc="A .chm files (MS HTML help file format) viewer"
arch=('i686' 'x86_64')
url="http://kchmviewer.sourceforge.net/"
license=('GPL')
depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'xdg-utils')
-makedepends=('automoc4' 'cmake')
+makedepends=('automoc4' 'cmake' 'patch')
options=('libtool')
install=$pkgname.install
changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+ $pkgname-build.patch)
+sha256sums=('f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78'
+ '567bdcaa1809618fe3a441345586a491247b76e4dd46db8ff8497bd53d74adbc')
build() {
cd $pkgname-$pkgver
+ patch -Np1 -i "${srcdir}"/$pkgname-build.patch
+
cmake . -DCMAKE_INSTALL_PREFIX=/usr
make
}
@@ -30,7 +34,7 @@ package() {
make DESTDIR=${pkgdir} install
#icon file
- install -D -m644 ${srcdir}/$pkgname-$pkgver/packages/$pkgname.png \
+ install -D -m644 "${srcdir}"/$pkgname-$pkgver/packages/$pkgname.png \
${pkgdir}/usr/share/pixmaps/$pkgname.png
#msits.protocol file provided by kdegraphics-okular package
diff --git a/community/kchmviewer/kchmviewer-build.patch b/community/kchmviewer/kchmviewer-build.patch
new file mode 100644
index 000000000..e08440d30
--- /dev/null
+++ b/community/kchmviewer/kchmviewer-build.patch
@@ -0,0 +1,23 @@
+diff -ruN kchmviewer-6.1-orig/packages/kchmviewer.desktop kchmviewer-6.1/packages/kchmviewer.desktop
+--- kchmviewer-6.1-orig/packages/kchmviewer.desktop 2009-12-15 07:02:57.000000000 +0100
++++ kchmviewer-6.1/packages/kchmviewer.desktop 2014-05-12 20:37:00.983182220 +0200
+@@ -3,7 +3,6 @@
+ Categories=Qt;KDE;Office;Viewer;
+ Terminal=false
+ Type=Application
+-Encoding=UTF-8
+ Exec=kchmviewer %f
+ Icon=kchmviewer
+ GenericName=CHM file viewer
+diff -ruN kchmviewer-6.1-orig/src/CMakeLists.txt kchmviewer-6.1/src/CMakeLists.txt
+--- kchmviewer-6.1-orig/src/CMakeLists.txt 2011-12-19 08:16:43.000000000 +0100
++++ kchmviewer-6.1/src/CMakeLists.txt 2014-05-12 20:35:51.195078972 +0200
+@@ -8,7 +8,7 @@
+ dialog_chooseurlfromlist.cpp
+ dialog_setup.cpp
+ kde-qt.cpp
+- keyeventfilter.cpp
++# keyeventfilter.cpp
+ main.cpp
+ mainwindow.cpp
+ navigationpanel.cpp
diff --git a/community/kchmviewer/kchmviewer.changelog b/community/kchmviewer/kchmviewer.changelog
index 3204bc3dc..4fa985423 100644
--- a/community/kchmviewer/kchmviewer.changelog
+++ b/community/kchmviewer/kchmviewer.changelog
@@ -1,3 +1,6 @@
+2014-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * kchmviewer 6.1-1
+
2011-12-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* kchmviewer 6.0-1
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 8e7fff94f..54961036a 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105979 2014-02-20 12:14:35Z bpiotrowski $
+# $Id: PKGBUILD 111071 2014-05-12 20:48:03Z bgyorgy $
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Unknown47 <unknown47r@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,20 +6,28 @@
pkgname=libfm
pkgver=1.2.0
-pkgrel=3
+pkgrel=5
pkgdesc='Library for file management'
url='http://pcmanfm.sourceforge.net/'
arch=('i686' 'x86_64')
license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif')
-makedepends=('intltool' 'gtk-doc')
+depends=('gtk2' 'menu-cache' 'desktop-file-utils' 'libexif' 'dbus-glib')
+makedepends=('udisks' 'intltool' 'gtk-doc')
replaces=('lxshortcut')
provides=('lxshortcut')
conflicts=('lxshortcut')
install=libfm.install
-source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz)
-md5sums=('07d1361bc008db46b0fd4c775f5696de')
+source=(http://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz
+ hide-lxshortcut.patch)
+md5sums=('07d1361bc008db46b0fd4c775f5696de'
+ '49f7f47a3c59c83d1e7a7691eb1cccfe')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Hide desktop entry of lxshortcut
+ patch -Np1 -i ../hide-lxshortcut.patch
+}
build() {
cd $pkgname-$pkgver
@@ -27,7 +35,7 @@ build() {
--sysconfdir=/etc \
--enable-udisks \
--with-gnu-ld
- make LDFLAGS+=' -lgobject-2.0 -lglib-2.0'
+ make
}
package() {
diff --git a/community/libfm/hide-lxshortcut.patch b/community/libfm/hide-lxshortcut.patch
new file mode 100644
index 000000000..fc7ba62dd
--- /dev/null
+++ b/community/libfm/hide-lxshortcut.patch
@@ -0,0 +1,22 @@
+From 4d2b79048573dd2fa1dee853230ccc45b1d9c8df Mon Sep 17 00:00:00 2001
+From: Andriy Grytsenko <andrej@rep.kiev.ua>
+Date: Tue, 25 Feb 2014 15:24:59 +0200
+Subject: [PATCH] [LP#1284401]The lxshortcut should not be present in the
+ menus.
+
+---
+ data/lxshortcut.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/lxshortcut.desktop.in b/data/lxshortcut.desktop.in
+index 8ef7bca..f60a63e 100644
+--- a/data/lxshortcut.desktop.in
++++ b/data/lxshortcut.desktop.in
+@@ -8,3 +8,4 @@ Exec=lxshortcut -i %f
+ StartupNotify=true
+ Terminal=false
+ MimeType=application/x-desktop;
++NoDisplay=true
+--
+1.7.10.4
+
diff --git a/community/libfm/libfm.install b/community/libfm/libfm.install
index e83eccb55..5329d70d8 100644
--- a/community/libfm/libfm.install
+++ b/community/libfm/libfm.install
@@ -1,7 +1,6 @@
post_install() {
update-mime-database /usr/share/mime > /dev/null
update-desktop-database -q
- #[ -d /usr/lib/gio/modules ] && gio-querymodules /usr/lib/gio/modules
}
post_upgrade() {
diff --git a/community/lxterminal/PKGBUILD b/community/lxterminal/PKGBUILD
index 9751bc21a..66715f3b2 100644
--- a/community/lxterminal/PKGBUILD
+++ b/community/lxterminal/PKGBUILD
@@ -1,34 +1,39 @@
-# $Id: PKGBUILD 71600 2012-05-30 16:08:38Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 111033 2014-05-12 03:35:45Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxterminal
pkgver=0.1.11
-pkgrel=2
+pkgrel=3
pkgdesc="VTE-based terminal emulator (part of LXDE)"
arch=('i686' 'x86_64')
license=('GPL2')
url="http://lxde.org/"
groups=('lxde')
-depends=('fontconfig' 'libx11' 'glib2' 'vte' 'gtk2')
-makedepends=('pkgconfig' 'intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
- shift-keybinds.patch)
+depends=('vte')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
+ fix-keybinds.patch)
md5sums=('fd9140b45c0f28d021253c4aeb8c4aea'
- '7eff715e02181b006b1912cd041b7f1a')
+ '1919977c8c745e65129dbe468b8dcbeb')
-build() {
- cd "$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
- patch -Np1 -i "$srcdir"/shift-keybinds.patch
+ # Filter out key events of terminal keybinds
+ patch -Np1 -i ../fix-keybinds.patch
+}
- ./configure --sysconfdir=/etc --prefix=/usr
- make
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
}
package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/lxterminal/fix-keybinds.patch b/community/lxterminal/fix-keybinds.patch
new file mode 100644
index 000000000..fb77430ce
--- /dev/null
+++ b/community/lxterminal/fix-keybinds.patch
@@ -0,0 +1,183 @@
+diff -Naur lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
+--- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
++++ lxterminal-0.1.11/src/lxterminal.c 2014-05-12 05:13:32.264123691 +0200
+@@ -69,29 +70,29 @@
+ /* Menu and accelerator event handlers. */
+ static void terminal_initialize_switch_tab_accelerator(Term * term);
+ static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
+-static void terminal_switch_tab_accelerator(Term * term);
++static gboolean terminal_switch_tab_accelerator(Term * term);
+ static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
+ static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_move_tab_execute(LXTerminal * terminal, gint direction);
+ static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal);
+
+ /* Window creation, destruction, and control. */
+@@ -327,11 +328,14 @@
+
+ /* Handler for accelerator <ALT> n, where n is a digit.
+ * Switch to the tab selected by the digit, if it exists. */
+-static void terminal_switch_tab_accelerator(Term * term)
++static gboolean terminal_switch_tab_accelerator(Term * term)
+ {
+ LXTerminal * terminal = term->parent;
+- if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook)))
++ if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index);
++ return TRUE;
++ }
++ return FALSE;
+ }
+
+ /* Handler for "activate" signal on File/New Window menu item.
+@@ -344,9 +348,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> N. Open a new window. */
+-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_new_window_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on File/New Tab menu item.
+@@ -405,9 +410,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */
+-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_new_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on File/Close Tab menu item.
+@@ -419,9 +425,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> W. Close the current tab. */
+-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_close_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Edit/Copy menu item.
+@@ -433,9 +440,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
+-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_copy_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Edit/Paste menu item.
+@@ -447,9 +455,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
+-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_paste_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "response" signal on Name Tab dialog. */
+@@ -521,9 +530,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> R. Name the tab. */
+-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_name_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Previous Tab menu item.
+@@ -538,10 +548,11 @@
+ }
+
+ /* Handler for accelerator <CTRL><PAGE UP>. Cycle through tabs in the reverse direction. */
+-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab");
+ gtk_action_activate(_action);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Next Tab menu item.
+@@ -556,10 +567,11 @@
+ }
+
+ /* Handler for accelerator <CTRL><PAGE DOWN>. Cycle through tabs in the forward direction. */
+-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab");
+ gtk_action_activate(_action);
++ return TRUE;
+ }
+
+ /* Helper for move tab left and right. */
+@@ -594,9 +606,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL><PAGE UP>. Move the tab one position in the reverse direction. */
+-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_move_tab_execute(terminal, -1);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Move Tab Right menu item.
+@@ -607,9 +620,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>. Move the tab one position in the forward direction. */
+-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_move_tab_execute(terminal, 1);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Help/About menu item. */
diff --git a/community/lxterminal/shift-keybinds.patch b/community/lxterminal/shift-keybinds.patch
deleted file mode 100644
index ecef20318..000000000
--- a/community/lxterminal/shift-keybinds.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
---- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
-+++ lxterminal-0.1.11/src/lxterminal.c 2012-05-18 17:58:40.483588501 +0200
-@@ -77,9 +77,9 @@
- static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
- static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
- static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
- static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-@@ -433,9 +433,10 @@
- }
-
- /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
- terminal_copy_activate_event(NULL, terminal);
-+ return TRUE;
- }
-
- /* Handler for "activate" signal on Edit/Paste menu item.
-@@ -447,9 +448,10 @@
- }
-
- /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
- terminal_paste_activate_event(NULL, terminal);
-+ return TRUE;
- }
-
- /* Handler for "response" signal on Name Tab dialog. */
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index 63551eb48..951cde345 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 99908 2013-10-31 02:24:40Z allan $
+# $Id: PKGBUILD 111062 2014-05-12 18:55:38Z bgyorgy $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
pkgname=menu-cache
pkgver=0.5.1
-pkgrel=1
+pkgrel=2
pkgdesc='Caching mechanism for freedesktop.org compliant menus'
arch=('i686' 'x86_64')
license=('GPL2')
url='http://lxde.org/'
-groups=('lxde')
depends=('glib2')
source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
sha256sums=('08e658021faecd4eefb26cc21b207251a6b4e844e131cec491471aba9eaea122')
@@ -18,7 +17,7 @@ sha256sums=('08e658021faecd4eefb26cc21b207251a6b4e844e131cec491471aba9eaea122')
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/menu-cache \
+ --libexecdir=/usr/lib \
--disable-static
make
}
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 02974536a..c7f4593e7 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110555 2014-05-03 17:27:50Z faidoc $
+# $Id: PKGBUILD 111021 2014-05-12 01:29:26Z bgyorgy $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: Adam Hani Schakaki <adam@schakaki.net>
# Contributor: Ner0
pkgname=muffin
-pkgver=2.2.2
+pkgver=2.2.3
pkgrel=1
pkgdesc="Cinnamon window manager based on Mutter"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
options=('!emptydirs')
install=$pkgname.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('1f39bb8d76ed0fa5704c5cb336ea86e6871396e92fca8a1ff0671be0b4d30739')
+sha256sums=('c34f02a67c96d3d0925988a87865f1dc590c84ba7ddd9d8e1872b5ad768f445c')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD
index b9377e19f..6fdb40e25 100644
--- a/community/pcmanfm/PKGBUILD
+++ b/community/pcmanfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105925 2014-02-19 10:35:08Z bpiotrowski $
+# $Id: PKGBUILD 111066 2014-05-12 19:35:38Z bgyorgy $
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Unknown47 <unknown47r@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=pcmanfm
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
pkgdesc='Extremely fast and lightweight file manager'
arch=('i686' 'x86_64')
url='http://pcmanfm.sourceforge.net/'
@@ -14,7 +14,8 @@ license=('GPL')
groups=('lxde')
depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data')
makedepends=('intltool')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems')
+optdepends=('gvfs: for trash support, mounting with udisks and remote filesystems'
+ 'udisks: alternative for mounting volumes')
install=$pkgname.install
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz)
md5sums=('11d59a492c9802866279a6e7e2b3f49e')
@@ -22,13 +23,10 @@ md5sums=('11d59a492c9802866279a6e7e2b3f49e')
build() {
cd $pkgname-$pkgver
./configure --sysconfdir=/etc --prefix=/usr
- make LDFLAGS+=' -lm'
+ make
}
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
-
- sed -e 's|x-directory/normal|inode/directory|' -i \
- "$pkgdir"/usr/share/applications/pcmanfm.desktop
}
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index ce0e94829..e9fb11ff5 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99008 2013-10-22 08:58:32Z tredaelli $
+# $Id: PKGBUILD 111043 2014-05-12 09:28:42Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: helios
# Contributor: Lothar Gesslein
# Contributor: Dominik George <nik@naturalnet.de>
pkgname=tinc
-pkgver=1.0.23
+pkgver=1.0.24
pkgrel=1
pkgdesc="VPN (Virtual Private Network) daemon"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('lzo2' 'openssl')
install=tinc.install
source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
tincd@.service)
-md5sums=('762c0d47bdf1b33a40b19165d9c2761f'
+md5sums=('14a91eb2e85bdc0451a815612521b708'
'SKIP'
'112327da32fdb56ab779fe004712235f')
diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD
index dafe8812d..f95ba4e2c 100644
--- a/community/wireshark/PKGBUILD
+++ b/community/wireshark/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 110754 2014-05-06 09:29:25Z tredaelli $
+# $Id: PKGBUILD 111041 2014-05-12 09:22:44Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=('wireshark-cli' 'wireshark-gtk')
pkgbase=wireshark
pkgver=1.10.7
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL2')
makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
@@ -39,7 +39,7 @@ build() {
package_wireshark-cli() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
- depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
+ depends=('krb5' 'libgcrypt' 'libcap' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
install=wireshark.install
conflicts=(wireshark)
@@ -63,7 +63,7 @@ package_wireshark-cli() {
package_wireshark-gtk() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
- depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
+ depends=('gtk3' 'portaudio' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
install=wireshark-gtk.install
replaces=(wireshark)
conflicts=(wireshark)
diff --git a/community/wxcam/PKGBUILD b/community/wxcam/PKGBUILD
index 032d3fe71..6382faba7 100644
--- a/community/wxcam/PKGBUILD
+++ b/community/wxcam/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 107128 2014-03-12 23:53:54Z foutrelis $
+# $Id: PKGBUILD 111011 2014-05-12 01:07:23Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=wxcam
pkgver=1.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
license=(GPL)
pkgdesc="Webcam application for linux"
# version of CImg library needed to compile wxcam -
# http://cimg.sourceforge.net/
-_CImg_ver=1.4.9
+_CImg_ver=1.5.8
url="http://wxcam.sourceforge.net"
makedepends=('intltool>=0.35.0' 'libsm')
depends=('libglade' 'mjpegtools' 'perlxml' 'wxgtk' 'xvidcore' 'v4l-utils' 'alsa-lib')
source=(http://downloads.sourceforge.net/wxcam/${pkgname}-${pkgver}.tar.bz2
http://downloads.sourceforge.net/cimg/CImg-${_CImg_ver}.zip)
md5sums=('c9ea8991b6375c1709a7ce4e61fcc263'
- 'a07cba03f6d66a9970e0b3fcc230bddc')
+ '4941a3959f790ee68326403da1ed6dc7')
prepare() {
cp "$srcdir"/CImg-${_CImg_ver}/CImg.h "$srcdir"/$pkgname-$pkgver
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index f18e73770..a123b5237 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106236 2014-02-25 19:42:02Z jlichtblau $
+# $Id: PKGBUILD 111053 2014-05-12 17:42:26Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
pkgname=xnee
-pkgver=3.18
+pkgver=3.19
pkgrel=1
pkgdesc="A program to record, distribute, and replay X (X11) protocol data"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ optdepends=('xosd: feedback support')
options=('!emptydirs')
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
gnee.desktop)
-sha256sums=('c76d1c8b9deff2e52721e474cb69cf092c0d72212c916c6dacc94e33618c8638'
+sha256sums=('52a41e5cf62f81b7a3e5b58124eb3565e1e12028abda63f547fbbe0d98a2c212'
'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1')
build() {
@@ -33,5 +33,3 @@ package() {
#.desktop file
install -Dm644 "${srcdir}"/gnee.desktop "${pkgdir}"/usr/share/applications/gnee.desktop
}
-sha256sums=('24d521b604f3118faf1bd087619feb230cda38bf3721000828e670e0f311cb48'
- 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1')
diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog
index 44d09c1b0..e0e1f9b87 100644
--- a/community/xnee/xnee.changelog
+++ b/community/xnee/xnee.changelog
@@ -1,3 +1,6 @@
+2014-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * xnee 3.19-1
+
2014-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* xnee 3.18-1
diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD
index c2fc7add7..d236eadb9 100644
--- a/community/yaml-cpp/PKGBUILD
+++ b/community/yaml-cpp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89824 2013-05-02 16:13:14Z svenstaro $
+# $Id: PKGBUILD 111017 2014-05-12 01:22:50Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Markus Martin <markus@archwyrm.net>
pkgname=yaml-cpp
@@ -8,7 +8,8 @@ pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
url="http://code.google.com/p/yaml-cpp/"
arch=('i686' 'x86_64')
license=('MIT')
-makedepends=('cmake' 'boost')
+makedepends=('cmake')
+depends=('boost')
source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz)
md5sums=('0fa47a5ed8fedefab766592785c85ee7')
@@ -23,4 +24,6 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
+
+ install -Dm644 license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index fac1cc4b8..27546531c 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205903 2014-02-13 16:52:18Z andyrtr $
+# $Id: PKGBUILD 212317 2014-05-12 18:20:13Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
# --->>> remember to rebuild/bump pigeonhole in one step <<<---
pkgname=dovecot
-pkgver=2.2.11
+pkgver=2.2.13
pkgrel=1
pkgdesc="An IMAP and POP3 server written with security primarily in mind"
arch=('i686' 'x86_64')
@@ -23,21 +23,16 @@ optdepends=('libldap: ldap plugin'
provides=('imap-server' 'pop3-server')
install=$pkgname.install
source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
- dovecot.tmpfilesd
- pop3_Access_sequence_numbers_correctly.diff)
-md5sums=('d53d207727df99e4362a3787223c6fa3'
+ dovecot.tmpfilesd)
+md5sums=('a3eb1c0b1822c4f2b0fe9247776baa71'
'SKIP'
- '342a28251d40f983c98c0d1f1bf3d07d'
- 'c8096d3966651222accd7f6bc678d08d')
+ '342a28251d40f983c98c0d1f1bf3d07d')
prepare() {
cd $pkgname-$pkgver
# fix path in helper script
sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
-
- # post release segfault fix
- patch -Np1 -i ${srcdir}/pop3_Access_sequence_numbers_correctly.diff
}
build() {
diff --git a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff
deleted file mode 100644
index d415a0eff..000000000
--- a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-
-diff -r 59decc957b39 -r d20059f7d3a1 src/pop3/pop3-commands.c
---- a/src/pop3/pop3-commands.c Fri Feb 07 15:03:33 2014 -0500
-+++ b/src/pop3/pop3-commands.c Thu Feb 13 05:33:13 2014 +0200
-@@ -253,7 +253,7 @@
- for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
- bit = 1 << (msgnum % CHAR_BIT);
- if ((client->deleted_bitmask[msgnum / CHAR_BIT] & bit) != 0)
-- seq_range_array_add(&deleted_msgs, client->msgnum_to_seq_map[msgnum]);
-+ seq_range_array_add(&deleted_msgs, msgnum_to_seq(client, msgnum));
- }
- }
- t_array_init(&seen_msgs, 8);
-@@ -261,7 +261,7 @@
- for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
- bit = 1 << (msgnum % CHAR_BIT);
- if ((client->seen_bitmask[msgnum / CHAR_BIT] & bit) != 0)
-- seq_range_array_add(&seen_msgs, client->msgnum_to_seq_map[msgnum]);
-+ seq_range_array_add(&seen_msgs, msgnum_to_seq(client, msgnum));
- }
- }
-
-@@ -826,7 +826,7 @@
- client->messages_count+1);
- for (msgnum = 0; msgnum < client->messages_count; msgnum++) {
- client->message_uidls[msgnum] =
-- seq_uidls[client->msgnum_to_seq_map[msgnum]];
-+ seq_uidls[msgnum_to_seq(client, msgnum)];
- }
- i_free(seq_uidls);
- }
-
-
-
-
-
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 1fa8c174c..119edfc33 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211322 2014-04-18 17:28:24Z andyrtr $
+# $Id: PKGBUILD 212324 2014-05-12 18:57:52Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=evolution-data-server
-pkgver=3.12.1
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
pkgdesc="Centralized access to appointments and contacts"
arch=(i686 x86_64)
depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata)
@@ -12,7 +12,7 @@ install=$pkgname.install
url="https://wiki.gnome.org/Apps/Evolution"
license=(GPL)
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c794d7f3e5241cc8856ab1d9fccab29487c575d3a3b7d9b884064864b96caa3')
+sha256sums=('91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 11d478451..aaed7d775 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210429 2014-04-14 20:06:05Z jgc $
+# $Id: PKGBUILD 212328 2014-05-12 19:10:53Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=evolution
-pkgver=3.12.1
+pkgver=3.12.2
pkgrel=1
pkgdesc="Manage your email, contacts and schedule"
arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!emptydirs')
install=evolution.install
url=https://wiki.gnome.org/Apps/Evolution
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a4b5058a82949e883956863d23fd65cd4e89d6a1fb18d4d35b3ddaf4464bf52a')
+sha256sums=('60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948')
build() {
cd $pkgname-$pkgver
@@ -30,7 +30,6 @@ build() {
--enable-nss=yes \
--with-openldap=yes \
--enable-smime=yes \
- --with-krb5=/usr \
--disable-schemas-compile
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index fbd159046..f559604c8 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 211871 2014-04-28 15:12:02Z jgc $
+# $Id: PKGBUILD 212320 2014-05-12 18:48:47Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gtk3
-pkgver=3.12.1
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
arch=(i686 x86_64)
url="http://www.gtk.org/"
@@ -17,7 +17,7 @@ optdepends=('gnome-themes-standard: Default widget theme'
license=(LGPL)
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
settings.ini)
-sha256sums=('719aae5fdb560f64cadb7e968c8c85c0823664de890c9f765ff4c0efeb0277cd'
+sha256sums=('61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0'
'14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
build() {
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index 94a2da31f..9bf01ef93 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -1,26 +1,21 @@
-# $Id: PKGBUILD 212107 2014-05-07 15:48:41Z andrea $
+# $Id: PKGBUILD 212291 2014-05-12 02:55:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=libkscreen
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
pkgdesc="KDE's screen management library"
arch=('i686' 'x86_64')
url='https://projects.kde.org/libkscreen'
license=('GPL')
depends=('kdelibs' 'qjson')
makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
- 'fix-crash.patch')
-md5sums=('7048db071d669193f8dafc9a1319998b'
- 'fef9233861b848d569c015f6095d390a')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('802ba357e1e802d6773405bc54b47145')
prepare() {
mkdir build
-
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/fix-crash.patch
}
build() {
diff --git a/extra/libkscreen/fix-crash.patch b/extra/libkscreen/fix-crash.patch
deleted file mode 100644
index a385edc5b..000000000
--- a/extra/libkscreen/fix-crash.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Aleix Pol <aleixpol@kde.org>
-Date: Mon, 05 May 2014 13:13:25 +0000
-Subject: Fix crash
-X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=221dff2e2f9fbd1c18eae9b59f23b1dbbdb1870b
----
-Fix crash
-
-If we don't have a primary output, don't query it. Set a new primary
-output instead.
-
-Reviewed by Alex Fiestas
----
-
-
---- a/backends/xrandr/xrandrconfig.cpp
-+++ b/backends/xrandr/xrandrconfig.cpp
-@@ -157,7 +157,7 @@
- output->updateKScreenOutput(kscreenOutput);
- }
-
-- if (config->primaryOutput()->id() != m_primaryOutput) {
-+ if (!config->primaryOutput() || config->primaryOutput()->id() != m_primaryOutput) {
- config->setPrimaryOutput(config->output(m_primaryOutput));
- }
- }
-
-From: Aleix Pol <aleixpol@kde.org>
-Date: Tue, 06 May 2014 13:55:16 +0000
-Subject: Don't crash when printing a null KScreen::Output* from qDebug
-X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=31f07fd26e6091dfd37c54fef3352a95182e5bba
----
-Don't crash when printing a null KScreen::Output* from qDebug
-
-Reviewed by Alex Fiestas
----
-
-
---- a/src/output.cpp
-+++ b/src/output.cpp
-@@ -425,7 +425,11 @@
-
- QDebug operator<<(QDebug dbg, const KScreen::Output *output)
- {
-- dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")";
-+ if(output) {
-+ dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")";
-+ } else {
-+ dbg << "KScreen::Output(NULL)";
-+ }
- return dbg;
- }
-
-
diff --git a/extra/libomxil-bellagio/PKGBUILD b/extra/libomxil-bellagio/PKGBUILD
new file mode 100644
index 000000000..66e970a4b
--- /dev/null
+++ b/extra/libomxil-bellagio/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 212302 2014-05-12 12:09:47Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Fly-away <flyaaway@gmail.com>
+
+pkgname=libomxil-bellagio
+pkgver=0.9.3
+pkgrel=1
+pkgdesc="An opensource implementation of the OpenMAX Integration Layer API"
+arch=('i686' 'x86_64')
+url="http://omxil.sourceforge.net"
+license=('LGPL')
+depends=('glibc')
+source=("http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%200.9.3/${pkgname}-${pkgver}.tar.gz"
+ fedora-fixes.patch)
+md5sums=('a1de827fdb75c02c84e55f740ca27cb8'
+ 'c34f9facf0cf26171c81f2fc3d562ec6')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-$pkgver
+
+ # Fixes from fedora repo
+ patch -Np1 -i ../fedora-fixes.patch
+ autoreconf -fiv
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/${pkgname}
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
+
diff --git a/extra/libomxil-bellagio/fedora-fixes.patch b/extra/libomxil-bellagio/fedora-fixes.patch
new file mode 100644
index 000000000..2ae3c3c87
--- /dev/null
+++ b/extra/libomxil-bellagio/fedora-fixes.patch
@@ -0,0 +1,199 @@
+When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved.
+Link explicitly against omxil-bellagio so that ld.so can find the reference.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000
++++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000
+@@ -3,7 +3,7 @@
+ omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
+ libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
+
+-libomxdynamicloader_la_LDFLAGS =
++libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio
+ libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/base \
+Fix dependency issue to allow parallel build
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+Index: bellagio-0.9.3/src/Makefile.am
+===================================================================
+--- bellagio-0.9.3.orig/src/Makefile.am
++++ bellagio-0.9.3/src/Makefile.am
+@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist
+ omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
+ -I$(top_srcdir)/include
+ omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
++omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la
+
+ lib_LTLIBRARIES = libomxil-bellagio.la
+ libomxil_bellagio_la_SOURCES = component_loader.h \
+We always access globalComponentList[] at indexComponent=-1 which causes a
+segfault. Use i as the index instead.
+
+Signed-off-by: Qais Yousef <qais.yousef@imgtec.com>
+
+--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000
++++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000
+@@ -485,7 +485,6 @@
+ OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) {
+ omx_base_component_PrivateType* omx_base_component_Private;
+ int i = 0;
+- int indexComponent = -1;
+
+ DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__);
+ omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate;
+@@ -493,16 +492,13 @@
+ while(listOfcomponentRegistered[i].component_name != NULL ) {
+ if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) {
+ // found component in the list of the resource manager
+- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp);
+- break;
++ removeElemFromList(&globalComponentList[i], openmaxStandComp);
++ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
++ return OMX_ErrorNone;
+ }
+ i++;
+ }
+- if (indexComponent <0) {
+- // No resource to be handled
+- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
+- return OMX_ErrorNone;
+- }
+- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__);
++ // No resource to be handled
++ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__);
+ return OMX_ErrorNone;
+ }
+ OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch
+ src/base/omx_base_component.c | 54 ++++++++++++++++++++++-------------------
+ 1 files changed, 29 insertions(+), 25 deletions(-)
+--- a/src/base/omx_base_component.c
++++ a/src/base/omx_base_component.c
+@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
+ return OMX_ErrorBadParameter;
+ }
+ switch(nParamIndex) {
+- case OMX_IndexParameterThreadsID:
+- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
+- break;
+- }
+- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
+- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
+- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
+- break;
+ case OMX_IndexParamAudioInit:
+ case OMX_IndexParamVideoInit:
+ case OMX_IndexParamImageInit:
+@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter(
+ }
+ }
+ break;
+- case OMX_IndexVendorCompPropTunnelFlags:
+- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
++ default:
++ /* additional switch statement for extended OMX_INDEXTYPE */
++ switch((OMX_INDEXVENDORTYPE) nParamIndex) {
++ case OMX_IndexParameterThreadsID:
++ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) {
++ break;
++ }
++ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure;
++ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID;
++ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID;
++ break;
++ case OMX_IndexVendorCompPropTunnelFlags:
++ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure;
+
+- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
+- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
+- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
+- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
++ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts +
++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts +
++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts +
++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) {
+
+- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
+- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
++ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n",
++ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__);
+
+- return OMX_ErrorBadPortIndex;
+- }
++ return OMX_ErrorBadPortIndex;
++ }
+
+- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
++ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex];
+
+- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags;
+- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier;
+- break;
+- default:
+- err = OMX_ErrorUnsupportedIndex;
+- break;
++ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags;
++ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier;
++ break;
++ default:
++ err = OMX_ErrorUnsupportedIndex;
++ break;
++ }
+ }
+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent);
+ return err;
+diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am
+--- libomxil-bellagio-0.9.3/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/Makefile.am 2012-04-23 13:46:15.410823381 +0200
+@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libomxil-bellagio.pc
+
+-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
+ doc_DATA = README \
+ ChangeLog \
+ TODO
+diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c
+--- libomxil-bellagio-0.9.3/src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/src/omxregister.c 2012-12-10 22:02:28.621695659 +0100
+@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx
+ }
+ fptr(stComponents);
+ err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp);
+- err = fwrite("\n", 1, 1, omxregistryfp);
++ if (err != strlen(lib_absolute_path)) {
++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp));
++ continue;
++ }
++ err = fwrite("\n", 1, strlen(buffer), omxregistryfp);
++ if (err != strlen(buffer)) {
++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp));
++ continue;
++ }
+
+
+ for (i = 0; i<num_of_comp; i++) {
+--- libomxil-bellagio-0.9.3/include/OMX_Types.h.orig 2011-01-12 08:53:26.000000000 +0100
++++ libomxil-bellagio-0.9.3/include/OMX_Types.h 2013-02-25 09:53:55.000000000 +0100
+@@ -314,6 +314,18 @@
+ * platform & operating specific object used to reference the window */
+ typedef void* OMX_NATIVE_WINDOWTYPE;
+
++
++/** Define the OMX IL version that corresponds to this set of header files.
++ * We also define a combined version that can be used to write or compare
++ * values of the 32bit nVersion field, assuming a little endian architecture */
++#define OMX_VERSION_MAJOR 1
++#define OMX_VERSION_MINOR 1
++#define OMX_VERSION_REVISION 2
++#define OMX_VERSION_STEP 0
++
++#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR)
++
++
+ /** The OMX_VERSIONTYPE union is used to specify the version for
+ a structure or component. For a component, the version is entirely
+ specified by the component vendor. Components doing the same function
diff --git a/extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch b/extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch
new file mode 100644
index 000000000..90a236816
--- /dev/null
+++ b/extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch
@@ -0,0 +1,121 @@
+From be0fe56c3bcad5124dcc6c47a2fad01acd16f71a Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Mon, 23 Dec 2013 21:15:20 -0800
+Subject: [PATCH] Ensure xcb owns socket and no other threads are writing
+ before send_request
+
+send_request may only write to out.queue if no other thread is busy
+writing to the network (as that thread may be writing from out.queue).
+
+send_request may only allocate request sequence numbers if XCB owns
+the socket.
+
+Therefore, send_request must make sure that both conditions are true
+when it holds iolock, which can only be done by looping until both
+conditions are true without having dropped the lock waiting for the
+second condition.
+
+We choose to get the socket back from Xlib first as get_socket_back
+has a complicated test and checking for other threads writing is a
+simple in-lined check.
+
+This also changes the sequence number checks (64k requests with no
+reply, 4M request wrapping) to ensure that both conditions are true
+before queueing the request.
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+Reviewed-by: Uli Schlachter <psychon@znc.in>
+---
+ src/xcb_out.c | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 40 insertions(+), 17 deletions(-)
+
+diff --git a/src/xcb_out.c b/src/xcb_out.c
+index 18bb5f9..dc42954 100644
+--- a/src/xcb_out.c
++++ b/src/xcb_out.c
+@@ -103,6 +103,33 @@ static void get_socket_back(xcb_connection_t *c)
+ _xcb_in_replies_done(c);
+ }
+
++static void prepare_socket_request(xcb_connection_t *c)
++{
++ /* We're about to append data to out.queue, so we need to
++ * atomically test for an external socket owner *and* some other
++ * thread currently writing.
++ *
++ * If we have an external socket owner, we have to get the socket back
++ * before we can use it again.
++ *
++ * If some other thread is writing to the socket, we assume it's
++ * writing from out.queue, and so we can't stick data there.
++ *
++ * We satisfy this condition by first calling get_socket_back
++ * (which may drop the lock, but will return when XCB owns the
++ * socket again) and then checking for another writing thread and
++ * escaping the loop if we're ready to go.
++ */
++ for (;;) {
++ if(c->has_error)
++ return;
++ get_socket_back(c);
++ if (!c->out.writing)
++ break;
++ pthread_cond_wait(&c->out.cond, &c->iolock);
++ }
++}
++
+ /* Public interface */
+
+ void xcb_prefetch_maximum_request_length(xcb_connection_t *c)
+@@ -236,24 +263,23 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
+
+ /* get a sequence number and arrange for delivery. */
+ pthread_mutex_lock(&c->iolock);
+- /* wait for other writing threads to get out of my way. */
+- while(c->out.writing)
+- pthread_cond_wait(&c->out.cond, &c->iolock);
+- get_socket_back(c);
++
++ prepare_socket_request(c);
+
+ /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without
+- * a reply. */
+- if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2)
+- send_sync(c);
+- /* Also send sync_req (could use NoOp) at 32-bit wrap to avoid having
++ * a reply.
++ * Also send sync_req (could use NoOp) at 32-bit wrap to avoid having
+ * applications see sequence 0 as that is used to indicate
+- * an error in sending the request */
+- if((unsigned int) (c->out.request + 1) == 0)
++ * an error in sending the request
++ */
++
++ while ((req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) ||
++ (unsigned int) (c->out.request + 1) == 0)
++ {
+ send_sync(c);
++ prepare_socket_request(c);
++ }
+
+- /* The above send_sync calls could drop the I/O lock, but this
+- * thread will still exclude any other thread that tries to write,
+- * so the sequence number postconditions still hold. */
+ send_request(c, req->isvoid, workaround, flags, vector, veclen);
+ request = c->has_error ? 0 : c->out.request;
+ pthread_mutex_unlock(&c->iolock);
+@@ -373,10 +399,7 @@ int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count)
+
+ void _xcb_out_send_sync(xcb_connection_t *c)
+ {
+- /* wait for other writing threads to get out of my way. */
+- while(c->out.writing)
+- pthread_cond_wait(&c->out.cond, &c->iolock);
+- get_socket_back(c);
++ prepare_socket_request(c);
+ send_sync(c);
+ }
+
+--
+1.9.2
+
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 523084ba5..a52a31b5c 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 202710 2013-12-25 21:25:44Z andyrtr $
+# $Id: PKGBUILD 212300 2014-05-12 07:59:16Z lcarlier $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=libxcb
pkgver=1.10
-pkgrel=1
+pkgrel=2
pkgdesc="X11 client-side library"
arch=('i686' 'x86_64')
url="http://xcb.freedesktop.org/"
@@ -13,14 +13,19 @@ depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau')
makedepends=('pkgconfig' 'libxslt' 'python')
license=('custom')
source=($url/dist/$pkgname-$pkgver.tar.bz2
- libxcb-1.1-no-pthread-stubs.patch)
+ libxcb-1.1-no-pthread-stubs.patch
+ Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch)
sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5'
- '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356')
+ '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356'
+ '47de1025bb16446b9e69ff7b6b262a0a1af957d350afe897421b9105c89befeb')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
autoreconf -vfi
+
+ # fix FS#40289 merged upstream
+ patch -Np1 -i ../Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch
}
build() {
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 5937f6fe5..43a6ac263 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 210174 2014-04-10 16:28:59Z bisson $
+# $Id: PKGBUILD 212312 2014-05-12 17:53:26Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: Ben <ben@benmazer.net>
pkgname=mpd
-pkgver=0.18.10
+pkgver=0.18.11
pkgrel=1
pkgdesc='Flexible, powerful, server-side application for playing music'
url='http://www.musicpd.org/'
@@ -18,7 +18,7 @@ makedepends=('doxygen')
source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
'tmpfiles.d'
'conf')
-sha1sums=('0923318cfda033bb4f89c219e6effa9d5b330c1d' 'SKIP'
+sha1sums=('34585fcb49107508b198798b5657df07c86157f0' 'SKIP'
'f4d5922abb69abb739542d8e93f4dfd748acdad7'
'67c145c046cddd885630d72ce8ebe71f8321ff3b')
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index 7cf976226..735ec5fd9 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 205927 2014-02-14 03:29:23Z eric $
-# Maintainer:
+# $Id: PKGBUILD 212310 2014-05-12 17:45:02Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=perl-net-dns
-pkgver=0.74
+pkgver=0.75
pkgrel=1
pkgdesc="Perl Module: Interface to the DNS resolver"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('perl-digest-hmac' 'perl-net-ip' 'perl')
checkdepends=('perl-test-pod')
options=('!emptydirs')
source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz)
-sha1sums=('1b183448d22ea49bca0c4b85c365af527101a2ae')
+sha1sums=('e57d08cfe61962d9de3cd78ec705a954e05f36bd')
build() {
cd Net-DNS-${pkgver}
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index f53743521..619858837 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205904 2014-02-13 16:52:19Z andyrtr $
+# $Id: PKGBUILD 212318 2014-05-12 18:20:14Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,19 +7,19 @@
# This must be built against the version of dovecot being used,
# else mail delivery will fail.
# Specify the version of dovecot to be used here:
-_dcpkgver=2.2.11
+_dcpkgver=2.2.13
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
pkgver=0.4.2
-pkgrel=6
+pkgrel=7
pkgdesc="Sieve implementation for Dovecot"
arch=('i686' 'x86_64')
url="http://pigeonhole.dovecot.org/"
license=('LGPL')
depends=('dovecot='$_dcpkgver)
conflicts=('dovecot-sieve' 'pigeonhole-hg')
-source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig}
+source=("http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig}
"dovecot.conf")
sha256sums=('0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13'
'SKIP'