packages: dhcpcd-ui/dhcpcd-ui.spec, dhcpcd-ui/dhcpcd-ui-libnotify.patch (NE...

[lisu]

Author: lisu                         Date: Thu Apr  7 09:32:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with libnotify 0.7

---- Files affected:
packages/dhcpcd-ui:
   dhcpcd-ui.spec (1.4 -> 1.5) , dhcpcd-ui-libnotify.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dhcpcd-ui/dhcpcd-ui.spec
diff -u packages/dhcpcd-ui/dhcpcd-ui.spec:1.4 packages/dhcpcd-ui/dhcpcd-ui.spec:1.5
--- packages/dhcpcd-ui/dhcpcd-ui.spec:1.4	Thu Apr  7 10:31:11 2011
+++ packages/dhcpcd-ui/dhcpcd-ui.spec	Thu Apr  7 11:31:57 2011
@@ -7,6 +7,7 @@
 Group:		Libraries
 Source0:	http://roy.marples.name/downloads/dhcpcd/%{name}-%{version}.tar.bz2
 # Source0-md5:	a42b15650de093bcd3dd60fb94a483f7
+Patch0:		%{name}-libnotify.patch
 URL:		http://roy.marples.name/projects/dhcpcd-ui/wiki
 BuildRequires:	dbus-devel
 BuildRequires:	gtk+2-devel
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -57,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/04/07 09:31:57  lisu
+- fix build with libnotify 0.7
+
 Revision 1.4  2011/04/07 08:31:11  lisu
 - rel 2
 

================================================================
Index: packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch
diff -u /dev/null packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch:1.1
--- /dev/null	Thu Apr  7 11:32:02 2011
+++ packages/dhcpcd-ui/dhcpcd-ui-libnotify.patch	Thu Apr  7 11:31:57 2011
@@ -0,0 +1,15 @@
+--- dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c~	2010-06-09 15:55:38.000000000 +0200
++++ dhcpcd-ui-0.5.1/src/dhcpcd-gtk/main.c	2011-04-07 11:30:09.459298809 +0200
+@@ -198,7 +198,11 @@
+ 		nn = notify_notification_new_with_status_icon(title,
+ 		    msg, icon, status_icon);
+ 	else
+-		nn = notify_notification_new(title, msg, icon, NULL);
++		nn = notify_notification_new(title, msg, icon
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++				, NULL
++#endif
++				);
+ 	notify_notification_set_timeout(nn, 5000);
+ 	g_signal_connect(nn, "closed", G_CALLBACK(notify_closed), NULL);
+ 	notify_notification_show(nn, NULL);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcpcd-ui/dhcpcd-ui.spec?r1=1.4&r2=1.5&f=u