diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-30 08:54:16 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-30 08:54:16 +0000 |
commit | 1494f36749b816e73ae337eece7f8dcc8bbe43a4 (patch) | |
tree | 299653f3475d78a7b8f084b59e50eff7ad600eca /media-sound | |
parent | Apply changes from prefix overlay. Remove warning about the CVS to BZR move. (diff) | |
download | gentoo-2-1494f36749b816e73ae337eece7f8dcc8bbe43a4.tar.gz gentoo-2-1494f36749b816e73ae337eece7f8dcc8bbe43a4.tar.bz2 gentoo-2-1494f36749b816e73ae337eece7f8dcc8bbe43a4.zip |
Fix building with x11-libs/libnotify >= 0.7.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/padevchooser/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/padevchooser/files/padevchooser-0.9.3-libnotify-0.7.patch | 19 | ||||
-rw-r--r-- | media-sound/padevchooser/padevchooser-0.9.3-r1.ebuild | 21 |
3 files changed, 37 insertions, 11 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/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 } |