/[pkg-kde]/branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff
ViewVC logotype

Contents of /branches/kde4/packages/kdebase-runtime/debian/patches/97_fix_target_link_libraries.diff

Parent Directory Parent Directory | Revision Log Revision Log

Revision 10341 - (hide annotations) (download)
Mon Apr 28 19:38:21 2008 UTC (5 years ago) by modax-guest
File size: 13666 byte(s) 
Conditional linking for X11
1 modax-guest 10276 --- kdebase-runtime-4.0.71+svn801028.orig/kcmshell/CMakeLists.txt 2008-04-26 01:25:02.000000000 +0300
2     +++ kdebase-runtime-4.0.71+svn801028/kcmshell/CMakeLists.txt 2008-04-26 01:25:07.000000000 +0300
3     @@ -3,7 +3,7 @@
4    
5     kde4_add_kdeinit_executable( kcmshell4 ${kcmshell_KDEINIT_SRCS})
6    
7     -target_link_libraries(kdeinit_kcmshell4 ${KDE4_KUTILS_LIBS} )
8     +target_link_libraries(kdeinit_kcmshell4 ${KDE4_KUTILS_LIBS} ${QT_QTDBUS_LIBRARY} )
9    
10     install(TARGETS kdeinit_kcmshell4 ${INSTALL_TARGETS_DEFAULT_ARGS})
11     install(TARGETS kcmshell4 ${INSTALL_TARGETS_DEFAULT_ARGS})
12     --- kdebase-runtime-4.0.71+svn801028.orig/kcontrol/componentchooser/CMakeLists.txt 2008-04-26 01:16:15.000000000 +0300
13     +++ kdebase-runtime-4.0.71+svn801028/kcontrol/componentchooser/CMakeLists.txt 2008-04-26 01:16:23.000000000 +0300
14     @@ -21,7 +21,7 @@
15     kde4_add_plugin(kcm_componentchooser ${kcm_componentchooser_PART_SRCS})
16    
17    
18     -target_link_libraries(kcm_componentchooser ${KDE4_KIO_LIBS})
19     +target_link_libraries(kcm_componentchooser ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
20    
21     install(TARGETS kcm_componentchooser DESTINATION ${PLUGIN_INSTALL_DIR} )
22    
23     --- kdebase-runtime-4.0.71+svn801028.orig/kcontrol/dnssd/CMakeLists.txt 2008-04-26 01:22:25.000000000 +0300
24     +++ kdebase-runtime-4.0.71+svn801028/kcontrol/dnssd/CMakeLists.txt 2008-04-26 01:23:06.000000000 +0300
25     @@ -11,7 +11,7 @@
26     kde4_add_plugin(kcm_kdnssd ${kcm_kdnssd_PART_SRCS})
27    
28    
29     -target_link_libraries(kcm_kdnssd ${KDE4_KDNSSD_LIBS} )
30     +target_link_libraries(kcm_kdnssd ${KDE4_KDNSSD_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} )
31    
32     install(TARGETS kcm_kdnssd DESTINATION ${PLUGIN_INSTALL_DIR} )
33    
34     --- kdebase-runtime-4.0.71+svn801028.orig/kcontrol/emoticons/CMakeLists.txt 2008-04-26 01:23:56.000000000 +0300
35     +++ kdebase-runtime-4.0.71+svn801028/kcontrol/emoticons/CMakeLists.txt 2008-04-26 01:24:11.000000000 +0300
36     @@ -2,7 +2,7 @@
37     kde4_add_ui_files(kcmemoticons_SRCS emoticonslist.ui)
38    
39     kde4_add_plugin(kcm_emoticons ${kcmemoticons_SRCS})
40     -target_link_libraries(kcm_emoticons ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS})
41     +target_link_libraries(kcm_emoticons ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTXML_LIBRARY})
42    
43     install(TARGETS kcm_emoticons DESTINATION ${PLUGIN_INSTALL_DIR} )
44    
45     --- kdebase-runtime-4.0.71+svn801028.orig/kcontrol/icons/CMakeLists.txt 2008-04-26 01:13:03.000000000 +0300
46     +++ kdebase-runtime-4.0.71+svn801028/kcontrol/icons/CMakeLists.txt 2008-04-26 01:13:15.000000000 +0300
47     @@ -9,7 +9,7 @@
48     kde4_add_plugin(kcm_icons ${kcm_icons_PART_SRCS})
49    
50    
51     -target_link_libraries(kcm_icons ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF2_LIBS})
52     +target_link_libraries(kcm_icons ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTSVG_LIBRARY})
53    
54     install(TARGETS kcm_icons DESTINATION ${PLUGIN_INSTALL_DIR} )
55    
56     --- kdebase-runtime-4.0.71+svn801028.orig/kcontrol/kded/CMakeLists.txt 2008-04-26 01:14:36.000000000 +0300
57     +++ kdebase-runtime-4.0.71+svn801028/kcontrol/kded/CMakeLists.txt 2008-04-26 01:14:41.000000000 +0300
58     @@ -9,7 +9,7 @@
59     kde4_add_plugin(kcm_kded ${kcm_kded_PART_SRCS})
60    
61    
62     -target_link_libraries(kcm_kded ${KDE4_KDEUI_LIBS})
63     +target_link_libraries(kcm_kded ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY})
64    
65     install(TARGETS kcm_kded DESTINATION ${PLUGIN_INSTALL_DIR} )
66    
67     --- kdebase-runtime-4.0.71+svn801028.orig/kcontrol/knotify/CMakeLists.txt 2008-04-26 01:15:18.000000000 +0300
68     +++ kdebase-runtime-4.0.71+svn801028/kcontrol/knotify/CMakeLists.txt 2008-04-26 01:15:24.000000000 +0300
69     @@ -9,7 +9,7 @@
70     kde4_add_plugin(kcm_knotify ${kcm_knotify_PART_SRCS})
71    
72    
73     -target_link_libraries(kcm_knotify ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY} )
74     +target_link_libraries(kcm_knotify ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} )
75    
76     install(TARGETS kcm_knotify DESTINATION ${PLUGIN_INSTALL_DIR} )
77    
78     --- kdebase-runtime-4.0.71+svn801028.orig/khelpcenter/CMakeLists.txt 2008-04-26 00:58:13.000000000 +0300
79     +++ kdebase-runtime-4.0.71+svn801028/khelpcenter/CMakeLists.txt 2008-04-26 00:58:42.000000000 +0300
80     @@ -58,7 +58,7 @@
81     install(TARGETS khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS})
82     else (WIN32)
83     kde4_add_kdeinit_executable( khelpcenter ${khelpcenter_KDEINIT_SRCS})
84     - target_link_libraries(kdeinit_khelpcenter ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY} )
85     + target_link_libraries(kdeinit_khelpcenter ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
86     install(TARGETS kdeinit_khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS} )
87     install(TARGETS khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS})
88     endif (WIN32)
89     --- kdebase-runtime-4.0.71+svn801028.orig/kioslave/desktop/CMakeLists.txt 2008-04-26 01:08:07.000000000 +0300
90     +++ kdebase-runtime-4.0.71+svn801028/kioslave/desktop/CMakeLists.txt 2008-04-26 01:08:21.000000000 +0300
91     @@ -4,7 +4,7 @@
92    
93     kde4_add_plugin(kio_desktop ${kio_desktop_PART_SRCS})
94    
95     -target_link_libraries(kio_desktop ${KDE4_KIO_LIBS})
96     +target_link_libraries(kio_desktop ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
97    
98     install(TARGETS kio_desktop DESTINATION ${PLUGIN_INSTALL_DIR} )
99    
100     --- kdebase-runtime-4.0.71+svn801028.orig/kioslave/remote/kdedmodule/CMakeLists.txt 2008-04-26 01:04:32.000000000 +0300
101     +++ kdebase-runtime-4.0.71+svn801028/kioslave/remote/kdedmodule/CMakeLists.txt 2008-04-26 01:04:42.000000000 +0300
102     @@ -9,7 +9,7 @@
103     kde4_add_plugin(kded_remotedirnotify ${kded_remotedirnotify_PART_SRCS})
104    
105    
106     -target_link_libraries(kded_remotedirnotify ${KDE4_KIO_LIBS})
107     +target_link_libraries(kded_remotedirnotify ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} )
108    
109     install(TARGETS kded_remotedirnotify DESTINATION ${PLUGIN_INSTALL_DIR} )
110    
111     --- kdebase-runtime-4.0.71+svn801028.orig/kioslave/thumbnail/CMakeLists.txt 2008-04-26 01:06:57.000000000 +0300
112     +++ kdebase-runtime-4.0.71+svn801028/kioslave/thumbnail/CMakeLists.txt 2008-04-26 01:07:20.000000000 +0300
113     @@ -28,7 +28,7 @@
114    
115     kde4_add_plugin(svgthumbnail ${svgthumbnail_PART_SRCS})
116    
117     -target_link_libraries(svgthumbnail ${KDE4_KDEUI_LIBS}) # needs kdeui for ksvgrenderer
118     +target_link_libraries(svgthumbnail ${KDE4_KDEUI_LIBS} ${QT_QTSVG_LIBRARY}) # needs kdeui for ksvgrenderer
119    
120     install(TARGETS svgthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
121    
122     --- kdebase-runtime-4.0.71+svn801028.orig/kioslave/trash/CMakeLists.txt 2008-04-26 01:02:37.000000000 +0300
123     +++ kdebase-runtime-4.0.71+svn801028/kioslave/trash/CMakeLists.txt 2008-04-26 01:03:34.000000000 +0300
124     @@ -14,14 +14,14 @@
125     kde4_add_plugin(kio_trash ${kio_trash_PART_SRCS})
126    
127    
128     -target_link_libraries(kio_trash ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
129     +target_link_libraries(kio_trash ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} )
130    
131     install(TARGETS kio_trash DESTINATION ${PLUGIN_INSTALL_DIR} )
132    
133     ########### next target ###############
134    
135     kde4_add_library(trash MODULE trashthroughanalyzer.cpp trashimpl.cpp)
136     -target_link_libraries(trash ${STREAMANALYZER_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
137     +target_link_libraries(trash ${STRIGI_STREAMANALYZER_LIBRARY} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
138     set_target_properties(trash PROPERTIES
139     PREFIX strigita_)
140     #install(TARGETS trash LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
141     --- kdebase-runtime-4.0.71+svn801028.orig/kpasswdserver/CMakeLists.txt 2008-04-26 01:09:51.000000000 +0300
142     +++ kdebase-runtime-4.0.71+svn801028/kpasswdserver/CMakeLists.txt 2008-04-26 01:10:17.000000000 +0300
143 modax-guest 10341 @@ -2,7 +2,10 @@
144 modax-guest 10276
145     kde4_add_plugin(kded_kpasswdserver ${kded_kpasswdserver_SRCS})
146    
147     -target_link_libraries(kded_kpasswdserver ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY})
148 modax-guest 10341 +target_link_libraries(kded_kpasswdserver ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTDBUS_LIBRARY})
149     +if (X11_FOUND)
150     + target_link_libraries(kded_kpasswdserver ${X11_X11_LIB})
151     +end (X11_FOUND)
152 modax-guest 10276
153     install(TARGETS kded_kpasswdserver DESTINATION ${PLUGIN_INSTALL_DIR} )
154    
155     --- kdebase-runtime-4.0.71+svn801028.orig/kstyles/oxygen/CMakeLists.txt 2008-04-26 01:34:23.000000000 +0300
156     +++ kdebase-runtime-4.0.71+svn801028/kstyles/oxygen/CMakeLists.txt 2008-04-26 01:34:27.000000000 +0300
157     @@ -16,7 +16,7 @@
158    
159     kde4_add_plugin(oxygen ${oxygen_PART_SRCS})
160    
161     -target_link_libraries(oxygen ${KDE4_KDEUI_LIBS} )
162     +target_link_libraries(oxygen ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} )
163    
164     install(TARGETS oxygen DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles/ )
165    
166     --- kdebase-runtime-4.0.71+svn801028.orig/ktimezoned/CMakeLists.txt 2008-04-26 01:11:26.000000000 +0300
167     +++ kdebase-runtime-4.0.71+svn801028/ktimezoned/CMakeLists.txt 2008-04-26 01:11:43.000000000 +0300
168     @@ -5,7 +5,7 @@
169    
170     #qt4_add_dbus_adaptor(kded_ktimezoned_SRCS org.kde.KTimeZoned ktimezonedbus.h DBusHandler)
171    
172     -target_link_libraries(kded_ktimezoned ${KDE4_KIO_LIBS})
173     +target_link_libraries(kded_ktimezoned ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
174    
175     install(TARGETS kded_ktimezoned DESTINATION ${PLUGIN_INSTALL_DIR})
176    
177     --- kdebase-runtime-4.0.71+svn801028.orig/kuiserver/CMakeLists.txt 2008-04-26 00:55:03.000000000 +0300
178     +++ kdebase-runtime-4.0.71+svn801028/kuiserver/CMakeLists.txt 2008-04-26 00:55:16.000000000 +0300
179     @@ -20,7 +20,7 @@
180    
181     kde4_add_kdeinit_executable( kuiserver ${kuiserver_KDEINIT_SRCS})
182    
183     -target_link_libraries(kdeinit_kuiserver ${KDE4_KIO_LIBS} )
184     +target_link_libraries(kdeinit_kuiserver ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} )
185     install(TARGETS kdeinit_kuiserver ${INSTALL_TARGETS_DEFAULT_ARGS})
186    
187     target_link_libraries( kuiserver kdeinit_kuiserver )
188     --- kdebase-runtime-4.0.71+svn801028.orig/kurifilter-plugins/ikws/CMakeLists.txt 2008-04-26 01:28:25.000000000 +0300
189     +++ kdebase-runtime-4.0.71+svn801028/kurifilter-plugins/ikws/CMakeLists.txt 2008-04-26 01:29:38.000000000 +0300
190     @@ -13,7 +13,7 @@
191     kde4_add_plugin(kuriikwsfilter WITH_PREFIX ${kuriikwsfilter_PART_SRCS})
192    
193    
194     -target_link_libraries(kuriikwsfilter ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} )
195     +target_link_libraries(kuriikwsfilter ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY} )
196    
197     install(TARGETS kuriikwsfilter DESTINATION ${PLUGIN_INSTALL_DIR} )
198    
199     @@ -34,7 +34,7 @@
200     kde4_add_plugin(kurisearchfilter WITH_PREFIX ${kurisearchfilter_PART_SRCS})
201    
202    
203     -target_link_libraries(kurisearchfilter ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
204     +target_link_libraries(kurisearchfilter ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY})
205    
206     install(TARGETS kurisearchfilter DESTINATION ${PLUGIN_INSTALL_DIR} )
207    
208     --- kdebase-runtime-4.0.71+svn801028.orig/kurifilter-plugins/localdomain/CMakeLists.txt 2008-04-26 01:27:37.000000000 +0300
209     +++ kdebase-runtime-4.0.71+svn801028/kurifilter-plugins/localdomain/CMakeLists.txt 2008-04-26 01:27:42.000000000 +0300
210     @@ -4,7 +4,7 @@
211    
212     kde4_add_plugin(localdomainurifilter WITH_PREFIX ${localdomainurifilter_PART_SRCS})
213    
214     -target_link_libraries(localdomainurifilter ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
215     +target_link_libraries(localdomainurifilter ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
216     if (HAVE_NSL_LIBRARY)
217     target_link_libraries(localdomainurifilter nsl)
218     endif (HAVE_NSL_LIBRARY)
219     --- kdebase-runtime-4.0.71+svn801028.orig/kurifilter-plugins/shorturi/CMakeLists.txt 2008-04-26 01:30:27.000000000 +0300
220     +++ kdebase-runtime-4.0.71+svn801028/kurifilter-plugins/shorturi/CMakeLists.txt 2008-04-26 01:30:31.000000000 +0300
221     @@ -9,7 +9,7 @@
222     kde4_add_plugin(kshorturifilter WITH_PREFIX ${kshorturifilter_PART_SRCS})
223    
224    
225     -target_link_libraries(kshorturifilter ${KDE4_KIO_LIBS})
226     +target_link_libraries(kshorturifilter ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
227    
228     install(TARGETS kshorturifilter DESTINATION ${PLUGIN_INSTALL_DIR} )
229    
230     --- kdebase-runtime-4.0.71+svn801028.orig/nepomuk/kcm/CMakeLists.txt 2008-04-26 01:39:56.000000000 +0300
231     +++ kdebase-runtime-4.0.71+svn801028/nepomuk/kcm/CMakeLists.txt 2008-04-26 01:40:18.000000000 +0300
232     @@ -27,6 +27,7 @@
233     ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY}
234     ${QT_QTCORE_LIBRARY}
235     ${QT_QTDBUS_LIBRARY}
236     + ${QT_QTXML_LIBRARY}
237     ${KDE4_KDECORE_LIBS}
238     ${KDE4_KDEUI_LIBS}
239     ${KDE4_KIO_LIBS}
240     --- kdebase-runtime-4.0.71+svn801028.orig/nepomuk/services/strigi/CMakeLists.txt 2008-04-26 01:42:06.000000000 +0300
241     +++ kdebase-runtime-4.0.71+svn801028/nepomuk/services/strigi/CMakeLists.txt 2008-04-26 01:43:05.000000000 +0300
242     @@ -20,6 +20,8 @@
243     target_link_libraries(nepomukstrigiservice
244     ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY}
245     ${QT_QTCORE_LIBRARY}
246     + ${QT_QTXML_LIBRARY}
247     + ${QT_QTDBUS_LIBRARY}
248     ${KDE4_KDECORE_LIBS}
249     ${KDE4_KDEUI_LIBS}
250     ${NEPOMUK_LIBRARIES}
251     --- kdebase-runtime-4.0.71+svn801028.orig/phonon/xine/kcm/CMakeLists.txt 2008-04-26 01:32:55.000000000 +0300
252     +++ kdebase-runtime-4.0.71+svn801028/phonon/xine/kcm/CMakeLists.txt 2008-04-26 01:33:01.000000000 +0300
253     @@ -4,7 +4,7 @@
254     include_directories(${XINE_INCLUDE_DIR})
255    
256     kde4_add_plugin(kcm_phononxine ${kcmphononxine_SRCS})
257     -target_link_libraries(kcm_phononxine ${KDE4_KDEUI_LIBS} ${XINE_LIBRARY})
258     +target_link_libraries(kcm_phononxine ${KDE4_KDEUI_LIBS} ${XINE_LIBRARY} ${QT_QTDBUS_LIBRARY})
259     install(TARGETS kcm_phononxine DESTINATION ${PLUGIN_INSTALL_DIR})
260    
261     install(FILES kcm_phononxine.desktop DESTINATION ${SERVICES_INSTALL_DIR})
262     --- kdebase-runtime-4.0.71+svn801028.orig/soliduiserver/CMakeLists.txt 2008-04-26 01:26:34.000000000 +0300
263     +++ kdebase-runtime-4.0.71+svn801028/soliduiserver/CMakeLists.txt 2008-04-26 01:26:44.000000000 +0300
264     @@ -13,7 +13,7 @@
265     kde4_add_plugin(kded_soliduiserver ${kded_soliduiserver_SRCS})
266    
267    
268     -target_link_libraries(kded_soliduiserver ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS})
269     +target_link_libraries(kded_soliduiserver ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
270    
271     install(TARGETS kded_soliduiserver DESTINATION ${PLUGIN_INSTALL_DIR})
272    
  ViewVC Help
Powered by ViewVC 1.1.5