packages (GNOME_2): zenity/zenity.spec, zenity/zenity-libnotify.patch (NEW)...

[lisu]

Author: lisu                         Date: Wed Nov 23 17:12:11 2011 GMT
Module: packages                      Tag: GNOME_2
---- Log message:
- add libnotify 0.7 support

---- Files affected:
packages/zenity:
   zenity.spec (1.62.4.1 -> 1.62.4.2) , zenity-libnotify.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/zenity/zenity.spec
diff -u packages/zenity/zenity.spec:1.62.4.1 packages/zenity/zenity.spec:1.62.4.2
--- packages/zenity/zenity.spec:1.62.4.1	Wed Nov 23 18:05:37 2011
+++ packages/zenity/zenity.spec	Wed Nov 23 18:12:05 2011
@@ -8,6 +8,7 @@
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/zenity/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5:	aa66ec35451b16e424519b4973082170
+Patch0:		%{name}-libnotify.patch
 URL:		http://freshmeat.net/projects/zenity/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 sed -i -e 's/^en at shaw//' po/LINGUAS
 rm -f po/en at shaw.po
@@ -90,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62.4.2  2011/11/23 17:12:05  lisu
+- add libnotify 0.7 support
+
 Revision 1.62.4.1  2011/11/23 17:05:37  lisu
 - rel 2
 

================================================================
Index: packages/zenity/zenity-libnotify.patch
diff -u /dev/null packages/zenity/zenity-libnotify.patch:1.1.2.1
--- /dev/null	Wed Nov 23 18:12:11 2011
+++ packages/zenity/zenity-libnotify.patch	Wed Nov 23 18:12:05 2011
@@ -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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zenity/zenity.spec?r1=1.62.4.1&r2=1.62.4.2&f=u