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

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

4 files changed, 55 insertions, 11 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index b4dac250cc2f..bdbdb2d32714 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.57 2011/01/26 15:50:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.58 2011/02/05 12:20:10 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.2.ebuild,
+  +files/nm-applet-0.8.2-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   26 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.2.ebuild:
   Remove too strict notification area and policykit authentication agent
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index dbfb63bec342..c4e157aab045 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,10 +1,11 @@
 AUX nm-applet-0.8.1-fix-bluetooth-dep.patch 1221 RMD160 1e12c0f84424aef9772c8cfe93dc07d3cd2984f4 SHA1 9a2d760ac01b9085030718b4f93f8c959db18faa SHA256 e89e20ba56817d8c05668fbac0ff26b21c30fd6b706cf2c2ccbfec9dacdcfe3b
 AUX nm-applet-0.8.1-fix-compilation-with-DGSEAL_ENABLE.patch 3184 RMD160 2b304fe4b24b0366250f20b165a778086376d773 SHA1 9a587ab17865917a3c177c422edf8cb427158946 SHA256 b36be4b5fc0781856af306943253efd2505e034a136a12cd2afbae767ab1d27e
+AUX nm-applet-0.8.2-libnotify-0.7.patch 1111 RMD160 3a63b65cf30848b60e681ee05d63f645d8276e6a SHA1 059346b94cda77bbe2ce97c2ba90a9fe8ba54c1e SHA256 542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d
 DIST network-manager-applet-0.8.1.tar.bz2 1105854 RMD160 8f2aef3edcc68988e199f5032f6582314982308f SHA1 6259f40c849e9a7881f1d7319d1ddd50335db480 SHA256 4a84b9762c6fa13004f66a5e208236d2c4b0a15fcbf47da19b6b44b441aec366
 DIST network-manager-applet-0.8.2.tar.bz2 1129756 RMD160 30a14d27732c53b17c66d034ecefe68eb115fb68 SHA1 1be46b1df52786cd22e1d3d888f828c27d46dd3a SHA256 c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391
 DIST network-manager-applet-0.8.tar.bz2 978462 RMD160 764d7ebf7a716a795539fdc34f0545e3134311c0 SHA1 51f684396e034064568d356f0d961aa71af574dd SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
 EBUILD nm-applet-0.8.1-r2.ebuild 1535 RMD160 6524d6fa03bfda6f658e22f6a063fa7880786d95 SHA1 785457d2df009f6bbd6e5417355856ac40a2a7b9 SHA256 5509afcc83fb3f5ff1c905138ba76229fa4fea02974f6ad8657b213ebe46474d
-EBUILD nm-applet-0.8.2.ebuild 1261 RMD160 560737baa04417f8e6d85f97c87ef6cfdc2078d2 SHA1 06b75c1645a279cfb3d352157598ce7c634d80f2 SHA256 9084f7a46f0b4142d43b3c6a5b8ac6c70221274414bab5f7df4b0141a0741fe4
+EBUILD nm-applet-0.8.2.ebuild 1325 RMD160 ff262763e9f73a8641130949d2aae4a69cc311e9 SHA1 7888246ce34baa32efbb9126036f466fa97e01f9 SHA256 5b4b1e0f81c994aa5bc10301229154f605bcb9adf6464cb82ae877ddb5453f11
 EBUILD nm-applet-0.8.ebuild 1305 RMD160 69f97a3d769e590d1d59b106c14c931a07c70397 SHA1 7be352f2321a8edc34e50eb946b82b5e2f5ffdc0 SHA256 3c1f14003ada3c5f4e65e3ee431fdbc551131bd6c95624756e74c060860645ab
-MISC ChangeLog 10045 RMD160 fa3920618073a8f7b899c7dfe3e5a2d117eafe4d SHA1 b6032ce797b7c46602d945b879ea20f734a9d873 SHA256 43453cc78eda7d47aa1e24e0c54db0370b8563d0bbe921e42611198a548c1440
+MISC ChangeLog 10217 RMD160 10fd7dcf4d53c44e25e8bb136038a15768a9de44 SHA1 cae090cd31683157994206038653c693aa35a1da SHA256 1c5dd0c1b777e205e23c88b8beb48ae9a4a660763a2a299b14fcb2cccc038c0b
 MISC metadata.xml 493 RMD160 c990e66890ff329f3b0601c8ec1f70d7d5de3368 SHA1 f69cf103a6ebc649c9188dd03fe93ca92618b339 SHA256 37f17b0cf82d1699697b8ecb8d304b3d2195da901dad60f759e3d33eda8dda0c
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch b/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch
new file mode 100644
index 000000000000..54aa473af98a
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.8.2-libnotify-0.7.patch
@@ -0,0 +1,36 @@
+--- src/applet.c
++++ src/applet.c
+@@ -58,6 +58,10 @@
+ #include <gnome-keyring.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "applet.h"
+ #include "applet-device-wired.h"
+ #include "applet-device-wifi.h"
+@@ -626,12 +630,20 @@
+ 	escaped = utils_escape_notify_message (message);
+ 	notify = notify_notification_new (summary,
+ 	                                  escaped,
+-	                                  icon ? icon : GTK_STOCK_NETWORK,
+-	                                  NULL);
++	                                  icon ? icon : GTK_STOCK_NETWORK
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++					  );
++#else
++                                          , NULL);
++#endif
+ 	g_free (escaped);
+ 	applet->notification = notify;
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        /* notify_notification_attach_to_status_icon was removed */
++#else
+ 	notify_notification_attach_to_status_icon (notify, applet->status_icon);
++#endif
+ 	notify_notification_set_urgency (notify, urgency);
+ 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild
index 1093935619d4..7c9bfb06b2e4 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.3 2011/01/26 15:41:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.4 2011/02/05 12:20:10 ssuominen Exp $
 
-EAPI="2"
-
-inherit gnome2 eutils
+EAPI=2
+inherit eutils gnome2
 
 MY_PN="${PN/nm-applet/network-manager-applet}"
 
@@ -39,13 +38,17 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-# USE_DESTDIR="1"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_PN}-${PV}
 
 pkg_setup () {
 	G2CONF="${G2CONF}
 		--disable-more-warnings
 		--localstatedir=/var"
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
 }