diff options
| -rw-r--r-- | media-sound/rhythmbox/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/rhythmbox/Manifest | 15 | ||||
| -rw-r--r-- | media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch | 146 | ||||
| -rw-r--r-- | media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild (renamed from media-sound/rhythmbox/rhythmbox-0.12.2.ebuild) | 8 |
4 files changed, 172 insertions, 5 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog index 35533e4b0c8a..8fd1477206d5 100644 --- a/media-sound/rhythmbox/ChangeLog +++ b/media-sound/rhythmbox/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/rhythmbox # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.150 2009/05/31 16:47:38 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.151 2009/06/03 14:28:40 dang Exp $ + +*rhythmbox-0.12.2-r1 (03 Jun 2009) + + 03 Jun 2009; Daniel Gryniewicz <dang@gentoo.org> -rhythmbox-0.12.2.ebuild, + +rhythmbox-0.12.2-r1.ebuild, +files/rhythmbox-0.12.2-link-fixes.patch: + Fix plugin linking. Bug #272203 *rhythmbox-0.12.2 (31 May 2009) diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest index 98794466e1f1..8bf5a5a69db8 100644 --- a/media-sound/rhythmbox/Manifest +++ b/media-sound/rhythmbox/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX rhythmbox-0.11.5-libmtp-0.3.0-API.patch 426 RMD160 f48440d266ba4209e5025c2e1525c606516db49e SHA1 9d4822b237d0434376e3f3c072ee8fb52ee11386 SHA256 3de9f0ecfbfac969a93a199da576cff4fd3d9f411ae5d2d71dfb6112f63a36b8 +AUX rhythmbox-0.12.2-link-fixes.patch 5280 RMD160 ad9ee18b2ccf12cce769c9e15e0f1d6aee386234 SHA1 360582ecfeacc5a11ea80394ec47aafb7c7123c5 SHA256 a53b023e2de6bb92eef969514468c8bce61e9d500c03f46ff435b7a0234c51b4 DIST rhythmbox-0.11.6.tar.bz2 4683400 RMD160 3fd6b8595705a91c779c458a26333575ba5e2233 SHA1 4364447bd4f6fb0e969039213cea37d6d3e4fb58 SHA256 687f566817a0c1c6a2c0e9cc462bb10cded39b8d22b224fa55be00ae1cbdc151 DIST rhythmbox-0.12.2.tar.bz2 4909310 RMD160 bf50fe01295c8a4fc185b0f811dccff829dbfac4 SHA1 dd72ffd092760fc70b5a86e7f5ccf8157e56fb98 SHA256 3f0a9cbe8722383a3563e4f9030937cec32c48636793ac8a8e9c2f6326fc60ec EBUILD rhythmbox-0.11.6-r1.ebuild 4615 RMD160 ebff53ac9f76bdca4fa9c9cdd484a1cf8f1174b2 SHA1 eac8c8362f023fea11312e2fd8ad8f9598dc9cfe SHA256 888e1faa9bc55bc49a9f013f98a548e9bad8000a57542090071e38f63ca20641 -EBUILD rhythmbox-0.12.2.ebuild 4134 RMD160 01e3640f31b3e7ca4fc017bc846b8c8ae905b69b SHA1 b4ee52e1b2a95c531dddc0d4957497032c32f91d SHA256 60acd8667b0a991a8c90af825960943ce8d6a8fffeefe5e70d1f97f74578d779 -MISC ChangeLog 22108 RMD160 3ef83115802ad3bb11cb2023ffe44239f61e757d SHA1 4c5d3bf9b5dde49995ed6fc27f488c331dc64ff1 SHA256 668b4d20cdab323d589060f0a90e900ff056ebf5971c2381fc2c109318dfdae0 +EBUILD rhythmbox-0.12.2-r1.ebuild 4242 RMD160 3e136eb130100c528c16bcd99206a03695505da1 SHA1 9260635da8057c8712f8cc15fb89cd8ff9595b3d SHA256 c615bdce9b5d74e3efe52b28fab17117e350257e7288d7a17e81fcb837fe5fad +MISC ChangeLog 22330 RMD160 2190af7bff5015bf03df3eb7d7b2cd9870d89cb9 SHA1 fce23ec0ea2ae57f90a2f1287a620379f3eaf4cb SHA256 6f2f488772ce635995ed9f0be385f8883baece01c4e6758b6b6fef0b5db7dcb5 MISC metadata.xml 499 RMD160 2913fd35997d79f3fea648d4b3f4f12ce47a769d SHA1 a9636fc5898527825d7ec4cc6a9ebe3210a03b3a SHA256 f55d6d569982566d3cacd0f635be5aa757d19c54704a94124487eed37e29627c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iD8DBQFKJokbomPajV0RnrERAlbqAKCEuFnAMOuRIviRDAhO4s2KLsLMNgCfdI2f +9A6qfpaooHc+5fxFNiuKEJk= +=qGQc +-----END PGP SIGNATURE----- diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch new file mode 100644 index 000000000000..9cf9673f64fe --- /dev/null +++ b/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch @@ -0,0 +1,146 @@ +From 02159da160b33f0e411ec502f59213b12d445c73 Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew <jonathan@d14n.org> +Date: Mon, 1 Jun 2009 10:21:11 +1000 +Subject: [PATCH] fix a variety of plugin linking problems + +All C plugins need to be linked against librhythmbox-core as well as any +other libraries they need. +--- + plugins/daap/Makefile.am | 1 + + plugins/generic-player/Makefile.am | 3 ++- + plugins/iradio/Makefile.am | 4 +++- + plugins/lirc/Makefile.am | 2 ++ + plugins/mtpdevice/Makefile.am | 4 ++-- + plugins/power-manager/Makefile.am | 2 ++ + plugins/sample/Makefile.am | 2 ++ + plugins/status-icon/Makefile.am | 5 ++++- + plugins/visualizer/Makefile.am | 1 + + 9 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am +index a446f99..4c8fe7d 100644 +--- a/plugins/daap/Makefile.am ++++ b/plugins/daap/Makefile.am +@@ -33,6 +33,7 @@ libdaap_la_SOURCES = \ + libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libdaap_la_LIBTOOLFLAGS = --tag=disable-static + libdaap_la_LIBADD = \ ++ $(top_builddir)/corelib/librhythmbox-core.la \ + $(DBUS_LIBS) \ + $(MDNS_LIBS) + +diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am +index 113240d..f7e7f45 100644 +--- a/plugins/generic-player/Makefile.am ++++ b/plugins/generic-player/Makefile.am +@@ -18,8 +18,9 @@ endif + + libgeneric_player_la_LIBTOOLFLAGS = --tag=disable-static + libgeneric_player_la_LDFLAGS = \ ++ $(top_builddir)/corelib/librhythmbox-core.la \ + $(TOTEM_PLPARSER_LIBS) \ +- $(HAL_LIBS) \ ++ $(HAL_LIBS) \ + $(PLUGIN_LIBTOOL_FLAGS) + + INCLUDES = \ +diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am +index 2fc6399..3cce0a1 100644 +--- a/plugins/iradio/Makefile.am ++++ b/plugins/iradio/Makefile.am +@@ -15,7 +15,9 @@ libiradio_la_SOURCES = \ + libiradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libiradio_la_LIBTOOLFLAGS = --tag=disable-static + libiradio_la_LIBADD = \ +- $(top_builddir)/corelib/librhythmbox-core.la ++ $(top_builddir)/corelib/librhythmbox-core.la \ ++ $(TOTEM_PLPARSER_LIBS) \ ++ $(NULL) + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ +diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am +index 2c85a4a..daea54a 100644 +--- a/plugins/lirc/Makefile.am ++++ b/plugins/lirc/Makefile.am +@@ -7,6 +7,8 @@ librblirc_la_SOURCES = \ + librblirc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -llirc_client + librblirc_la_LIBTOOLFLAGS = --tag=disable-static + ++librblirc_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la ++ + configdir = $(PLUGINDIR)/rblirc + config_DATA = rhythmbox_lirc_default + +diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am +index 57188a0..6e6e4de 100644 +--- a/plugins/mtpdevice/Makefile.am ++++ b/plugins/mtpdevice/Makefile.am +@@ -10,8 +10,8 @@ libmtpdevice_la_SOURCES = \ + + libmtpdevice_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libmtpdevice_la_LIBTOOLFLAGS = --tag=disable-static +-libmtpdevice_la_LIBADD = \ +- $(top_builddir)/lib/librb.la \ ++libmtpdevice_la_LIBADD = \ ++ $(top_builddir)/corelib/librhythmbox-core.la \ + $(HAL_LIBS) \ + $(MTP_LIBS) + +diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am +index 8dbba4f..11c090a 100644 +--- a/plugins/power-manager/Makefile.am ++++ b/plugins/power-manager/Makefile.am +@@ -7,6 +7,8 @@ libpower_manager_la_SOURCES = \ + libpower_manager_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libpower_manager_la_LIBTOOLFLAGS = --tag=disable-static + ++libpower_manager_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la ++ + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"Rhythmbox\" \ +diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am +index c90cc4f..9ee5d58 100644 +--- a/plugins/sample/Makefile.am ++++ b/plugins/sample/Makefile.am +@@ -7,6 +7,8 @@ libsample_la_SOURCES = \ + + libsample_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + ++libsample_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la ++ + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"Rhythmbox\" \ +diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am +index a52c3ce..d52dffd 100644 +--- a/plugins/status-icon/Makefile.am ++++ b/plugins/status-icon/Makefile.am +@@ -25,7 +25,10 @@ libstatus_icon_la_SOURCES = \ + libstatus_icon_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libstatus_icon_la_LIBTOOLFLAGS = --tag=disable-static + +-libstatus_icon_la_LIBADD = $(RHYTHMBOX_LIBS) ++libstatus_icon_la_LIBADD = \ ++ $(top_builddir)/corelib/librhythmbox-core.la \ ++ $(NOTIFY_LIBS) \ ++ $(NULL) + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ +diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am +index ffd3d33..979ac0c 100644 +--- a/plugins/visualizer/Makefile.am ++++ b/plugins/visualizer/Makefile.am +@@ -12,6 +12,7 @@ libvisualizer_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) + libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static + + libvisualizer_la_LIBADD = \ ++ $(top_builddir)/corelib/librhythmbox-core.la \ + -lgstinterfaces-0.10 \ + $(DBUS_LIBS) \ + $(RHYTHMBOX_LIBS) +-- +1.6.3.1.257.gbd13 + diff --git a/media-sound/rhythmbox/rhythmbox-0.12.2.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild index dfb1ac27a2bd..4f7505d29c00 100644 --- a/media-sound/rhythmbox/rhythmbox-0.12.2.ebuild +++ b/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.2.ebuild,v 1.1 2009/05/31 16:47:38 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.2-r1.ebuild,v 1.1 2009/06/03 14:28:40 dang Exp $ EAPI="2" -inherit eutils gnome2 python multilib virtualx +inherit eutils gnome2 python multilib virtualx autotools DESCRIPTION="Music management and playback software for GNOME" HOMEPAGE="http://www.rhythmbox.org/" @@ -125,6 +125,10 @@ src_prepare() { # Fix intltoolize broken file, see upstream #577133 #sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" + + # Fix plugin linking. Bug #272203 + epatch "${FILESDIR}"/${P}-link-fixes.patch + eautoreconf } src_compile() { |