summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2010-03-03 16:15:09 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2010-03-03 16:15:09 +0000
commitdcbf4cddf3c0ef7d3ddb1f6b89a773ecc9deb13c (patch)
tree14cd035b576d2b3f965e8a3e0209f51a43b7f18f /media-sound/rhythmbox
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-dcbf4cddf3c0ef7d3ddb1f6b89a773ecc9deb13c.tar.gz
gentoo-2-dcbf4cddf3c0ef7d3ddb1f6b89a773ecc9deb13c.tar.bz2
gentoo-2-dcbf4cddf3c0ef7d3ddb1f6b89a773ecc9deb13c.zip
Fix the audiocd plugin build. bug #307457
(Portage version: 2.2_rc64/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/rhythmbox')
-rw-r--r--media-sound/rhythmbox/ChangeLog6
-rw-r--r--media-sound/rhythmbox/files/rhythmbox-0.12.7-audiocd.patch12
-rw-r--r--media-sound/rhythmbox/rhythmbox-0.12.7.ebuild7
3 files changed, 22 insertions, 3 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 71b7d1cc24d3..b774210edc28 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/rhythmbox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.172 2010/03/01 23:31:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.173 2010/03/03 16:15:08 dang Exp $
+
+ 03 Mar 2010; Daniel Gryniewicz <dang@gentoo.org> rhythmbox-0.12.7.ebuild,
+ +files/rhythmbox-0.12.7-audiocd.patch:
+ Fix the audiocd plugin build. bug #307457
*rhythmbox-0.12.7 (01 Mar 2010)
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.7-audiocd.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.7-audiocd.patch
new file mode 100644
index 000000000000..29935d64065f
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.12.7-audiocd.patch
@@ -0,0 +1,12 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN rhythmbox-0.12.7.orig/plugins/audiocd/rb-audiocd-source.c rhythmbox-0.12.7/plugins/audiocd/rb-audiocd-source.c
+--- rhythmbox-0.12.7.orig/plugins/audiocd/rb-audiocd-source.c 2010-02-28 08:35:20.000000000 -0500
++++ rhythmbox-0.12.7/plugins/audiocd/rb-audiocd-source.c 2010-03-03 11:06:02.597198678 -0500
+@@ -291,7 +291,7 @@ rb_audiocd_source_constructed (GObject *
+ g_object_set (action, "short-label", _("Extract"), NULL);
+
+ #if !defined(HAVE_SJ_METADATA_GETTER)
+- action = gtk_action_group_get_action (source->action_group, "AudioCdSourceReloadMetadata");
++ action = gtk_action_group_get_action (priv->action_group, "AudioCdSourceReloadMetadata");
+ g_object_set (action, "visible", FALSE, NULL);
+ #endif
+
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild
index dcc3c0ab2efb..815dd429f88b 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild,v 1.1 2010/03/01 23:31:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.7.ebuild,v 1.2 2010/03/03 16:15:08 dang Exp $
EAPI="2"
-inherit gnome2 python multilib virtualx
+inherit gnome2 python multilib virtualx eutils
DESCRIPTION="Music management and playback software for GNOME"
HOMEPAGE="http://www.rhythmbox.org/"
@@ -147,6 +147,9 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
+ # Fix the audiocd plugin build. bug #307457
+ epatch "${FILESDIR}"/${P}-audiocd.patch
+
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile