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

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

4 files changed, 40 insertions, 13 deletions

diff --git a/media-sound/padevchooser/ChangeLog b/media-sound/padevchooser/ChangeLog
index d71e4282d0a7..7758715c7f26 100644
--- a/media-sound/padevchooser/ChangeLog
+++ b/media-sound/padevchooser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/padevchooser
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/padevchooser/ChangeLog,v 1.16 2010/03/08 20:30:59 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/padevchooser/ChangeLog,v 1.17 2011/01/30 08:54:16 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  padevchooser-0.9.3-r1.ebuild, +files/padevchooser-0.9.3-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   08 Mar 2010; Markus Meier <maekke@gentoo.org>
   padevchooser-0.9.3-r1.ebuild:
diff --git a/media-sound/padevchooser/Manifest b/media-sound/padevchooser/Manifest
index 2ae731117816..4285ad649cb3 100644
--- a/media-sound/padevchooser/Manifest
+++ b/media-sound/padevchooser/Manifest
@@ -1,4 +1,5 @@
+AUX padevchooser-0.9.3-libnotify-0.7.patch 876 RMD160 e1fd587c50cabfc5f5e96719147cf425bc469520 SHA1 fdc34f54499d1fca8bb3cd8c88d4ff53db48c0ce SHA256 8897c38b5fdc035d0eda8be4f209c79a2ed76b90d4d8c47cdf8b0ed75fd84972
 DIST padevchooser-0.9.3.tar.gz 100152 RMD160 17f19743b43169feb823d90ade6030499fedbf6a SHA1 5a611c0e8a1f139c56ca696b8fd8dd7a65b77ba7 SHA256 3238f19ea5a3c54efef31e4f86c712232c92704d68c9d2bbef0339ba9b4cb674
-EBUILD padevchooser-0.9.3-r1.ebuild 981 RMD160 2ee763714ae355780e7a80eb1ce65cc09f36cc9a SHA1 370ea3419da8dd5b06f496ddafc62d87cb13f2b3 SHA256 ee775bffd1e1660c201d9074b739b825d5d25aac86892dab2954f28749139b90
-MISC ChangeLog 2373 RMD160 4c083da068ce2d8c44565d85b4ba8cb49a521cdc SHA1 71c3dc700b32172309f55a5be8a53f69fdd81616 SHA256 f9c2494293e51eb8ab668cfaf47ec34a8af9558576b97d315c31d9d0908c0244
+EBUILD padevchooser-0.9.3-r1.ebuild 1032 RMD160 049b4e876f92a68dcb9cefdf6064a2aa3d932992 SHA1 ab4cee2628fe3bb140c241c8ed00b3f585da3184 SHA256 ac4fe5f52143307e0091fef91dcaafa8b7ad03ae2dc84000e6852bcce12ac830
+MISC ChangeLog 2557 RMD160 6e83b8e4b9580a1a3eadc958575ae8a9ec73e8e5 SHA1 838e6f97436ef0e8eb13e7f75cdf03ac56f3c3e5 SHA256 7661b036a34ddeca368305f2d03e4c35ebf50c115b431e23c3871fb555dbaf21
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/padevchooser/files/padevchooser-0.9.3-libnotify-0.7.patch b/media-sound/padevchooser/files/padevchooser-0.9.3-libnotify-0.7.patch
new file mode 100644
index 000000000000..b9288d417c6c
--- /dev/null
+++ b/media-sound/padevchooser/files/padevchooser-0.9.3-libnotify-0.7.patch
@@ -0,0 +1,19 @@
+--- src/padevchooser.c
++++ src/padevchooser.c
+@@ -162,7 +162,15 @@
+         
+     if (!notification) {
+         s = g_strdup_printf("<i>%s</i>\n%s", title, text);
+-        notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon));
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        notification = notify_notification_new(title, s, "audio-card");
++#else
++        notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon));
++#endif
++#else
++        notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon));
++#endif
+         notify_notification_set_category(notification, "device.added");
+         notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW);
+         g_signal_connect_swapped(G_OBJECT(notification), "closed", G_CALLBACK(notification_closed), NULL);
diff --git a/media-sound/padevchooser/padevchooser-0.9.3-r1.ebuild b/media-sound/padevchooser/padevchooser-0.9.3-r1.ebuild
index 02d18cbf34e8..f947bf2daf8c 100644
--- a/media-sound/padevchooser/padevchooser-0.9.3-r1.ebuild
+++ b/media-sound/padevchooser/padevchooser-0.9.3-r1.ebuild
@@ -1,9 +1,8 @@
-# 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-sound/padevchooser/padevchooser-0.9.3-r1.ebuild,v 1.4 2010/03/08 20:30:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/padevchooser/padevchooser-0.9.3-r1.ebuild,v 1.5 2011/01/30 08:54:16 ssuominen Exp $
 
 EAPI=2
-
 inherit eutils
 
 DESCRIPTION="PulseAudio Device Chooser, tool for quick access to PulseAudio features"
@@ -16,23 +15,27 @@ KEYWORDS="amd64 ~sparc x86"
 
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/gconf-2.0
+DEPEND="x11-libs/gtk+:2
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2
 	x11-libs/libnotify
 	>=media-sound/pulseaudio-0.9.2[avahi,glib]"
 RDEPEND="${DEPEND}
-	x11-themes/gnome-icon-theme"
+	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
 
 src_configure() {
 	# Lynx is used during make dist basically
 	econf \
 		--disable-dependency-tracking \
-		--disable-lynx || die "econf failed"
+		--disable-lynx
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dohtml -r doc
 	dodoc README
 }