Date: Sunday, March 6, 2011 @ 14:49:19 Author: ibiru Revision: 112788
libnotify 0.7 rebuild Added: gnome-bluetooth/repos/staging-i686/ gnome-bluetooth/repos/staging-i686/gnome-bluetooth-2.32.0-libnotify-0.7.patch gnome-bluetooth/repos/staging-x86_64/ gnome-bluetooth/repos/staging-x86_64/gnome-bluetooth-2.32.0-libnotify-0.7.patch Modified: gnome-bluetooth/repos/staging-i686/PKGBUILD gnome-bluetooth/repos/staging-x86_64/PKGBUILD -----------------------------------------------------------+ PKGBUILD | 32 +++++++----- staging-i686/gnome-bluetooth-2.32.0-libnotify-0.7.patch | 27 ++++++++++ staging-x86_64/gnome-bluetooth-2.32.0-libnotify-0.7.patch | 27 ++++++++++ 3 files changed, 74 insertions(+), 12 deletions(-) Modified: staging-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-06 19:39:31 UTC (rev 112787) +++ staging-i686/PKGBUILD 2011-03-06 19:49:19 UTC (rev 112788) @@ -4,29 +4,33 @@ pkgname=gnome-bluetooth pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') -depends=('libunique>=1.1.6' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.3' 'obexd-client>=0.33' 'dconf') -makedepends=('intltool' 'pygtk>=2.22' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto>=2.28.4' 'gobject-introspection>=0.9.6') +depends=('libunique>=1.1.6' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.3' 'obexd-client>=0.33' 'dconf') +makedepends=('intltool' 'pygtk>=2.22' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto>=2.28.4') replaces=('bluez-gnome') conflicts=('bluez-gnome') options=('!libtool' '!emptydirs' '!makeflags') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2 - 61-gnome-bluetooth-rfkill.rules) + 61-gnome-bluetooth-rfkill.rules + gnome-bluetooth-2.32.0-libnotify-0.7.patch) sha256sums=('57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973' - 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') + 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474' + '42b8388156249bd7c8a18db6d6aef18895ce861f2a79cb937e55eda864245838') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/gnome-bluetooth-2.32.0-libnotify-0.7.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-desktop-update \ --disable-icon-update \ - --disable-schemas-compile + --disable-schemas-compile \ + --enable-introspection=no make } Added: staging-i686/gnome-bluetooth-2.32.0-libnotify-0.7.patch =================================================================== --- staging-i686/gnome-bluetooth-2.32.0-libnotify-0.7.patch (rev 0) +++ staging-i686/gnome-bluetooth-2.32.0-libnotify-0.7.patch 2011-03-06 19:49:19 UTC (rev 112788) @@ -0,0 +1,27 @@ +--- applet/notify.c ++++ applet/notify.c +@@ -31,6 +31,10 @@ + #include <libnotify/notify.h> + #include "notify.h" + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static GtkStatusIcon *statusicon = NULL; + static char *icon_name = NULL; + static char *tooltip = NULL; +@@ -71,7 +75,12 @@ + notify_notification_close(notify, NULL); + } + +- notify = notify_notification_new(summary, message, icon_name, NULL); ++ notify = notify_notification_new(summary, message, icon_name ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + notify_notification_set_timeout(notify, timeout); + Modified: staging-x86_64/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-06 19:39:31 UTC (rev 112787) +++ staging-x86_64/PKGBUILD 2011-03-06 19:49:19 UTC (rev 112788) @@ -4,29 +4,33 @@ pkgname=gnome-bluetooth pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') -depends=('libunique>=1.1.6' 'libnotify>=0.4.5' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.3' 'obexd-client>=0.33' 'dconf') -makedepends=('intltool' 'pygtk>=2.22' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto>=2.28.4' 'gobject-introspection>=0.9.6') +depends=('libunique>=1.1.6' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'gvfs-obexftp>=1.6.3' 'obexd-client>=0.33' 'dconf') +makedepends=('intltool' 'pygtk>=2.22' 'gnome-doc-utils>=0.20.1' 'nautilus-sendto>=2.28.4') replaces=('bluez-gnome') conflicts=('bluez-gnome') options=('!libtool' '!emptydirs' '!makeflags') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2 - 61-gnome-bluetooth-rfkill.rules) + 61-gnome-bluetooth-rfkill.rules + gnome-bluetooth-2.32.0-libnotify-0.7.patch) sha256sums=('57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973' - 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') + 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474' + '42b8388156249bd7c8a18db6d6aef18895ce861f2a79cb937e55eda864245838') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/gnome-bluetooth-2.32.0-libnotify-0.7.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-desktop-update \ --disable-icon-update \ - --disable-schemas-compile + --disable-schemas-compile \ + --enable-introspection=no make } Added: staging-x86_64/gnome-bluetooth-2.32.0-libnotify-0.7.patch =================================================================== --- staging-x86_64/gnome-bluetooth-2.32.0-libnotify-0.7.patch (rev 0) +++ staging-x86_64/gnome-bluetooth-2.32.0-libnotify-0.7.patch 2011-03-06 19:49:19 UTC (rev 112788) @@ -0,0 +1,27 @@ +--- applet/notify.c ++++ applet/notify.c +@@ -31,6 +31,10 @@ + #include <libnotify/notify.h> + #include "notify.h" + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + static GtkStatusIcon *statusicon = NULL; + static char *icon_name = NULL; + static char *tooltip = NULL; +@@ -71,7 +75,12 @@ + notify_notification_close(notify, NULL); + } + +- notify = notify_notification_new(summary, message, icon_name, NULL); ++ notify = notify_notification_new(summary, message, icon_name ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + notify_notification_set_timeout(notify, timeout); +