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

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

4 files changed, 45 insertions, 3 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 24c1c2936c1e..96fd206b1d57 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.192 2011/01/30 20:29:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.193 2011/02/06 17:20:56 ssuominen Exp $
+
+  06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +files/2.4.3-libnotify-0.7.patch, audacious-plugins-2.4.3-r1.ebuild,
+  audacious-plugins-2.5_alpha1.ebuild:
+  Fix building with x11-libs/libnotify >= 0.7 wrt #353859.
 
 *audacious-plugins-2.5_alpha1 (30 Jan 2011)
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
index 53942bc55340..7f39f42be1d4 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild,v 1.1 2011/01/29 22:33:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.4.3-r1.ebuild,v 1.2 2011/02/06 17:20:56 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
@@ -59,6 +59,12 @@ mp3_warning() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-libnotify-0.7.patch
+}
+
 src_compile() {
 	mp3_warning
 
diff --git a/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild
index 48311eb2a2e5..25480aac7008 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild,v 1.1 2011/01/30 20:29:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-2.5_alpha1.ebuild,v 1.2 2011/02/06 17:20:56 ssuominen Exp $
 
 EAPI=3
 
@@ -61,6 +61,10 @@ mp3_warning() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/2.4.3-libnotify-0.7.patch
+}
+
 src_configure() {
 	mp3_warning
 
diff --git a/media-plugins/audacious-plugins/files/2.4.3-libnotify-0.7.patch b/media-plugins/audacious-plugins/files/2.4.3-libnotify-0.7.patch
new file mode 100644
index 000000000000..6df899536f34
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/2.4.3-libnotify-0.7.patch
@@ -0,0 +1,27 @@
+--- src/notify/libnotify-aosd_osd.c
++++ src/notify/libnotify-aosd_osd.c
+@@ -22,6 +22,10 @@
+ #include <libnotify/notify.h>
+ #include "libnotify-aosd_common.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ NotifyNotification *notification = NULL;
+ 
+ gboolean osd_init() {
+@@ -55,7 +59,12 @@
+ 	GError *error = NULL;
+ 
+ 	if(notification == NULL) {
+-		notification = notify_notification_new(title, message, pb == NULL ? icon : NULL, NULL);
++		notification = notify_notification_new(title, message, pb == NULL ? icon : NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++		);
++#else
++		, NULL);
++#endif
+ 		g_signal_connect(notification, "closed", G_CALLBACK(osd_closed_handler), NULL);
+ 		AUDDBG("new osd created! (notification=%p)\n", notification);
+ 	} else {