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

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

4 files changed, 67 insertions, 5 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index af2f98c3d0b3..55587212c714 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.71 2011/01/30 16:59:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.72 2011/02/05 17:10:33 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> empathy-2.32.2.ebuild,
+  +files/empathy-2.32.2-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> empathy-2.32.2.ebuild:
   Add ~alpha/~ia64/~sparc wrt #347744
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index ff20d90e24ab..79b21d063462 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,8 +1,9 @@
+AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 DIST empathy-2.30.2.tar.bz2 2644286 RMD160 891f1b60b0b5087ef3e6f106676af1728aa4be18 SHA1 de8776cdbceb3895392dee467437e76f893c9194 SHA256 e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
 DIST empathy-2.30.3.tar.bz2 2655910 RMD160 57d558c81b166b8e008ee236a258d592b3ac50a3 SHA1 1a438198469f623e7051a521ef2590f0da518075 SHA256 5965434fcc05f7ec3cd32d9128b03ac20e96624b0035d329abf72decd70c5def
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 EBUILD empathy-2.30.2.ebuild 2653 RMD160 8a0466ef274a1c10130b57e6a3afde155aaddfae SHA1 6428de59fa8210f2aaae8a7681ebd35fbae2ff8a SHA256 492f89f71b7a9f0f999cfc4e281dbb37f179af3fa145aea21bf2a7af03870eaf
 EBUILD empathy-2.30.3.ebuild 2851 RMD160 d3460f7876cf2fafc6d011e2c45b713a6f603976 SHA1 ee35562782c113ad598a6cf019189eb69b3ab74c SHA256 ccaf81b57d43124723ab2410461a96022075132901398e94bfde0531bd1516a4
-EBUILD empathy-2.32.2.ebuild 2889 RMD160 76048f1c7660e4f577c84355ad9673dc324e4fc2 SHA1 17aeb056b4e66654618a8819db99dd60804ca7d4 SHA256 ee6f6915fecf0ca6bde5864fd236272af2f73451427064470a8dca5618502f38
-MISC ChangeLog 12758 RMD160 668cb261a186e3ba045c9578d7aae8f9bfe6624b SHA1 66a7bf1a6570b60b7a5f918662db81ec7b562735 SHA256 6ea9f0e244301a9c85552b6fbc744da5327c563c19485cd3cb1963bb8e94ac00
+EBUILD empathy-2.32.2.ebuild 3070 RMD160 44bb779cc5749f2e824627450d3c87dbf11533fd SHA1 531e743770145b34407ed461acc0f46d560ce6ca SHA256 dbbabc3a123cd5cdb10ae3b0f1cf8c3d8fdddf634a33ef66dc0cae7fad28707e
+MISC ChangeLog 12930 RMD160 7a6a7f041de81dbb53bd8f219a4136724092b289 SHA1 a4b7f3b5cc78308fdd66b36ef55ad1ee37b6cadc SHA256 2e1e34453117321fd2a8649eb0a250c23da47d3e92f9fa91defabbff94e62434
 MISC metadata.xml 845 RMD160 a67a7d4b8af2591502b6e4fedc35315cd0669432 SHA1 c81013e764ce5b611f337c9d6dd2607ff3253de5 SHA256 face01aab7819b2c771273d38a34c7d1cf2a4f74f752c0a6c3ff56f5ed2e33b9
diff --git a/net-im/empathy/empathy-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild
index 2b2be8bef0d6..317bd536cab7 100644
--- a/net-im/empathy/empathy-2.32.2.ebuild
+++ b/net-im/empathy/empathy-2.32.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.5 2011/01/30 16:59:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.6 2011/02/05 17:10:33 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 PYTHON_DEPEND="2:2.4"
 
-inherit gnome2 multilib python
+inherit eutils gnome2 multilib python
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
@@ -87,6 +87,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	# Remove unnecessary restriction. Should get punted from configure.ac.
+	sed -i -e '/libnotify/s:0.7:9999:' configure || die
 	gnome2_src_prepare
 	python_convert_shebangs -r 2 .
 }
diff --git a/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch b/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch
new file mode 100644
index 000000000000..b430ff269ea3
--- /dev/null
+++ b/net-im/empathy/files/empathy-2.32.2-libnotify-0.7.patch
@@ -0,0 +1,54 @@
+--- src/empathy-chat-window.c
++++ src/empathy-chat-window.c
+@@ -35,6 +35,11 @@
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+ #include <libnotify/notification.h>
++#include <libnotify/notify.h>
++
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ 
+ #include <telepathy-glib/telepathy-glib.h>
+ 
+@@ -1300,7 +1305,12 @@
+ 		   to an existing notification with the same title.
+ 		   In this way the previous message will not be lost: the new
+ 		   message will appear below it, in the same notification */
+-		notification = notify_notification_new (header, escaped, NULL, NULL);
++		notification = notify_notification_new (header, escaped, NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++		);
++#else
++		, NULL);
++#endif
+ 
+ 		if (priv->notification == NULL) {
+ 			priv->notification = notification;
+--- src/empathy-status-icon.c
++++ src/empathy-status-icon.c
+@@ -32,6 +32,10 @@
+ #include <libnotify/notification.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include <telepathy-glib/account-manager.h>
+ #include <telepathy-glib/util.h>
+ 
+@@ -206,8 +210,12 @@
+ 			   to an existing notification with the same title.
+ 			   In this way the previous message will not be lost: the new
+ 			   message will appear below it, in the same notification */
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++			/* notify_notification_new_with_status_icon was removed */
++#else
+ 			notification = notify_notification_new_with_status_icon
+ 				(priv->event->header, message_esc, NULL, priv->icon);
++#endif
+ 
+ 			if (priv->notification == NULL) {
+ 				priv->notification = notification;