Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/gimmie/PKGBUILD
	community/glipper-old/PKGBUILD
	community/glipper/PKGBUILD
	community/lcms2/PKGBUILD
	community/libpanelappletmm/PKGBUILD
	community/panflute/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/wtf/PKGBUILD
	community/xmonad-log-applet/PKGBUILD
	core/binutils/PKGBUILD
	core/tzdata/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/aubio/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/deskbar-applet/PKGBUILD
	extra/eject/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/gnome-netstatus/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/htdig/PKGBUILD
	extra/ktorrent/PKGBUILD
	extra/libgail-gnome/PKGBUILD
	extra/libktorrent/PKGBUILD
	extra/libofa/PKGBUILD
	extra/netspeed-applet/PKGBUILD
	extra/openexr/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio-mixer-applet/PKGBUILD
	extra/seahorse-plugins/PKGBUILD
	extra/telepathy-qt4/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	testing/libtool/PKGBUILD
	testing/xfsprogs/PKGBUILD

3 files changed, 24 insertions, 45 deletions

diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index f5052b769..2a2e0af3b 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109949 2011-02-14 08:47:45Z ibiru $
+# $Id: PKGBUILD 122251 2011-05-03 10:40:20Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.26
-pkgrel=5
+pkgver=0.28
+pkgrel=1
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -13,17 +13,16 @@ makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-        libcanberra-gtk-module.sh libcanberra-quit-add.patch)
-md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
-         'a54799e624aac814b9343ab05f25c38b'
-         'a147bce8a7addcd40b21faaaf028819b')
+        libcanberra-gtk-module.sh)
+md5sums=('c198b4811598c4c161ff505e4531b02c'
+         '21141257a1be80f3bc329829ff13b314')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libcanberra-quit-add.patch"
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
       --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --enable-gstreamer --enable-pulse
+      --enable-alsa --enable-gstreamer --enable-pulse \
+      --with-systemdsystemunitdir=/lib/systemd/system
   make
 }
 
@@ -37,11 +36,11 @@ package_libcanberra() {
   rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
   rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
   
-  install -m755 -d "${pkgdir}/usr/share/gconf" 
+  install -d "${pkgdir}/usr/share/gconf" 
   mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
 
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/libcanberra-gtk-module.sh" "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+  install -D "${srcdir}/libcanberra-gtk-module.sh" \
+    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
 
   # Split plugins
   for _p in pulse gstreamer; do
@@ -53,7 +52,6 @@ package_libcanberra() {
 package_libcanberra-pulse() {
   pkgdesc="PulseAudio plugin for libcanberra"
   depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-  groups=('pulseaudio-gnome')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
diff --git a/extra/libcanberra/libcanberra-gtk-module.sh b/extra/libcanberra/libcanberra-gtk-module.sh
index fbb7ff783..2ae6b7e17 100644
--- a/extra/libcanberra/libcanberra-gtk-module.sh
+++ b/extra/libcanberra/libcanberra-gtk-module.sh
@@ -1,10 +1,15 @@
 #!/bin/sh
 
-if [ -z "$GTK_MODULES" ] ; then
-	GTK_MODULES="canberra-gtk-module"
-else
-	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-fi
-
-export GTK_MODULES
-
+case "$SESSION" in
+  GNOME)
+    # Done by gnome-settings-daemon
+    ;;
+  *)
+    if [ -z "$GTK_MODULES" ]; then
+      GTK_MODULES="canberra-gtk-module"
+    else
+      GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+    fi
+    export GTK_MODULES
+    ;;
+esac
diff --git a/extra/libcanberra/libcanberra-quit-add.patch b/extra/libcanberra/libcanberra-quit-add.patch
deleted file mode 100644
index 0094569ae..000000000
--- a/extra/libcanberra/libcanberra-quit-add.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
---- libcanberra-0.26/src/canberra-gtk-module.c.quit-add	2011-01-07 22:48:49.388992626 -0500
-+++ libcanberra-0.26/src/canberra-gtk-module.c	2011-01-07 22:49:02.339995153 -0500
-@@ -932,11 +932,6 @@ static void connect_settings(void) {
-         connected = TRUE;
- }
- 
--static gboolean quit_handler(gpointer data) {
--        dispatch_queue();
--        return FALSE;
--}
--
- G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
- 
-         /* This is the same quark libgnomeui uses! */
-@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
-         install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
-         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
-         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
--
--        gtk_quit_add(1, quit_handler, NULL);
- }
- 
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);