| 1 |
dang 09/06/03 14:28:41 |
| 2 |
|
| 3 |
Added: rhythmbox-0.12.2-link-fixes.patch |
| 4 |
Log: |
| 5 |
Fix plugin linking. Bug #272203 |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/rhythmbox/files/rhythmbox-0.12.2-link-fixes.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: rhythmbox-0.12.2-link-fixes.patch |
| 15 |
=================================================================== |
| 16 |
From 02159da160b33f0e411ec502f59213b12d445c73 Mon Sep 17 00:00:00 2001 |
| 17 |
From: Jonathan Matthew <jonathan@××××.org> |
| 18 |
Date: Mon, 1 Jun 2009 10:21:11 +1000 |
| 19 |
Subject: [PATCH] fix a variety of plugin linking problems |
| 20 |
|
| 21 |
All C plugins need to be linked against librhythmbox-core as well as any |
| 22 |
other libraries they need. |
| 23 |
--- |
| 24 |
plugins/daap/Makefile.am | 1 + |
| 25 |
plugins/generic-player/Makefile.am | 3 ++- |
| 26 |
plugins/iradio/Makefile.am | 4 +++- |
| 27 |
plugins/lirc/Makefile.am | 2 ++ |
| 28 |
plugins/mtpdevice/Makefile.am | 4 ++-- |
| 29 |
plugins/power-manager/Makefile.am | 2 ++ |
| 30 |
plugins/sample/Makefile.am | 2 ++ |
| 31 |
plugins/status-icon/Makefile.am | 5 ++++- |
| 32 |
plugins/visualizer/Makefile.am | 1 + |
| 33 |
9 files changed, 19 insertions(+), 5 deletions(-) |
| 34 |
|
| 35 |
diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am |
| 36 |
index a446f99..4c8fe7d 100644 |
| 37 |
--- a/plugins/daap/Makefile.am |
| 38 |
+++ b/plugins/daap/Makefile.am |
| 39 |
@@ -33,6 +33,7 @@ libdaap_la_SOURCES = \ |
| 40 |
libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 41 |
libdaap_la_LIBTOOLFLAGS = --tag=disable-static |
| 42 |
libdaap_la_LIBADD = \ |
| 43 |
+ $(top_builddir)/corelib/librhythmbox-core.la \ |
| 44 |
$(DBUS_LIBS) \ |
| 45 |
$(MDNS_LIBS) |
| 46 |
|
| 47 |
diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am |
| 48 |
index 113240d..f7e7f45 100644 |
| 49 |
--- a/plugins/generic-player/Makefile.am |
| 50 |
+++ b/plugins/generic-player/Makefile.am |
| 51 |
@@ -18,8 +18,9 @@ endif |
| 52 |
|
| 53 |
libgeneric_player_la_LIBTOOLFLAGS = --tag=disable-static |
| 54 |
libgeneric_player_la_LDFLAGS = \ |
| 55 |
+ $(top_builddir)/corelib/librhythmbox-core.la \ |
| 56 |
$(TOTEM_PLPARSER_LIBS) \ |
| 57 |
- $(HAL_LIBS) \ |
| 58 |
+ $(HAL_LIBS) \ |
| 59 |
$(PLUGIN_LIBTOOL_FLAGS) |
| 60 |
|
| 61 |
INCLUDES = \ |
| 62 |
diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am |
| 63 |
index 2fc6399..3cce0a1 100644 |
| 64 |
--- a/plugins/iradio/Makefile.am |
| 65 |
+++ b/plugins/iradio/Makefile.am |
| 66 |
@@ -15,7 +15,9 @@ libiradio_la_SOURCES = \ |
| 67 |
libiradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 68 |
libiradio_la_LIBTOOLFLAGS = --tag=disable-static |
| 69 |
libiradio_la_LIBADD = \ |
| 70 |
- $(top_builddir)/corelib/librhythmbox-core.la |
| 71 |
+ $(top_builddir)/corelib/librhythmbox-core.la \ |
| 72 |
+ $(TOTEM_PLPARSER_LIBS) \ |
| 73 |
+ $(NULL) |
| 74 |
|
| 75 |
INCLUDES = \ |
| 76 |
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ |
| 77 |
diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am |
| 78 |
index 2c85a4a..daea54a 100644 |
| 79 |
--- a/plugins/lirc/Makefile.am |
| 80 |
+++ b/plugins/lirc/Makefile.am |
| 81 |
@@ -7,6 +7,8 @@ librblirc_la_SOURCES = \ |
| 82 |
librblirc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -llirc_client |
| 83 |
librblirc_la_LIBTOOLFLAGS = --tag=disable-static |
| 84 |
|
| 85 |
+librblirc_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la |
| 86 |
+ |
| 87 |
configdir = $(PLUGINDIR)/rblirc |
| 88 |
config_DATA = rhythmbox_lirc_default |
| 89 |
|
| 90 |
diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am |
| 91 |
index 57188a0..6e6e4de 100644 |
| 92 |
--- a/plugins/mtpdevice/Makefile.am |
| 93 |
+++ b/plugins/mtpdevice/Makefile.am |
| 94 |
@@ -10,8 +10,8 @@ libmtpdevice_la_SOURCES = \ |
| 95 |
|
| 96 |
libmtpdevice_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 97 |
libmtpdevice_la_LIBTOOLFLAGS = --tag=disable-static |
| 98 |
-libmtpdevice_la_LIBADD = \ |
| 99 |
- $(top_builddir)/lib/librb.la \ |
| 100 |
+libmtpdevice_la_LIBADD = \ |
| 101 |
+ $(top_builddir)/corelib/librhythmbox-core.la \ |
| 102 |
$(HAL_LIBS) \ |
| 103 |
$(MTP_LIBS) |
| 104 |
|
| 105 |
diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am |
| 106 |
index 8dbba4f..11c090a 100644 |
| 107 |
--- a/plugins/power-manager/Makefile.am |
| 108 |
+++ b/plugins/power-manager/Makefile.am |
| 109 |
@@ -7,6 +7,8 @@ libpower_manager_la_SOURCES = \ |
| 110 |
libpower_manager_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 111 |
libpower_manager_la_LIBTOOLFLAGS = --tag=disable-static |
| 112 |
|
| 113 |
+libpower_manager_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la |
| 114 |
+ |
| 115 |
INCLUDES = \ |
| 116 |
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ |
| 117 |
-DG_LOG_DOMAIN=\"Rhythmbox\" \ |
| 118 |
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am |
| 119 |
index c90cc4f..9ee5d58 100644 |
| 120 |
--- a/plugins/sample/Makefile.am |
| 121 |
+++ b/plugins/sample/Makefile.am |
| 122 |
@@ -7,6 +7,8 @@ libsample_la_SOURCES = \ |
| 123 |
|
| 124 |
libsample_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 125 |
|
| 126 |
+libsample_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la |
| 127 |
+ |
| 128 |
INCLUDES = \ |
| 129 |
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ |
| 130 |
-DG_LOG_DOMAIN=\"Rhythmbox\" \ |
| 131 |
diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am |
| 132 |
index a52c3ce..d52dffd 100644 |
| 133 |
--- a/plugins/status-icon/Makefile.am |
| 134 |
+++ b/plugins/status-icon/Makefile.am |
| 135 |
@@ -25,7 +25,10 @@ libstatus_icon_la_SOURCES = \ |
| 136 |
libstatus_icon_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 137 |
libstatus_icon_la_LIBTOOLFLAGS = --tag=disable-static |
| 138 |
|
| 139 |
-libstatus_icon_la_LIBADD = $(RHYTHMBOX_LIBS) |
| 140 |
+libstatus_icon_la_LIBADD = \ |
| 141 |
+ $(top_builddir)/corelib/librhythmbox-core.la \ |
| 142 |
+ $(NOTIFY_LIBS) \ |
| 143 |
+ $(NULL) |
| 144 |
|
| 145 |
INCLUDES = \ |
| 146 |
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ |
| 147 |
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am |
| 148 |
index ffd3d33..979ac0c 100644 |
| 149 |
--- a/plugins/visualizer/Makefile.am |
| 150 |
+++ b/plugins/visualizer/Makefile.am |
| 151 |
@@ -12,6 +12,7 @@ libvisualizer_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
| 152 |
libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static |
| 153 |
|
| 154 |
libvisualizer_la_LIBADD = \ |
| 155 |
+ $(top_builddir)/corelib/librhythmbox-core.la \ |
| 156 |
-lgstinterfaces-0.10 \ |
| 157 |
$(DBUS_LIBS) \ |
| 158 |
$(RHYTHMBOX_LIBS) |
| 159 |
-- |
| 160 |
1.6.3.1.257.gbd13 |
Archives