[arch-commits] Commit in gnome-settings-daemon/repos (4 files)

[Ionut Biru]

    Date: Thursday, March 17, 2011 @ 16:09:00
  Author: ibiru
Revision: 115412

fix plugin notification initialization. FS#23313

Added:
  gnome-settings-daemon/repos/extra-i686/add_notify_init.patch
  gnome-settings-daemon/repos/extra-x86_64/add_notify_init.patch
Modified:
  gnome-settings-daemon/repos/extra-i686/PKGBUILD
  gnome-settings-daemon/repos/extra-x86_64/PKGBUILD

------------------------------------+
 extra-i686/PKGBUILD                |   12 ++++++++----
 extra-i686/add_notify_init.patch   |   14 ++++++++++++++
 extra-x86_64/PKGBUILD              |   12 ++++++++----
 extra-x86_64/add_notify_init.patch |   14 ++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-17 18:39:31 UTC (rev 115411)
+++ extra-i686/PKGBUILD	2011-03-17 20:09:00 UTC (rev 115412)
@@ -4,7 +4,7 @@
 pkgbase=gnome-settings-daemon
 pkgname=(gnome-settings-daemon gnome-settings-daemon-pulse)
 pkgver=2.32.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,17 +16,20 @@
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
         gstreamer-volume-2.30.patch
-        gnome-settings-daemon-2.32.1-libnotify-0.7.patch)
+        gnome-settings-daemon-2.32.1-libnotify-0.7.patch
+        add_notify_init.patch)
 sha256sums=('0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86'
             '4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582'
-            'da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d')
+            'da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d'
+            '3f81b1bf76b4e01fe6264be0de987fe9d346eee305a898dca630dea7d77b61f3')
 
 build() {
   cd "$srcdir"
   cp -a "$pkgbase-$pkgver"{,-pulse}
-  
+
   cd "$pkgbase-$pkgver"
   patch -Np0 -i "${srcdir}/gnome-settings-daemon-2.32.1-libnotify-0.7.patch"
+  patch -Np1 -i "${srcdir}/add_notify_init.patch"
   patch -Np1 -i "${srcdir}/gstreamer-volume-2.30.patch"
   libtoolize --force
   aclocal
@@ -38,6 +41,7 @@
 
   cd "$srcdir/$pkgbase-$pkgver-pulse"
   patch -Np0 -i "${srcdir}/gnome-settings-daemon-2.32.1-libnotify-0.7.patch"
+  patch -Np1 -i "${srcdir}/add_notify_init.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/bin --disable-static --enable-pulse
   make

Added: extra-i686/add_notify_init.patch
===================================================================
--- extra-i686/add_notify_init.patch	                        (rev 0)
+++ extra-i686/add_notify_init.patch	2011-03-17 20:09:00 UTC (rev 115412)
@@ -0,0 +1,14 @@
+diff -Nur gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c
+--- gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c	2010-11-15 05:11:00.000000000 -0800
++++ gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c	2011-03-17 11:52:57.516694024 -0700
+@@ -2530,6 +2530,10 @@
+ 
+         manager->priv->current_fn_f7_config = -1;
+         manager->priv->fn_f7_configs = NULL;
++
++#ifdef HAVE_LIBNOTIFY
++        notify_init ("gnome-settings-daemon");
++#endif /* HAVE_LIBNOTIFY */
+ }
+ 
+ static void

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-03-17 18:39:31 UTC (rev 115411)
+++ extra-x86_64/PKGBUILD	2011-03-17 20:09:00 UTC (rev 115412)
@@ -4,7 +4,7 @@
 pkgbase=gnome-settings-daemon
 pkgname=(gnome-settings-daemon gnome-settings-daemon-pulse)
 pkgver=2.32.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,17 +16,20 @@
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
         gstreamer-volume-2.30.patch
-        gnome-settings-daemon-2.32.1-libnotify-0.7.patch)
+        gnome-settings-daemon-2.32.1-libnotify-0.7.patch
+        add_notify_init.patch)
 sha256sums=('0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86'
             '4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582'
-            'da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d')
+            'da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d'
+            '3f81b1bf76b4e01fe6264be0de987fe9d346eee305a898dca630dea7d77b61f3')
 
 build() {
   cd "$srcdir"
   cp -a "$pkgbase-$pkgver"{,-pulse}
-  
+
   cd "$pkgbase-$pkgver"
   patch -Np0 -i "${srcdir}/gnome-settings-daemon-2.32.1-libnotify-0.7.patch"
+  patch -Np1 -i "${srcdir}/add_notify_init.patch"
   patch -Np1 -i "${srcdir}/gstreamer-volume-2.30.patch"
   libtoolize --force
   aclocal
@@ -38,6 +41,7 @@
 
   cd "$srcdir/$pkgbase-$pkgver-pulse"
   patch -Np0 -i "${srcdir}/gnome-settings-daemon-2.32.1-libnotify-0.7.patch"
+  patch -Np1 -i "${srcdir}/add_notify_init.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/bin --disable-static --enable-pulse
   make

Added: extra-x86_64/add_notify_init.patch
===================================================================
--- extra-x86_64/add_notify_init.patch	                        (rev 0)
+++ extra-x86_64/add_notify_init.patch	2011-03-17 20:09:00 UTC (rev 115412)
@@ -0,0 +1,14 @@
+diff -Nur gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c
+--- gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c	2010-11-15 05:11:00.000000000 -0800
++++ gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c	2011-03-17 11:52:57.516694024 -0700
+@@ -2530,6 +2530,10 @@
+ 
+         manager->priv->current_fn_f7_config = -1;
+         manager->priv->fn_f7_configs = NULL;
++
++#ifdef HAVE_LIBNOTIFY
++        notify_init ("gnome-settings-daemon");
++#endif /* HAVE_LIBNOTIFY */
+ }
+ 
+ static void