[arch-commits] Commit in gnome-settings-daemon/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Sun Mar 6 20:25:51 UTC 2011
Date: Sunday, March 6, 2011 @ 15:25:51
Author: ibiru
Revision: 112790
libnotify 0.7 rebuild
Added:
gnome-settings-daemon/repos/staging-i686/
gnome-settings-daemon/repos/staging-i686/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
gnome-settings-daemon/repos/staging-x86_64/
gnome-settings-daemon/repos/staging-x86_64/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
Modified:
gnome-settings-daemon/repos/staging-i686/PKGBUILD
gnome-settings-daemon/repos/staging-x86_64/PKGBUILD
-----------------------------------------------------------------+
PKGBUILD | 24 ++-
staging-i686/gnome-settings-daemon-2.32.1-libnotify-0.7.patch | 76 ++++++++++
staging-x86_64/gnome-settings-daemon-2.32.1-libnotify-0.7.patch | 76 ++++++++++
3 files changed, 168 insertions(+), 8 deletions(-)
Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-03-06 20:08:19 UTC (rev 112789)
+++ staging-i686/PKGBUILD 2011-03-06 20:25:51 UTC (rev 112790)
@@ -4,26 +4,29 @@
pkgbase=gnome-settings-daemon
pkgname=(gnome-settings-daemon gnome-settings-daemon-pulse)
pkgver=2.32.1
-pkgrel=2
+pkgrel=3
pkgdesc="The GNOME Settings daemon"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libgnomekbd>=2.32.0' 'gnome-desktop>=2.32.0' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'libgnome-data')
+depends=('libgnomekbd>=2.32.0' 'gnome-desktop>=2.32.0' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'libgnome-data')
makedepends=('intltool' 'libpulse' 'gstreamer0.10-base>=0.10.30' 'libcanberra')
options=('!emptydirs' '!libtool')
install=gnome-settings-daemon.install
url="http://www.gnome.org"
groups=('gnome')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
- gstreamer-volume-2.30.patch)
+ gstreamer-volume-2.30.patch
+ gnome-settings-daemon-2.32.1-libnotify-0.7.patch)
sha256sums=('0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86'
- '4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582')
+ '4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582'
+ 'da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d')
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}/gstreamer-volume-2.30.patch"
libtoolize --force
aclocal
@@ -34,6 +37,7 @@
make
cd "$srcdir/$pkgbase-$pkgver-pulse"
+ patch -Np0 -i "${srcdir}/gnome-settings-daemon-2.32.1-libnotify-0.7.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/bin --disable-static --enable-pulse
make
Added: staging-i686/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
===================================================================
--- staging-i686/gnome-settings-daemon-2.32.1-libnotify-0.7.patch (rev 0)
+++ staging-i686/gnome-settings-daemon-2.32.1-libnotify-0.7.patch 2011-03-06 20:25:51 UTC (rev 112790)
@@ -0,0 +1,76 @@
+--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -48,6 +48,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif /* HAVE_LIBNOTIFY */
+
+ #include "gnome-settings-profile.h"
+@@ -608,9 +611,13 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
++ "preferences-desktop-accessibility"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
+ notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++#endif
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+@@ -747,9 +754,13 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
++ "preferences-desktop-accessibility"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
+ notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++#endif
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+--- plugins/xrandr/gsd-xrandr-manager.c
++++ plugins/xrandr/gsd-xrandr-manager.c
+@@ -48,6 +48,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #include "gnome-settings-profile.h"
+@@ -1086,6 +1089,11 @@
+
+ g_assert (error_to_display == NULL || secondary_text == NULL);
+
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ notification = notify_notification_new (primary_text,
++ error_to_display ? error_to_display->message : secondary_text,
++ GSD_XRANDR_ICON_NAME);
++#else
+ if (priv->status_icon)
+ notification = notify_notification_new_with_status_icon (primary_text,
+ error_to_display ? error_to_display->message : secondary_text,
+@@ -1096,6 +1104,7 @@
+ error_to_display ? error_to_display->message : secondary_text,
+ GSD_XRANDR_ICON_NAME,
+ NULL);
++#endif
+
+ notify_notification_show (notification, NULL); /* NULL-GError */
+ #else
Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-03-06 20:08:19 UTC (rev 112789)
+++ staging-x86_64/PKGBUILD 2011-03-06 20:25:51 UTC (rev 112790)
@@ -4,26 +4,29 @@
pkgbase=gnome-settings-daemon
pkgname=(gnome-settings-daemon gnome-settings-daemon-pulse)
pkgver=2.32.1
-pkgrel=2
+pkgrel=3
pkgdesc="The GNOME Settings daemon"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libgnomekbd>=2.32.0' 'gnome-desktop>=2.32.0' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'libgnome-data')
+depends=('libgnomekbd>=2.32.0' 'gnome-desktop>=2.32.0' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'libgnome-data')
makedepends=('intltool' 'libpulse' 'gstreamer0.10-base>=0.10.30' 'libcanberra')
options=('!emptydirs' '!libtool')
install=gnome-settings-daemon.install
url="http://www.gnome.org"
groups=('gnome')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
- gstreamer-volume-2.30.patch)
+ gstreamer-volume-2.30.patch
+ gnome-settings-daemon-2.32.1-libnotify-0.7.patch)
sha256sums=('0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86'
- '4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582')
+ '4b2a14c0e238f3cde71619b74f178544151bb319dee84b52133a254b85548582'
+ 'da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d')
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}/gstreamer-volume-2.30.patch"
libtoolize --force
aclocal
@@ -34,6 +37,7 @@
make
cd "$srcdir/$pkgbase-$pkgver-pulse"
+ patch -Np0 -i "${srcdir}/gnome-settings-daemon-2.32.1-libnotify-0.7.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/bin --disable-static --enable-pulse
make
Added: staging-x86_64/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
===================================================================
--- staging-x86_64/gnome-settings-daemon-2.32.1-libnotify-0.7.patch (rev 0)
+++ staging-x86_64/gnome-settings-daemon-2.32.1-libnotify-0.7.patch 2011-03-06 20:25:51 UTC (rev 112790)
@@ -0,0 +1,76 @@
+--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -48,6 +48,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif /* HAVE_LIBNOTIFY */
+
+ #include "gnome-settings-profile.h"
+@@ -608,9 +611,13 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
++ "preferences-desktop-accessibility"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
+ notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++#endif
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+@@ -747,9 +754,13 @@
+ gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+ manager->priv->notification = notify_notification_new (title,
+ message,
+- "preferences-desktop-accessibility",
+- NULL);
++ "preferences-desktop-accessibility"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ );
++#else
++ , NULL);
+ notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++#endif
+ notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+
+ notify_notification_add_action (manager->priv->notification,
+--- plugins/xrandr/gsd-xrandr-manager.c
++++ plugins/xrandr/gsd-xrandr-manager.c
+@@ -48,6 +48,9 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+
+ #include "gnome-settings-profile.h"
+@@ -1086,6 +1089,11 @@
+
+ g_assert (error_to_display == NULL || secondary_text == NULL);
+
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++ notification = notify_notification_new (primary_text,
++ error_to_display ? error_to_display->message : secondary_text,
++ GSD_XRANDR_ICON_NAME);
++#else
+ if (priv->status_icon)
+ notification = notify_notification_new_with_status_icon (primary_text,
+ error_to_display ? error_to_display->message : secondary_text,
+@@ -1096,6 +1104,7 @@
+ error_to_display ? error_to_display->message : secondary_text,
+ GSD_XRANDR_ICON_NAME,
+ NULL);
++#endif
+
+ notify_notification_show (notification, NULL); /* NULL-GError */
+ #else
More information about the arch-commits
mailing list