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

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

4 files changed, 54 insertions, 16 deletions

diff --git a/media-plugins/gmpc-libnotify/ChangeLog b/media-plugins/gmpc-libnotify/ChangeLog
index b6f9a2b163ac..31831282faaa 100644
--- a/media-plugins/gmpc-libnotify/ChangeLog
+++ b/media-plugins/gmpc-libnotify/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/gmpc-libnotify
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-libnotify/ChangeLog,v 1.13 2010/05/25 09:45:40 angelos Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-libnotify/ChangeLog,v 1.14 2011/02/05 13:09:57 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gmpc-libnotify-0.20.0.ebuild,
+  +files/gmpc-libnotify-0.20.0-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
 *gmpc-libnotify-0.20.0 (25 May 2010)
 
diff --git a/media-plugins/gmpc-libnotify/Manifest b/media-plugins/gmpc-libnotify/Manifest
index 3ea2d008e6fd..056ed1a5db62 100644
--- a/media-plugins/gmpc-libnotify/Manifest
+++ b/media-plugins/gmpc-libnotify/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX gmpc-libnotify-0.20.0-libnotify-0.7.patch 1013 RMD160 695b9ea08cb91fa241f349e1e6bba35695a49f1a SHA1 bed1696fc0392305b9300d964c9539573d6af9ce SHA256 631122c2e7c7f7cc03d3548a0730b4b088463d46c515c4c81a8452f05fcd0fa6
 DIST gmpc-libnotify-0.18.0.tar.gz 280205 RMD160 212b17dad1e97a3ccc3481d836fcc90b67a18527 SHA1 eb94c71f3dffb9d29c8f03932fb2597ab26c9870 SHA256 a4eee1b9c0cfdc2a3f33c68826aa97727689c4240b29b06fc45bce6ea7712cb9
 DIST gmpc-libnotify-0.19.0.tar.gz 300073 RMD160 a488768ef1fedc74c99664d3a23e7edac4fe2a14 SHA1 fd351b25337eba1888e8a8ffa4370d21f8922394 SHA256 72ae8fc35d06aaf9f29e16eac9852196e21f721ded2b59a3d2c01b7c3403fb96
 DIST gmpc-libnotify-0.20.0.tar.gz 302842 RMD160 96ddd896597a8fed597b079d859648e73f3a4901 SHA1 683bdcf5e0ba4b1645425d2a261041d42ae3dd6e SHA256 487deb607b6355413efdfdfcbb8949c3bc95003a5b49571285ab78f23fe65982
 EBUILD gmpc-libnotify-0.18.0.ebuild 667 RMD160 a6bcb7da6124a9ac8100314380e8ef8d4372aee1 SHA1 c15d2375add9f1604da8298c0a11bc6533d85466 SHA256 ce77545fdec3164663c6fa70b9658a4ebd742949e1f92e9015d959deb84641fa
 EBUILD gmpc-libnotify-0.19.0.ebuild 816 RMD160 ba631dcf67674e71dd1c44b180baca4eb20413ef SHA1 aa396a0438c124cc7f958e237f92c02b6ff9d9bc SHA256 34c0e684d7b10676a8cb8716ae03dfbe9ead0f47b62efaaa26fbba4a88ac94d3
-EBUILD gmpc-libnotify-0.20.0.ebuild 817 RMD160 1940b13c7eb6f43e2ed8b0101c68aef496c3b956 SHA1 0cfafbd5f476915a591e849a1bc700e2fc00bdd9 SHA256 3ff6ab083b4f0b690c5412c76b3a259dd3415adce07ccb2aa630ef86870b6c95
-MISC ChangeLog 1829 RMD160 c9ca50a0fc0740a51a46499c9e27116073f217af SHA1 15a93de75b15d370856d8058e8c1daebadcdb914 SHA256 ad836ff1880c07df28e4aa1dba58e016cdfbc528508045d3d42dae52820995e1
+EBUILD gmpc-libnotify-0.20.0.ebuild 900 RMD160 d82c17aca1e8bc0b35710b5e0c9d8fd3c348809d SHA1 cd454e8a268159bb41d6f95b170ad9fefda50101 SHA256 7e3b5e138ba2d553081f3699def429781e15ec9d3498999d5d2d43873eb8a7a8
+MISC ChangeLog 2017 RMD160 2aeda24e2a23538d0f6521ae8718937e92549e5a SHA1 fdf4d3d0a55a76e837b95acd96ab7e14420ee24d SHA256 4aa756b692f89c3b3241a40a0f52ca33194b19a58aaedef9da6ea1e7a9aa9705
 MISC metadata.xml 252 RMD160 5bfbaa2eb1e7b642dee1220e0b4ef3154612d452 SHA1 be2de4e112f4290fc8410065284481640deadb65 SHA256 cd6d3804f15ceaa8c8b60a7fb89e8d4cdc154ebf0e93ede73975006e5399a834
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkv7nEwACgkQmWq1bYTyC0PjRgEAqAPcIgHmrOupl3Q5x7Y3AWdj
-jBBJxO2SC0e7PIf8x7cA/jvOsRN1IOVSK3NVCx/oce2Lw84+Pd3+IvmnchXkBeA3
-=WXEt
------END PGP SIGNATURE-----
diff --git a/media-plugins/gmpc-libnotify/files/gmpc-libnotify-0.20.0-libnotify-0.7.patch b/media-plugins/gmpc-libnotify/files/gmpc-libnotify-0.20.0-libnotify-0.7.patch
new file mode 100644
index 000000000000..601b6f27c646
--- /dev/null
+++ b/media-plugins/gmpc-libnotify/files/gmpc-libnotify-0.20.0-libnotify-0.7.patch
@@ -0,0 +1,37 @@
+--- src/plugin.c
++++ src/plugin.c
+@@ -28,6 +28,10 @@
+ #include <gmpc/misc.h>
+ #include <config.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #define LOG_DOMAIN "LibNotifyPlugin"
+ 
+ extern GtkStatusIcon *tray_icon2_gsi;
+@@ -149,15 +153,23 @@
+ 		if(not == NULL)
+ 		{
+ 			//            notify_notification_close(not, NULL);
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++			not = notify_notification_new(summary, buffer,NULL);
++#else
+ 			not = notify_notification_new(summary, buffer,NULL, NULL);
++#endif
+ 		}
+ 		else{
+ 			notify_notification_update(not, summary, buffer, NULL);
+ 		}
+ 		notify_notification_set_urgency(not, NOTIFY_URGENCY_LOW);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++		/* notify_notification_attach_to_status_icon was removed */
++#else
+ 		if(cfg_get_single_value_as_int_with_default(config, "libnotify-plugin", "attach-to-tray", TRUE))
+ 			notify_notification_attach_to_status_icon(not, tray_icon2_gsi);
++#endif
+ 
+ 		g_free(summary);
+ 		/* Add the song to the widget */
diff --git a/media-plugins/gmpc-libnotify/gmpc-libnotify-0.20.0.ebuild b/media-plugins/gmpc-libnotify/gmpc-libnotify-0.20.0.ebuild
index 3c4905446856..2863c7c6cb49 100644
--- a/media-plugins/gmpc-libnotify/gmpc-libnotify-0.20.0.ebuild
+++ b/media-plugins/gmpc-libnotify/gmpc-libnotify-0.20.0.ebuild
@@ -1,8 +1,9 @@
-# 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/media-plugins/gmpc-libnotify/gmpc-libnotify-0.20.0.ebuild,v 1.1 2010/05/25 09:45:40 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-libnotify/gmpc-libnotify-0.20.0.ebuild,v 1.2 2011/02/05 13:09:57 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="This plugin sends an announcement to the notification daemon on song change"
 HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LIBNOTIFY"
@@ -21,6 +22,10 @@ DEPEND="${RDEPEND}
 	nls? ( dev-util/intltool
 		sys-devel/gettext )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable nls) \