Fix building with x11-libs/libnotify >= 0.7.

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

4 files changed, 48 insertions, 17 deletions

diff --git a/net-voip/sflphone/ChangeLog b/net-voip/sflphone/ChangeLog
index d5672f02f711..3f86e0d5f4cb 100644
--- a/net-voip/sflphone/ChangeLog
+++ b/net-voip/sflphone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-voip/sflphone
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.5 2010/11/04 17:36:21 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/ChangeLog,v 1.6 2011/01/30 14:07:55 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> sflphone-0.9.8.4.ebuild,
+  +files/sflphone-0.9.8.4-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   04 Nov 2010; Christian Faulhammer <fauli@gentoo.org>
   sflphone-0.9.8.4.ebuild:
diff --git a/net-voip/sflphone/Manifest b/net-voip/sflphone/Manifest
index a3af1ad5d7da..43aab37788a3 100644
--- a/net-voip/sflphone/Manifest
+++ b/net-voip/sflphone/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX sflphone-0.9.8.4-libnotify-0.7.patch 1178 RMD160 35e1c268d71908c4ec2264a8e8f654c713e8499f SHA1 6da41c27e77a291492fc80598d0a8223b77f36eb SHA256 68a00825842b3f307f5c62e66de2e29d54afb73127954acf076d9aa22c086472
 DIST sflphone-0.9.8.4.tar.gz 7191853 RMD160 b42af5a80c851b34b0362cbc920241345b795b8a SHA1 a29ec6febb2c1b2c78ab70019ada17fb5fe65e0e SHA256 db31e642e77543099325a18c3c1f2e7e1ef83615c9d4d27c2a21c5abfb0253a4
-EBUILD sflphone-0.9.8.4.ebuild 3808 RMD160 9d5b6dd9e953e138ac8568fef5fe2dd15548230b SHA1 e554a069d60b42a0de74e5f8b292e156bb031e08 SHA256 3c1314e8f8a4ea4650dcfd05e9a76f81e65f250e77402f0690a82e4451cbbe00
-MISC ChangeLog 807 RMD160 8c760c8a830adc39d4397d6d591d8b638eb4d76b SHA1 4868039912eadc156c4b5120292f66a03ed6b052 SHA256 a8a4c83c43efe663e14ac79c47fbf04f4d3cd66e7bc276d0aa542a8d2e71525e
+EBUILD sflphone-0.9.8.4.ebuild 3867 RMD160 404474018bf8d48323a0c1b9d68fb05ac2d51c14 SHA1 2406d2c56c29f9b4ba26d1c4605a405cf07bbb8e SHA256 dccffcb08bb23593b48843a66fb06b36c639c028c6754e86e72856e57b93ce0a
+MISC ChangeLog 985 RMD160 46eee8a747ecb8ff35b9c6a61dfb7f9fd8b6189b SHA1 76050bf6a88ed77c31e3b4078d054004ba072b6e SHA256 97cf44860065c08a59b5e213d60d3485a356b2b30f933d47006ad98b11c0ab5a
 MISC metadata.xml 601 RMD160 5d90dfb1c2b55f04de3becb09acd78d91d7f3263 SHA1 87cba5b018223ee925bc2666635ed95683912692 SHA256 6010d087c96b75b655fac51c9e9b362ae91a02dd8d6b7c91388db7773bb0e048
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzS7yUACgkQNQqtfCuFneNDTQCgmqKUSnEw2/qkbtUAkcdrjWET
-uLQAnRfVUyt9IJXBXveW41XV5/69ViO3
-=Z1Ei
------END PGP SIGNATURE-----
diff --git a/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch b/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..90648e3498fd
--- /dev/null
+++ b/net-voip/sflphone/files/sflphone-0.9.8.4-libnotify-0.7.patch
@@ -0,0 +1,34 @@
+--- sflphone-client-gnome/src/sflnotify.c
++++ sflphone-client-gnome/src/sflnotify.c
+@@ -30,6 +30,10 @@
+ 
+ #include <sflnotify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ GnomeNotification *_gnome_notification;
+ 
+ void create_new_gnome_notification (gchar *title, gchar *body, NotifyUrgency urgency, gint timeout, GnomeNotification **notif)
+@@ -43,12 +47,20 @@
+         notify_init ("SFLphone");
+ 
+         // Set struct fields
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        _notif->notification = notify_notification_new (title, body, NULL);
++#else
+         _notif->notification = notify_notification_new (title, body, NULL, NULL);
++#endif
+         //_notif->icon = gdk_pixbuf_new_from_file_at_size (LOGO, 120, 120, NULL);
+         _notif->icon = gdk_pixbuf_new_from_file (LOGO_SMALL, NULL);
+ #if GTK_CHECK_VERSION(2,10,0)
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        // notify_notification_attach_to_status_icon function was removed
++#else
+         notify_notification_attach_to_status_icon (_notif->notification , get_status_icon() );
+ #endif
++#endif
+ 
+         notify_notification_set_urgency (_notif->notification, urgency);
+         
diff --git a/net-voip/sflphone/sflphone-0.9.8.4.ebuild b/net-voip/sflphone/sflphone-0.9.8.4.ebuild
index 4cef0cd0cb08..d0a30cea0cb3 100644
--- a/net-voip/sflphone/sflphone-0.9.8.4.ebuild
+++ b/net-voip/sflphone/sflphone-0.9.8.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-0.9.8.4.ebuild,v 1.5 2010/11/04 17:36:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/sflphone/sflphone-0.9.8.4.ebuild,v 1.6 2011/01/30 14:07:55 ssuominen Exp $
 
 EAPI="2"
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="SFLphone is a robust standards-compliant enterprise softphone, for desktop and embedded systems."
 HOMEPAGE="http://www.sflphone.org/"
@@ -52,6 +52,8 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	if ! use gnome; then
 		ewarn
 		ewarn "No clients selected. Use USE=gnome to get the gnome client."