packages: ekiga/ekiga.spec, ekiga/ekiga-libnotify.patch (NEW) - fix build w...

[lisu]

Author: lisu                         Date: Thu Apr  7 11:25:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with libnotify 0.7

---- Files affected:
packages/ekiga:
   ekiga.spec (1.47 -> 1.48) , ekiga-libnotify.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ekiga/ekiga.spec
diff -u packages/ekiga/ekiga.spec:1.47 packages/ekiga/ekiga.spec:1.48
--- packages/ekiga/ekiga.spec:1.47	Thu Apr  7 11:46:57 2011
+++ packages/ekiga/ekiga.spec	Thu Apr  7 13:25:45 2011
@@ -9,6 +9,7 @@
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ekiga/3.2/%{name}-%{version}.tar.gz
 # Source0-md5:	bdc787550c4cf5acf873788f5ea153ba
 Patch0:		%{name}-shell.patch
+Patch1:		%{name}-libnotify.patch
 URL:		http://www.ekiga.org/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	SDL-devel
@@ -71,6 +72,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 sed -i -e 's|Categories=GNOME;GTK;Network;Telephony;|Categories=GTK;GNOME;Network;InstantMessaging;|' ekiga.desktop.in.in
 
 %build
@@ -132,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2011/04/07 11:25:45  lisu
+- fix build with libnotify 0.7
+
 Revision 1.47  2011/04/07 09:46:57  lisu
 - rel 5
 

================================================================
Index: packages/ekiga/ekiga-libnotify.patch
diff -u /dev/null packages/ekiga/ekiga-libnotify.patch:1.1
--- /dev/null	Thu Apr  7 13:25:51 2011
+++ packages/ekiga/ekiga-libnotify.patch	Thu Apr  7 13:25:45 2011
@@ -0,0 +1,30 @@
+--- ekiga-3.2.7/lib/engine/components/libnotify/libnotify-main.cpp~	2010-05-30 23:58:01.000000000 +0200
++++ ekiga-3.2.7/lib/engine/components/libnotify/libnotify-main.cpp	2011-04-07 13:22:56.466190747 +0200
+@@ -158,7 +158,11 @@
+ 
+   notif = notify_notification_new (notification->get_title ().c_str (),
+ 				   notification->get_body ().c_str (),
+-				   urgency, NULL);
++				   urgency
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++				   , NULL
++#endif
++				   );
+ 
+   g_signal_connect (notif, "closed",
+ 		    G_CALLBACK (on_notif_closed), notification.get ());
+--- ekiga-3.2.7/src/gui/main.cpp~	2010-05-30 23:58:01.000000000 +0200
++++ ekiga-3.2.7/src/gui/main.cpp	2011-04-07 13:23:45.542858431 +0200
+@@ -2820,7 +2820,11 @@
+ 
+   body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
+   
+-  notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
++  notify = notify_notification_new (title, body, GM_ICON_LOGO
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++		  , NULL
++#endif
++		  );
+   notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
+   notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
+   notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ekiga/ekiga.spec?r1=1.47&r2=1.48&f=u