[arch-commits] Commit in seahorse/repos (6 files)

[Ionut Biru]

    Date: Monday, March 7, 2011 @ 07:51:47
  Author: ibiru
Revision: 112875

libnotify 0.7 rebuild

Added:
  seahorse/repos/staging-i686/
  seahorse/repos/staging-i686/seahorse-2.32.0-libnotify-0.7.patch
  seahorse/repos/staging-x86_64/
  seahorse/repos/staging-x86_64/seahorse-2.32.0-libnotify-0.7.patch
Modified:
  seahorse/repos/staging-i686/PKGBUILD
  seahorse/repos/staging-x86_64/PKGBUILD

----------------------------------------------------+
 PKGBUILD                                           |   22 ++++++++++------
 staging-i686/seahorse-2.32.0-libnotify-0.7.patch   |   26 +++++++++++++++++++
 staging-x86_64/seahorse-2.32.0-libnotify-0.7.patch |   26 +++++++++++++++++++
 3 files changed, 66 insertions(+), 8 deletions(-)

Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-07 11:46:14 UTC (rev 112871)
+++ staging-i686/PKGBUILD	2011-03-07 12:51:47 UTC (rev 112875)
@@ -4,21 +4,24 @@
 
 pkgname=seahorse
 pkgver=2.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://projects.gnome.org/seahorse/"
-depends=('libgnome-keyring>=2.32.0' 'avahi>=0.6.27' 'libnotify>=0.4.5' 'libsoup>=2.32.0' 'gpgme>=1.2.0' 'desktop-file-utils' 'hicolor-icon-theme' 'gconf>=2.32.0' 'gnome-keyring')
+depends=('libgnome-keyring>=2.32.0' 'avahi>=0.6.27' 'libnotify>=0.7.1' 'libsoup>=2.32.0' 'gpgme>=1.2.0' 'desktop-file-utils' 'hicolor-icon-theme' 'gconf>=2.32.0' 'gnome-keyring')
 makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.1' 'openssh' 'libsm')
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.32/seahorse-${pkgver}.tar.bz2)
-sha256sums=('f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.32/seahorse-${pkgver}.tar.bz2
+        seahorse-2.32.0-libnotify-0.7.patch)
+sha256sums=('f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d'
+            '8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/seahorse-2.32.0-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-ldap --enable-hkp \

Added: staging-i686/seahorse-2.32.0-libnotify-0.7.patch
===================================================================
--- staging-i686/seahorse-2.32.0-libnotify-0.7.patch	                        (rev 0)
+++ staging-i686/seahorse-2.32.0-libnotify-0.7.patch	2011-03-07 12:51:47 UTC (rev 112875)
@@ -0,0 +1,26 @@
+--- libseahorse/seahorse-notification.c
++++ libseahorse/seahorse-notification.c
+@@ -37,6 +37,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ /* -----------------------------------------------------------------------------
+@@ -231,7 +234,12 @@
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
+-    notif = notify_notification_new (heading, message, snotif->icon, attachto);
++    notif = notify_notification_new (heading, message, snotif->icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , attachto);
++#endif
+     
+     g_free (heading);
+     g_free (message);

Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-07 11:46:14 UTC (rev 112871)
+++ staging-x86_64/PKGBUILD	2011-03-07 12:51:47 UTC (rev 112875)
@@ -4,21 +4,24 @@
 
 pkgname=seahorse
 pkgver=2.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://projects.gnome.org/seahorse/"
-depends=('libgnome-keyring>=2.32.0' 'avahi>=0.6.27' 'libnotify>=0.4.5' 'libsoup>=2.32.0' 'gpgme>=1.2.0' 'desktop-file-utils' 'hicolor-icon-theme' 'gconf>=2.32.0' 'gnome-keyring')
+depends=('libgnome-keyring>=2.32.0' 'avahi>=0.6.27' 'libnotify>=0.7.1' 'libsoup>=2.32.0' 'gpgme>=1.2.0' 'desktop-file-utils' 'hicolor-icon-theme' 'gconf>=2.32.0' 'gnome-keyring')
 makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.1' 'openssh' 'libsm')
 options=('!libtool' '!emptydirs')
 groups=('gnome-extra')
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.32/seahorse-${pkgver}.tar.bz2)
-sha256sums=('f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.32/seahorse-${pkgver}.tar.bz2
+        seahorse-2.32.0-libnotify-0.7.patch)
+sha256sums=('f55468237246a485317d59e2fbc1b1ef5f5bd4c5a7b9ff6f40c3d921af0ed52d'
+            '8f7b2fc0ad1cb572de3c31ed694e5131e8ec6373e9f3e202d98858a12902c467')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/seahorse-2.32.0-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-ldap --enable-hkp \

Added: staging-x86_64/seahorse-2.32.0-libnotify-0.7.patch
===================================================================
--- staging-x86_64/seahorse-2.32.0-libnotify-0.7.patch	                        (rev 0)
+++ staging-x86_64/seahorse-2.32.0-libnotify-0.7.patch	2011-03-07 12:51:47 UTC (rev 112875)
@@ -0,0 +1,26 @@
+--- libseahorse/seahorse-notification.c
++++ libseahorse/seahorse-notification.c
+@@ -37,6 +37,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ /* -----------------------------------------------------------------------------
+@@ -231,7 +234,12 @@
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
+-    notif = notify_notification_new (heading, message, snotif->icon, attachto);
++    notif = notify_notification_new (heading, message, snotif->icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , attachto);
++#endif
+     
+     g_free (heading);
+     g_free (message);