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

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

4 files changed, 42 insertions, 5 deletions

diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index b64490ef3035..edc561f5c018 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gnome-mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.49 2011/01/14 21:45:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.50 2011/01/29 13:47:02 ssuominen Exp $
+
+  29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-mplayer-1.0.0.ebuild, +files/gnome-mplayer-1.0.0-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   14 Jan 2011; Brent Baude <ranger@gentoo.org> gnome-mplayer-1.0.0.ebuild:
   stable ppc, bug 346185
diff --git a/media-video/gnome-mplayer/Manifest b/media-video/gnome-mplayer/Manifest
index 025f9c17ef36..7c241d3baa7f 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -1,6 +1,7 @@
+AUX gnome-mplayer-1.0.0-libnotify-0.7.patch 1091 RMD160 701b3bc3e5e103ba2e32f3185a4ce4a4b5e8ef0d SHA1 b42a416fa332ab144081fafeb12c003a43805745 SHA256 e18662cb267fdb12c30af59be49e83ef7b0b1bbdbc6b9a990a2369dfa363ee86
 DIST gnome-mplayer-0.9.9.2.tar.gz 828006 RMD160 0e73e1c6109f07b967f30bd7225eac7e9c6c9ce6 SHA1 b46a6e6bcec8d214b7bd257e939b0bff5c67f660 SHA256 695a54c00db5d0a0f596eb1a10a58ad32a44e8d6c7585d7c86e0d75cef0a48b4
 DIST gnome-mplayer-1.0.0.tar.gz 903789 RMD160 1d64094c2e72369d06cc97686fbc433dfee87638 SHA1 ef94c3170cc4d425403c8de67efb8f64dc7f762f SHA256 4694a4f8409039cef7206eb072952721262dbec372669373b732e617dd5ee530
 EBUILD gnome-mplayer-0.9.9.2.ebuild 1562 RMD160 386c9f52f03a4781815053da001c05de5163c3e4 SHA1 515b6b9613f7843802d17121bf3fe6ac496bca55 SHA256 ccb5e3a572dca5ec44ff26737e5fe178b304ffa0a0ab6c8a6208ac6de96a8a8c
-EBUILD gnome-mplayer-1.0.0.ebuild 1584 RMD160 7e039c435ec91a9a002519004b461c8a0b7710c6 SHA1 33611dfb4916eb2fc296e25aeb4a76b3aaecf47e SHA256 45ea5cab962b4fa13bdd7a771f3de3f5fdab41e08e94cf01a364105b046d4153
-MISC ChangeLog 7110 RMD160 604bc959e497c2a3be4e57b6848b35981846e1c1 SHA1 37b6c441ccf7a2bb9957f8827a76a30e0d33736c SHA256 99ae37355bd9f736cbd39e92b45c2ec4537459a2fcd18c877c54e4a821a3ab90
+EBUILD gnome-mplayer-1.0.0.ebuild 1773 RMD160 7fd729c3bc5338ba2dfa0cec4abf2018954bfca6 SHA1 fa87e1ac3a3cfb4eb96b8ac79ee0cf49979e920c SHA256 63ca854c3a1c757c0cdcfb289d68ffefde63163415c779fb52bbc850de38480e
+MISC ChangeLog 7293 RMD160 20d1acb07f5970bce9566253aedae405ab62e9bf SHA1 f7988a8463787d1557f8299e093948bfc0c91e87 SHA256 da23702d39e7e5da689db563511840b35c7a537abc5b65ead602a54657e80500
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
diff --git a/media-video/gnome-mplayer/files/gnome-mplayer-1.0.0-libnotify-0.7.patch b/media-video/gnome-mplayer/files/gnome-mplayer-1.0.0-libnotify-0.7.patch
new file mode 100644
index 000000000000..590464d464bb
--- /dev/null
+++ b/media-video/gnome-mplayer/files/gnome-mplayer-1.0.0-libnotify-0.7.patch
@@ -0,0 +1,25 @@
+diff -ur gnome-mplayer-1.0.0.orig/src/gui.c gnome-mplayer-1.0.0/src/gui.c
+--- gnome-mplayer-1.0.0.orig/src/gui.c	2010-11-05 18:16:22.000000000 +0200
++++ gnome-mplayer-1.0.0/src/gui.c	2011-01-29 15:45:00.000000000 +0200
+@@ -470,13 +470,21 @@
+ #ifdef NOTIFY_ENABLED
+         if (show_notification && control_id == 0 && !gtk_window_is_active((GtkWindow *) window)) {
+             notify_init("gnome-mplayer");
++#ifdef NOTIFY0_7_ENABLED
++            notification =
++                notify_notification_new(idle->display_name, idle->media_notification,
++                                        "gnome-mplayer");
++#else
+             notification =
+                 notify_notification_new(idle->display_name, idle->media_notification,
+                                         "gnome-mplayer", NULL);
++#endif
+ #ifdef GTK2_12_ENABLED
++#ifndef NOTIFY0_7_ENABLED
+             if (show_status_icon)
+                 notify_notification_attach_to_status_icon(notification, status_icon);
+ #endif
++#endif
+             notify_notification_show(notification, NULL);
+             notify_uninit();
+         }
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.0.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.0.ebuild
index 1bf4b59f3710..97d2f7c9b9c4 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.0.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.0.ebuild,v 1.4 2011/01/14 21:45:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.0.ebuild,v 1.5 2011/01/29 13:47:02 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
-inherit gnome2
+inherit eutils flag-o-matic gnome2
 
 DESCRIPTION="A GTK+ interface to MPlayer"
 HOMEPAGE="http://code.google.com/p/gnome-mplayer/"
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
+	has_version ">=x11-libs/libnotify-0.7" && append-cppflags -DNOTIFY0_7_ENABLED
+
 	G2CONF="--disable-dependency-tracking
 		$(use_enable gnome schemas-install)
 		$(use_enable gnome nautilus)
@@ -51,6 +53,11 @@ pkg_setup() {
 	DOCS="ChangeLog README DOCS/keyboard_shortcuts.txt"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	rm -rf "${D}"/usr/share/doc/${PN}