Fix building with x11-libs/libnotify >= 0.7 wrt #355929 by "Kobboi".

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

4 files changed, 74 insertions, 5 deletions

diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog
index b6a1423aa53e..89683049eea9 100644
--- a/net-voip/ekiga/ChangeLog
+++ b/net-voip/ekiga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-voip/ekiga
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.24 2011/02/02 05:36:52 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.25 2011/02/28 17:15:37 ssuominen Exp $
+
+  28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ekiga-3.2.7.ebuild,
+  +files/ekiga-3.2.7-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7 wrt #355929 by "Kobboi".
 
   02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> ekiga-3.2.7.ebuild:
   Cleanup: bump to EAPI3, use add_kdebase_dep
diff --git a/net-voip/ekiga/Manifest b/net-voip/ekiga/Manifest
index c49213118efc..6a5757d869fe 100644
--- a/net-voip/ekiga/Manifest
+++ b/net-voip/ekiga/Manifest
@@ -1,11 +1,12 @@
 AUX ekiga-1.99.0-configure.patch 669 RMD160 fa6cfdb6f1613e63b3af9a60d4f14b0260bae2db SHA1 c7f05a63821c2f890f6bc4dc9b3a848500833e7d SHA256 5c8ffcb27ebf51a0f39ae866e8b9637f56bad8fe113adb6122da4d973d55dd80
 AUX ekiga-2.0.12-gdu.patch 2274 RMD160 b7f44eee0568e3baa844a2e08994718711bfe773 SHA1 6b5c6fdd950ff196f7f87546f403144f09a60b0a SHA256 c0877de2bb725f26d162d5f48d14302753ddf6e7b5ad318d5aa39759abc8e32c
+AUX ekiga-3.2.7-libnotify-0.7.patch 1820 RMD160 b3a06ff2e33f5fc1bdb4367b3de4ec565dcc0c5a SHA1 4cf452cb5bfc81a5c7c41621dea19bb162ba9a57 SHA256 ad850d4e81a958081220f450a49ba9c10209d03f066f6afee99477c815c23daf
 AUX ekiga-eggtrayicon-transparency.diff 2960 RMD160 9303bf9c0dcb2f666b88622a772540136f0a63df SHA1 d8a7b866ba119d286899f19a3ddb618f117398de SHA256 9cf235b64f1201e0119a55c76db6d1c243abb971757e5d781aa95c3724138e37
 AUX ekiga-eggtrayicon-update.diff 13969 RMD160 159f1164516362b90ef8e63988ba5fa77c544e13 SHA1 edc6809219a312483f2f8c77f07a0d88a2ce5cff SHA256 1db286369b81677d559b38261ce5f6686de41e3d645808f7ecb57cee6eaf82d6
 AUX not-gnome.patch 413 RMD160 571716d78f27b192ed36e5259d676ed4320bf1bd SHA1 1f19b5d7add4db5fa1f4e301d92101188c48006f SHA256 6287ffec378a85425ecd0b4f6ea9b445c3151c7259d130630de63f88dbd69c8d
 DIST ekiga-2.0.12.tar.bz2 6109264 RMD160 04ee5c8a878650b545e9e2a547a08dde4e7be3c8 SHA1 e80a2dae4541708768ac8c38ebb1452a2d0911d4 SHA256 5747802480b44a3cde8fd52f381b1761db52354d74fce7df380a2fbaa71910e9
 DIST ekiga-3.2.7.tar.bz2 9093433 RMD160 0e87b60f144df65f3070c21fe7b8126e42941196 SHA1 c2ed571a5f5f058b6d80c091dd69dfe557c17df2 SHA256 f25a1309b68eafe69f0d7aed461bc9a8196939060543d09bd2f19e0bb1e3fd8f
 EBUILD ekiga-2.0.12.ebuild 2364 RMD160 5fbb45773a8a43cdbbd39cc1d3dd9ea4b6f8def1 SHA1 0d9b91cde40c812fe9ea93cd9e074ffc184c4071 SHA256 3656897a6d7059d9c0c7c2ec3675e8e979b580cb3e94f13f17678d146942aa9a
-EBUILD ekiga-3.2.7.ebuild 5003 RMD160 2fbd0225b69a25561be9c96ed49ebae12d9070f7 SHA1 e08b8277e38df2942d337fcb3658ee0eff83e67e SHA256 747e64d1d2d68733ee972077c44480929b84097ff8a71c99867f5224c33fe4f8
-MISC ChangeLog 11661 RMD160 d293eb5646f81c71bae49a2f3f5acb14de977135 SHA1 e499e84c3cdc81358532f2083c4e664394a4b780 SHA256 8abe9d292c8adb3ec791643dd4282718789b8f94c7d375dec9ebb0e0805a286a
+EBUILD ekiga-3.2.7.ebuild 5058 RMD160 fc61da0ec53b39c9380a5defb1df8d71b25a8846 SHA1 b0683bda244f4b5516608c1f8b76e5deac5890c5 SHA256 592a9ab15b2ad1367e1c461bb9281632db8364f3fdf918595781d6950feda384
+MISC ChangeLog 11849 RMD160 0da97a5d82568eb80060f32d837c51fa68b33e33 SHA1 96dcacd0c2b212331ab6b32a89f5881ce7145310 SHA256 37a8e8ce1ef7be7dd90c6aa364f96593cb047de925938c4519e474f4ecea3f48
 MISC metadata.xml 572 RMD160 ed1c0b6f7b51be67aa96c2c5c042fbef023c6a72 SHA1 33e80a99b5ad43d02439c5454f594adb961307d8 SHA256 6c1b059a423b06dae8acda431a06e0a80568b3fce52d6c9d42cceddc2325a8b2
diff --git a/net-voip/ekiga/ekiga-3.2.7.ebuild b/net-voip/ekiga/ekiga-3.2.7.ebuild
index 010771f46a38..c265b50bec4c 100644
--- a/net-voip/ekiga/ekiga-3.2.7.ebuild
+++ b/net-voip/ekiga/ekiga-3.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.7.ebuild,v 1.7 2011/02/02 05:36:52 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.7.ebuild,v 1.8 2011/02/28 17:15:37 ssuominen Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ KDE_REQUIRED="optional"
 CMAKE_REQUIRED="never"
 GCONF_DEBUG="no" # debug managed by the ebuild
 
-inherit kde4-base gnome2
+inherit eutils kde4-base gnome2
 # gnome2 at the end to make it default
 
 DESCRIPTION="H.323 and SIP VoIP softphone"
@@ -117,6 +117,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	gnome2_src_prepare
 
 	# remove call to gconftool-2 --shutdown, upstream bug 555976
diff --git a/net-voip/ekiga/files/ekiga-3.2.7-libnotify-0.7.patch b/net-voip/ekiga/files/ekiga-3.2.7-libnotify-0.7.patch
new file mode 100644
index 000000000000..c09fbb0f95fc
--- /dev/null
+++ b/net-voip/ekiga/files/ekiga-3.2.7-libnotify-0.7.patch
@@ -0,0 +1,62 @@
+--- lib/engine/components/libnotify/libnotify-main.cpp
++++ lib/engine/components/libnotify/libnotify-main.cpp
+@@ -40,6 +40,10 @@
+ 
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "services.h"
+ #include "notification-core.h"
+ 
+@@ -158,7 +162,12 @@
+ 
+   notif = notify_notification_new (notification->get_title ().c_str (),
+ 				   notification->get_body ().c_str (),
+-				   urgency, NULL);
++				   urgency
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++				   );
++#else
++				   , NULL);
++#endif
+ 
+   g_signal_connect (notif, "closed",
+ 		    G_CALLBACK (on_notif_closed), notification.get ());
+--- src/gui/main.cpp
++++ src/gui/main.cpp
+@@ -84,6 +84,9 @@
+ 
+ #ifdef HAVE_NOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #if defined(P_FREEBSD) || defined (P_MACOSX)
+@@ -2820,12 +2823,21 @@
+ 
+   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 NOTIFY_CHECK_VERSION (0, 7, 0)
++  );
++#else
++  , 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);
+   notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  // notify_notification_attach_to_status_icon was removed
++#else
+   notify_notification_attach_to_status_icon (notify, statusicon);
++#endif
+   if (!notify_notification_show (notify, NULL)) {
+     ekiga_main_window_incoming_call_dialog_show (mw, call);
+   }