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

[Ionut Biru]

    Date: Monday, March 7, 2011 @ 14:37:34
  Author: ibiru
Revision: 112936

libnotify 0.7 rebuild

Added:
  zenity/repos/staging-i686/
  zenity/repos/staging-i686/zenity-2.32.1-libnotify-0.7.patch
  zenity/repos/staging-x86_64/
  zenity/repos/staging-x86_64/zenity-2.32.1-libnotify-0.7.patch
Modified:
  zenity/repos/staging-i686/PKGBUILD
  zenity/repos/staging-x86_64/PKGBUILD

--------------------------------------------------+
 PKGBUILD                                         |   22 ++++++++++-------
 staging-i686/zenity-2.32.1-libnotify-0.7.patch   |   27 +++++++++++++++++++++
 staging-x86_64/zenity-2.32.1-libnotify-0.7.patch |   27 +++++++++++++++++++++
 3 files changed, 68 insertions(+), 8 deletions(-)

Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-07 19:28:46 UTC (rev 112935)
+++ staging-i686/PKGBUILD	2011-03-07 19:37:34 UTC (rev 112936)
@@ -3,19 +3,22 @@
 
 pkgname=zenity
 pkgver=2.32.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libnotify>=0.4.5')
+depends=('libnotify>=0.7.1' 'gtk2')
 makedepends=('intltool' 'gnome-doc-utils>=0.20.2')
 groups=('gnome-extra')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
+        zenity-2.32.1-libnotify-0.7.patch)
+sha256sums=('8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac'
+            '98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/zenity-2.32.1-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make

Added: staging-i686/zenity-2.32.1-libnotify-0.7.patch
===================================================================
--- staging-i686/zenity-2.32.1-libnotify-0.7.patch	                        (rev 0)
+++ staging-i686/zenity-2.32.1-libnotify-0.7.patch	2011-03-07 19:37:34 UTC (rev 112936)
@@ -0,0 +1,27 @@
+--- src/notification.c
++++ src/notification.c
+@@ -30,6 +30,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #include "zenity.h"
+@@ -184,10 +187,14 @@
+             icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
+           }
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++          /* notify_notification_new_with_status_icon was removed */
++#else
+           notif = notify_notification_new_with_status_icon (
+                               message[0] /* title */,
+                               message[1] /* summary */,
+                               icon, status_icon);
++#endif
+ 
+           g_strfreev (message);
+           g_free (freeme);

Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-07 19:28:46 UTC (rev 112935)
+++ staging-x86_64/PKGBUILD	2011-03-07 19:37:34 UTC (rev 112936)
@@ -3,19 +3,22 @@
 
 pkgname=zenity
 pkgver=2.32.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libnotify>=0.4.5')
+depends=('libnotify>=0.7.1' 'gtk2')
 makedepends=('intltool' 'gnome-doc-utils>=0.20.2')
 groups=('gnome-extra')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
+        zenity-2.32.1-libnotify-0.7.patch)
+sha256sums=('8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac'
+            '98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/zenity-2.32.1-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper
   make

Added: staging-x86_64/zenity-2.32.1-libnotify-0.7.patch
===================================================================
--- staging-x86_64/zenity-2.32.1-libnotify-0.7.patch	                        (rev 0)
+++ staging-x86_64/zenity-2.32.1-libnotify-0.7.patch	2011-03-07 19:37:34 UTC (rev 112936)
@@ -0,0 +1,27 @@
+--- src/notification.c
++++ src/notification.c
+@@ -30,6 +30,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #include "zenity.h"
+@@ -184,10 +187,14 @@
+             icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
+           }
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++          /* notify_notification_new_with_status_icon was removed */
++#else
+           notif = notify_notification_new_with_status_icon (
+                               message[0] /* title */,
+                               message[1] /* summary */,
+                               icon, status_icon);
++#endif
+ 
+           g_strfreev (message);
+           g_free (freeme);