Date: Monday, March 7, 2011 @ 06:32:09 Author: ibiru Revision: 112866
libnotify 0.7 rebuild Added: notification-daemon/repos/staging-i686/ notification-daemon/repos/staging-i686/notification-daemon-0.4.0-libnotify-0.7.patch notification-daemon/repos/staging-x86_64/ notification-daemon/repos/staging-x86_64/notification-daemon-0.4.0-libnotify-0.7.patch Modified: notification-daemon/repos/staging-i686/PKGBUILD notification-daemon/repos/staging-x86_64/PKGBUILD --------------------------------------------------------------+ PKGBUILD | 38 +++++----- staging-i686/notification-daemon-0.4.0-libnotify-0.7.patch | 29 +++++++ staging-x86_64/notification-daemon-0.4.0-libnotify-0.7.patch | 29 +++++++ 3 files changed, 80 insertions(+), 16 deletions(-) Modified: staging-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-07 11:16:19 UTC (rev 112864) +++ staging-i686/PKGBUILD 2011-03-07 11:32:09 UTC (rev 112866) @@ -4,28 +4,31 @@ pkgname=notification-daemon pkgver=0.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="Notification daemon for the desktop notifications framework" arch=(i686 x86_64) license=('GPL') url="http://www.galago-project.org/specs/notification/" -depends=('libsexy>=0.1.11' 'libwnck>=2.28.0' 'gconf>=2.28.0' 'gstreamer0.10-base>=0.10.25' 'libnotify>=0.4.5' 'libglade>=2.6.4' 'hicolor-icon-theme') +depends=('libsexy>=0.1.11' 'libwnck>=2.28.0' 'gconf>=2.28.0' 'gstreamer0.10-base>=0.10.25' 'libnotify>=0.7.1' 'libglade>=2.6.4' 'hicolor-icon-theme') groups=('gnome') makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') install=notification-daemon.install -source=(http://www.galago-project.org/files/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e61eff9782551d81045bb53e8a801d58') +source=(http://www.galago-project.org/files/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + notification-daemon-0.4.0-libnotify-0.7.patch) +md5sums=('e61eff9782551d81045bb53e8a801d58' + '1708e98353cab38a7c057b4385826c04') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/notification-daemon-0.4.0-libnotify-0.7.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/notification-daemon-1.0 \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain notification-daemon ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain notification-daemon ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Added: staging-i686/notification-daemon-0.4.0-libnotify-0.7.patch =================================================================== --- staging-i686/notification-daemon-0.4.0-libnotify-0.7.patch (rev 0) +++ staging-i686/notification-daemon-0.4.0-libnotify-0.7.patch 2011-03-07 11:32:09 UTC (rev 112866) @@ -0,0 +1,29 @@ +diff -Nur notification-daemon-0.4.0.orig/src/capplet/notification-properties.c notification-daemon-0.4.0/src/capplet/notification-properties.c +--- notification-daemon-0.4.0.orig/src/capplet/notification-properties.c 2008-11-20 02:46:16.000000000 -0800 ++++ notification-daemon-0.4.0/src/capplet/notification-properties.c 2011-03-07 03:23:07.293334003 -0800 +@@ -28,6 +28,10 @@ + #include <string.h> + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "../daemon/stack.h" + + #define GCONF_KEY_DAEMON "/apps/notification-daemon" +@@ -434,8 +438,12 @@ + + dialog->preview = notify_notification_new(_("Notification Test"), + _("Just a test"), +- "gnome-util", +- NULL); ++ "gnome-util" ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + if (!notify_notification_show(dialog->preview, &error)) + { Modified: staging-x86_64/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-03-07 11:16:19 UTC (rev 112864) +++ staging-x86_64/PKGBUILD 2011-03-07 11:32:09 UTC (rev 112866) @@ -4,28 +4,31 @@ pkgname=notification-daemon pkgver=0.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="Notification daemon for the desktop notifications framework" arch=(i686 x86_64) license=('GPL') url="http://www.galago-project.org/specs/notification/" -depends=('libsexy>=0.1.11' 'libwnck>=2.28.0' 'gconf>=2.28.0' 'gstreamer0.10-base>=0.10.25' 'libnotify>=0.4.5' 'libglade>=2.6.4' 'hicolor-icon-theme') +depends=('libsexy>=0.1.11' 'libwnck>=2.28.0' 'gconf>=2.28.0' 'gstreamer0.10-base>=0.10.25' 'libnotify>=0.7.1' 'libglade>=2.6.4' 'hicolor-icon-theme') groups=('gnome') makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') install=notification-daemon.install -source=(http://www.galago-project.org/files/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e61eff9782551d81045bb53e8a801d58') +source=(http://www.galago-project.org/files/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + notification-daemon-0.4.0-libnotify-0.7.patch) +md5sums=('e61eff9782551d81045bb53e8a801d58' + '1708e98353cab38a7c057b4385826c04') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/notification-daemon-0.4.0-libnotify-0.7.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/notification-daemon-1.0 \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain notification-daemon ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain notification-daemon ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Added: staging-x86_64/notification-daemon-0.4.0-libnotify-0.7.patch =================================================================== --- staging-x86_64/notification-daemon-0.4.0-libnotify-0.7.patch (rev 0) +++ staging-x86_64/notification-daemon-0.4.0-libnotify-0.7.patch 2011-03-07 11:32:09 UTC (rev 112866) @@ -0,0 +1,29 @@ +diff -Nur notification-daemon-0.4.0.orig/src/capplet/notification-properties.c notification-daemon-0.4.0/src/capplet/notification-properties.c +--- notification-daemon-0.4.0.orig/src/capplet/notification-properties.c 2008-11-20 02:46:16.000000000 -0800 ++++ notification-daemon-0.4.0/src/capplet/notification-properties.c 2011-03-07 03:23:07.293334003 -0800 +@@ -28,6 +28,10 @@ + #include <string.h> + #include <libnotify/notify.h> + ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include "../daemon/stack.h" + + #define GCONF_KEY_DAEMON "/apps/notification-daemon" +@@ -434,8 +438,12 @@ + + dialog->preview = notify_notification_new(_("Notification Test"), + _("Just a test"), +- "gnome-util", +- NULL); ++ "gnome-util" ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + if (!notify_notification_show(dialog->preview, &error)) + {