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

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

3 files changed, 39 insertions, 3 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/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}