Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

1 files changed, 36 insertions, 16 deletions

diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 93768bae2..895650283 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,35 +1,55 @@
-# $Id: PKGBUILD 142417 2011-11-09 07:29:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 157198 2012-04-25 14:06:29Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.2.2
-pkgrel=1
+pkgver=3.4.1
+pkgrel=2
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
+depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify'
+         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower')
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
 options=('!emptydirs' '!libtool')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        systemd-fallback.patch
+        evironment.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=9d7ea1d0b8b90b55f916751858a210a2e02a06b6
+        arguments.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=00681573ad6ebeb127ec72ac61d30d69be6459f8
+        mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=053f48b3b1b9a3b2ab0714d470da4354735d0c4b
+        glist-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=214a832820f6448f07d438f6686267eaf8301dd1
+        mouse-mem-leak.patch::http://git.gnome.org/browse/gnome-settings-daemon/patch/?id=09c215b42312ca5bb63b215c2f95231613b3103d)
+sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed'
+            '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008'
+            '1ba33f6eadac4c54f3f08f4bce075d2bef8124f857f5af22eaee010c8d38bc3b'
+            '884a959b334f864f75dcb4eec8c137785f587c7c2ae57906f8b4e60e04c29246'
+            '3a3f8b2964406b9b3c85c05f25e677e8c9eaa221779b95826ffbc0474740decc'
+            'af3bda801befdbd3d318723ae6de3aaf7df1e16bccd84e13f15b57f2dceaefcd'
+            '43b7397e622a2c19091b3665822e9461067fb6a497b9507418a3bbb100a69e1b')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i ../systemd-fallback.patch
+  patch -Np1 -i ../evironment.patch
+  patch -Np1 -i ../arguments.patch
+  patch -Np1 -i ../mem-leak.patch
+  patch -Np1 -i ../glist-leak.patch
+  patch -Np1 -i ../mouse-mem-leak.patch
+
+  gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
+      --enable-systemd
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
-      --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }