Thu Apr 25 01:16:48 PDT 2013

1 files changed, 20 insertions, 6 deletions

diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD
index 314d38cd1..108f1ab5a 100644
--- a/community/gnome-settings-daemon-compat/PKGBUILD
+++ b/community/gnome-settings-daemon-compat/PKGBUILD
@@ -1,35 +1,42 @@
-# $Id: PKGBUILD 88700 2013-04-21 22:24:08Z heftig $
+# $Id: PKGBUILD 88858 2013-04-24 12:55:15Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon-compat
 _pkgname=gnome-settings-daemon
 pkgver=3.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gnome-desktop')
+depends=('gnome-settings-daemon')
 makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom')
 url="https://live.gnome.org/GnomeFlashback"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
         standalone-background-helper.patch
+        standalone-media-keys-helper.patch
         draw-background-unconditionally.patch
         sessionisactive-port.patch
+        revert-input-sources.patch
+        xinput.patch 
         flashback-rename.patch
         remove-libgsd-dependency.patch)
 sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15'
-            '4c2206b9654bd2b2729297870696c87906e2386b492bae1052b94148e5ea370f'
+            'f9781a17d7baa2777b16fa2c71fb6053612131cffcfffcc635d49f9dacb1e637'
+            '4776de33b1517976b308a9ce23661cd0ac68ddd2bcf41465c73f8a2e2d09d20c'
             '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a'
             '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915'
-            '57c66068f06599ea682325e9f5b92b751d8f0a4322b53371698f8539f709b101'
+            '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a'
+            'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d'
+            '1edabf1a5a56d4b797ccdb7d5003bad396eebe98541d5aa330c9851340b68dfe'
             '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c')
 
 build() {
   cd $_pkgname-$pkgver
 
-  # Build background helper as a stand alone binary
+  # Build background and media keys helpers as a stand alone binary
   patch -Np1 -i ../standalone-background-helper.patch
+  patch -Np1 -i ../standalone-media-keys-helper.patch
 
   # Always draw background
   patch -Np1 -i ../draw-background-unconditionally.patch
@@ -37,6 +44,10 @@ build() {
   # Port to gnome-session's SessionIsActive property
   patch -Np1 -i ../sessionisactive-port.patch
 
+  # Add compatibility patches for media keys plugin
+  patch -Np1 -i ../revert-input-sources.patch
+  patch -Np1 -i ../xinput.patch
+
   # Remove libgsd dependency
   patch -Np1 -i ../remove-libgsd-dependency.patch
 
@@ -50,12 +61,15 @@ build() {
   # https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
+  make -C plugins/common
   make -C plugins/automount
   make -C plugins/background
+  make -C plugins/media-keys
 }
 
 package() {
   cd $_pkgname-$pkgver
   make -C plugins/automount DESTDIR="$pkgdir" install
   make -C plugins/background DESTDIR="$pkgdir" install
+  make -C plugins/media-keys DESTDIR="$pkgdir" install
 }