From 089831ecbb36c1534f6e3683c4933d13de9fd657 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Wed, 3 Mar 2010 16:15:09 +0000 Subject: [PATCH] Fix the audiocd plugin build. bug #307457 Package-Manager: portage-2.2_rc64/cvs/Linux x86_64 --- media-sound/rhythmbox/ChangeLog | 6 +++++- media-sound/rhythmbox/Manifest | 15 +++------------ .../files/rhythmbox-0.12.7-audiocd.patch | 12 ++++++++++++ media-sound/rhythmbox/rhythmbox-0.12.7.ebuild | 7 +++++-- 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 media-sound/rhythmbox/files/rhythmbox-0.12.7-audiocd.patch 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 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/Manifest b/media-sound/rhythmbox/Manifest index c57a518757e1..f5f444a84ce0 100644 --- a/media-sound/rhythmbox/Manifest +++ b/media-sound/rhythmbox/Manifest @@ -1,19 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX rhythmbox-0.12.5-fix-daap-plugin-linking.patch 714 RMD160 f41f995764b8ac60172b8e8e6c1a9face9d3e408 SHA1 2ebd320ef650c9fe6dd06531afc697399a071ed6 SHA256 4617073fc7e275680b8ad3334009dbcf707725294f499df4912be83c6abbb2cd +AUX rhythmbox-0.12.7-audiocd.patch 767 RMD160 2b15fc65627e28f34614f5beb5ecc1aa9aeda482 SHA1 57e79b0893e0dbfa6d5ba780a8c4e1c15792bad9 SHA256 a1d8454d9b029c4e53989035c85e6d3f2f2b8337e131dff048dcdb9976e0b578 DIST rhythmbox-0.12.5.tar.bz2 5123204 RMD160 5286cda2e457d21627a8fe2392c85504bcd254b7 SHA1 b41bbb4e7e8f2dc64122ff6a0b334478a0cef42b SHA256 b26c45a715502d3b4d47bf532078bdf3dbed68c1cb68c61d8995a349dd488cd1 DIST rhythmbox-0.12.6.tar.bz2 5202025 RMD160 cf860b1a42975d4dfea09b5c265bda297d18a7b9 SHA1 f1ba375329471ec47475a4b0ce3e8bba430a537b SHA256 ddffa5b7e0e0fe81044354998fd91a58d4ff526746b17a6b638e0e8ea1ac9684 DIST rhythmbox-0.12.7.tar.bz2 5224160 RMD160 02815a3503c195fa00f65c03e56e0d686a25e118 SHA1 a793132c49f9a24053fb9d05514b380c4dd62f7c SHA256 4ab28b93b2e9d7bc9338194ba6e01549362fdd5b0cf2806da091fbfb2c2a8362 EBUILD rhythmbox-0.12.5-r2.ebuild 4811 RMD160 552c4c989441bbb0b91bbe90ceb070d4309a226f SHA1 9e53e7bf34459b064bc8a3e06ca221445262f086 SHA256 7fb752710dd1adb756800c7147f637761a00ad9949e7e92fb13847c484a76cf4 EBUILD rhythmbox-0.12.6.ebuild 4536 RMD160 5d9e62a20c280698d2e005b07165486309b57cef SHA1 496a67461548572885cea231b617936a08f2bbb6 SHA256 4e3defda21fbc969c494ef19157fae23683daaa7647d553488959cf07e5815a4 -EBUILD rhythmbox-0.12.7.ebuild 4934 RMD160 0c6344c19a12cc4cdb9ef94eb340c2e81bc26f80 SHA1 f12f4544550c52cc15a5e5b10ebacb67d97e75c0 SHA256 5403ac6798bbb68292a8bcbddb5d27d29abc115a97e955e336f121f9327ad9e5 -MISC ChangeLog 26617 RMD160 4a910ac75042740fe31b455c3c71f434eda5fa72 SHA1 12152531fff31ac84b0cad4fde04daafbe236dd8 SHA256 486da3f4693c2c8c9bc7191c1f016c1a43f661ad7bab0a32faf77665e4e6a6d8 +EBUILD rhythmbox-0.12.7.ebuild 5029 RMD160 18d5c03fc1d8911493dd4d66e4f66d9fc2cd194b SHA1 30522860c00b354938b92b32760087284ddc56e2 SHA256 6199bc0ffe83092e2d952dbd1ca7478547a1a9d61aab88de426ddb93170d2208 +MISC ChangeLog 26780 RMD160 37b6e9c9dc34b6092677d26a4fa26adc51b92153 SHA1 e137b8ae5bb7f126a4b3fc10a625d5e274fdd609 SHA256 f4dcc9cd38cfea0ec08aa0a9f40a754e7531addd56f7e93ddeb7dec80359f7eb MISC metadata.xml 611 RMD160 a537fe9b35e6e61fed13baf0d308d7cfd89c7d12 SHA1 4a124b2e09a3787b5c0e8c23ca03c52e1499505f SHA256 d4aeb1c1d55bef78b74c25fdb1b5afae23af8627213bed498df78a54a07eb721 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuMTmcACgkQ1fmVwcYIWAbFnACg3t9eNbkk5roxJFPgwR6TKLRZ -SIwAoNpzly3M4RiDri8qn4MpEwfeekeR -=KvME ------END PGP SIGNATURE----- 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 -- 2.26.2