Date: Sunday, March 6, 2011 @ 16:31:20 Author: ibiru Revision: 112791
libnotify 0.7 rebuild Added: gnome-power-manager/repos/staging-i686/ gnome-power-manager/repos/staging-i686/gnome-power-manager-2.32.0-libnotify-0.7.patch gnome-power-manager/repos/staging-x86_64/ gnome-power-manager/repos/staging-x86_64/gnome-power-manager-2.32.0-libnotify-0.7.patch Modified: gnome-power-manager/repos/staging-i686/PKGBUILD gnome-power-manager/repos/staging-x86_64/PKGBUILD ---------------------------------------------------------------+ PKGBUILD | 22 ++++--- staging-i686/gnome-power-manager-2.32.0-libnotify-0.7.patch | 30 ++++++++++ staging-x86_64/gnome-power-manager-2.32.0-libnotify-0.7.patch | 30 ++++++++++ 3 files changed, 74 insertions(+), 8 deletions(-) Modified: staging-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-06 20:25:51 UTC (rev 112790) +++ staging-i686/PKGBUILD 2011-03-06 21:31:20 UTC (rev 112791) @@ -3,22 +3,25 @@ pkgname=gnome-power-manager pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." arch=(i686 x86_64) url="http://www.gnome.org/projects/gnome-power-manager/"; license=('GPL') -depends=('libnotify>=0.4.5' 'libunique>=1.1.6' 'libcanberra>=0.25' 'hicolor-icon-theme' 'upower>=0.9.5' 'libgnome-keyring>=2.31.92') +depends=('libnotify>=0.7.1' 'libunique>=1.1.6' 'libcanberra>=0.25' 'hicolor-icon-theme' 'upower>=0.9.5' 'libgnome-keyring>=2.31.92') makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.1' 'gnome-panel-bonobo>=2.31.92') optdepends=('gnome-panel-bonobo: panel applets') options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) -source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476') +source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.32/${pkgname}-${pkgver}.tar.bz2 + gnome-power-manager-2.32.0-libnotify-0.7.patch) +sha256sums=('17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476' + '50e2f726281805f2b1eb3fbce2e8aa7a4258de12a20bb09e57527235c82760d2') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/gnome-power-manager-2.32.0-libnotify-0.7.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-power-manager \ Added: staging-i686/gnome-power-manager-2.32.0-libnotify-0.7.patch =================================================================== --- staging-i686/gnome-power-manager-2.32.0-libnotify-0.7.patch (rev 0) +++ staging-i686/gnome-power-manager-2.32.0-libnotify-0.7.patch 2011-03-06 21:31:20 UTC (rev 112791) @@ -0,0 +1,30 @@ +--- src/gpm-manager.c ++++ src/gpm-manager.c +@@ -43,6 +43,10 @@ + #include <libupower-glib/upower.h> + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "egg-debug.h" + #include "egg-console-kit.h" + +@@ -480,12 +484,16 @@ + /* close any existing notification of this class */ + gpm_manager_notify_close (manager, *notification_class); + ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notification = notify_notification_new (title, message, icon); ++#else + /* if the status icon is hidden, don't point at it */ + if (manager->priv->status_icon != NULL && + gtk_status_icon_is_embedded (manager->priv->status_icon)) + notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon); + else + notification = notify_notification_new (title, message, icon, NULL); ++#endif + notify_notification_set_timeout (notification, timeout); + notify_notification_set_urgency (notification, urgency); + g_signal_connect (notification, "closed", G_CALLBACK (gpm_manager_notification_closed_cb), notification_class); Modified: staging-x86_64/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-06 20:25:51 UTC (rev 112790) +++ staging-x86_64/PKGBUILD 2011-03-06 21:31:20 UTC (rev 112791) @@ -3,22 +3,25 @@ pkgname=gnome-power-manager pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system." arch=(i686 x86_64) url="http://www.gnome.org/projects/gnome-power-manager/"; license=('GPL') -depends=('libnotify>=0.4.5' 'libunique>=1.1.6' 'libcanberra>=0.25' 'hicolor-icon-theme' 'upower>=0.9.5' 'libgnome-keyring>=2.31.92') +depends=('libnotify>=0.7.1' 'libunique>=1.1.6' 'libcanberra>=0.25' 'hicolor-icon-theme' 'upower>=0.9.5' 'libgnome-keyring>=2.31.92') makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.1' 'gnome-panel-bonobo>=2.31.92') optdepends=('gnome-panel-bonobo: panel applets') options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) -source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476') +source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.32/${pkgname}-${pkgver}.tar.bz2 + gnome-power-manager-2.32.0-libnotify-0.7.patch) +sha256sums=('17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476' + '50e2f726281805f2b1eb3fbce2e8aa7a4258de12a20bb09e57527235c82760d2') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/gnome-power-manager-2.32.0-libnotify-0.7.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-power-manager \ Added: staging-x86_64/gnome-power-manager-2.32.0-libnotify-0.7.patch =================================================================== --- staging-x86_64/gnome-power-manager-2.32.0-libnotify-0.7.patch (rev 0) +++ staging-x86_64/gnome-power-manager-2.32.0-libnotify-0.7.patch 2011-03-06 21:31:20 UTC (rev 112791) @@ -0,0 +1,30 @@ +--- src/gpm-manager.c ++++ src/gpm-manager.c +@@ -43,6 +43,10 @@ + #include <libupower-glib/upower.h> + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "egg-debug.h" + #include "egg-console-kit.h" + +@@ -480,12 +484,16 @@ + /* close any existing notification of this class */ + gpm_manager_notify_close (manager, *notification_class); + ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notification = notify_notification_new (title, message, icon); ++#else + /* if the status icon is hidden, don't point at it */ + if (manager->priv->status_icon != NULL && + gtk_status_icon_is_embedded (manager->priv->status_icon)) + notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon); + else + notification = notify_notification_new (title, message, icon, NULL); ++#endif + notify_notification_set_timeout (notification, timeout); + notify_notification_set_urgency (notification, urgency); + g_signal_connect (notification, "closed", G_CALLBACK (gpm_manager_notification_closed_cb), notification_class);
