rev 10302 - in branches/kde4/packages/kdebase-workspace/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Sun Apr 27 15:10:41 UTC 2008
Author: modax-guest
Date: 2008-04-27 15:10:41 +0000 (Sun, 27 Apr 2008)
New Revision: 10302
Added:
branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Modified:
branches/kde4/packages/kdebase-workspace/debian/changelog
branches/kde4/packages/kdebase-workspace/debian/control
branches/kde4/packages/kdebase-workspace/debian/patches/series
branches/kde4/packages/kdebase-workspace/debian/rules
Log:
Packaging of newer snapshot. debian/rules build should complete fine but there more remaining issues.
Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog 2008-04-27 12:57:47 UTC (rev 10301)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog 2008-04-27 15:10:41 UTC (rev 10302)
@@ -1,3 +1,17 @@
+kdebase-workspace (4:4.0.71+svn801282-1~pre1) UNRELEASED; urgency=low
+
+ !!! It should build but install files are not updated and there are much
+ new stuff which needs a more a deep look (like printer-applet) !!!
+ +++ Changes by Modestas Vainius:
+
+ * Add libstreamanalyzer-dev, libfontconfig-dev to build depends.
+ * Install printer-applet even if python Qt/KDE bindings are missing at build
+ time (-DINSTALL_PRINTER_APPLET=TRUE) (!!!does not seem to work!!!).
+ * Add 97_fix_target_link_libraries.diff which fixes linkage problems with
+ recent kdelibs5.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 26 Apr 2008 12:27:22 +0300
+
kdebase-workspace (4:4.0.68+svn794641-1) experimental; urgency=low
[ Debian Qt/KDE Maintainers ]
Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control 2008-04-27 12:57:47 UTC (rev 10301)
+++ branches/kde4/packages/kdebase-workspace/debian/control 2008-04-27 15:10:41 UTC (rev 10302)
@@ -10,7 +10,7 @@
libstrigiqtdbusclient-dev (>= 0.5.8-2), libusb-dev, libxkbfile-dev,
libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
libxrandr-dev, libxrender-dev, libxxf86misc-dev, network-manager-dev,
- libsmbclient-dev, libxcb1-dev, libxine-dev
+ libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev
Standards-Version: 3.7.3
Homepage: http://www.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-workspace
Added: branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff 2008-04-27 15:10:41 UTC (rev 10302)
@@ -0,0 +1,517 @@
+--- kdebase-workspace.orig/kcminit/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/kcminit/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -5,7 +5,7 @@
+
+ kde4_add_kdeinit_executable( kcminit ${kcminit_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kcminit ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kdeinit_kcminit ${KDE4_KUTILS_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+
+ install(TARGETS kdeinit_kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kcminit ${INSTALL_TARGETS_DEFAULT_ARGS} )
+@@ -19,7 +19,7 @@
+
+ kde4_add_kdeinit_executable( kcminit_startup ${kcminit_startup_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kcminit_startup ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kdeinit_kcminit_startup ${KDE4_KUTILS_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+
+ install(TARGETS kdeinit_kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kcminit_startup ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- kdebase-workspace.orig/klipper/CMakeLists.txt 2008-04-26 16:44:18.000000000 +0300
++++ kdebase-workspace/klipper/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -18,11 +18,15 @@
+
+ kde4_add_kdeinit_executable(klipper ${klipper_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_klipper ${KDE4_KDEUI_LIBS})
++target_link_libraries(kdeinit_klipper ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${ZLIB_LIBRARY})
+ if (X11_Xfixes_FOUND)
+ target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
+ endif (X11_Xfixes_FOUND)
+
++if (X11_X11_LIB)
++ target_link_libraries(kdeinit_klipper ${X11_X11_LIB})
++endif (X11_X11_LIB)
++
+ install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+--- kdebase-workspace.orig/kmenuedit/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/kmenuedit/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -12,8 +12,7 @@
+
+ kde4_add_kdeinit_executable( kmenuedit ${kmenuedit_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kmenuedit ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY}
+-)
++target_link_libraries(kdeinit_kmenuedit ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} )
+
+ install(TARGETS kdeinit_kmenuedit DESTINATION ${LIB_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/krunner/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/krunner/CMakeLists.txt 2008-04-26 20:41:17.000000000 +0300
+@@ -35,7 +35,7 @@
+
+ kde4_add_kdeinit_executable(krunner ${krunner_SRCS})
+ # needs qt3support for Q3ListView in lockdlg
+-target_link_libraries(kdeinit_krunner plasma kworkspace processui ${KDE4_SOLID_LIBRARIES} ${KDE4_THREADWEAVER_LIBRARIES} ${X11_Xrender_LIB} ${KDE4_KDEUI_LIBS}
++target_link_libraries(kdeinit_krunner plasma kworkspace processui ${KDE4_SOLID_LIBRARIES} ${KDE4_THREADWEAVER_LIBS} ${X11_Xrender_LIB} ${KDE4_KDEUI_LIBS}
+ ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBRARY} )
+
+ if(X11_Xss_LIB)
+--- kdebase-workspace.orig/ksysguard/gui/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/ksysguard/gui/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -55,7 +55,7 @@
+
+ kde4_add_kdeinit_executable(ksysguard ${ksysguard_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_ksysguard processui ${KDE4_KIO_LIBS} ksgrd plasma)
++target_link_libraries(kdeinit_ksysguard processui ${KDE4_KIO_LIBS} ksgrd plasma ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS kdeinit_ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS ksysguard ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdebase-workspace.orig/kwin/kcmkwin/kwinoptions/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/kwin/kcmkwin/kwinoptions/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -2,7 +2,7 @@
+
+ set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
+ kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
+-target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
++target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTDBUS_LIBRARY})
+ install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+
+--- kdebase-workspace.orig/kwin/lib/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/kwin/lib/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -36,7 +36,7 @@
+ )
+
+ kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
+-target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES})
++target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} ${QT_QTDBUS_LIBRARY})
+ set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+
+ install(TARGETS kwineffects ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kdebase-workspace.orig/libs/kworkspace/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/libs/kworkspace/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -17,7 +17,7 @@
+
+ kde4_add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
+
+-target_link_libraries(kworkspace ${KDE4_KIO_LIBS} ${X11_LIBRARIES} )
++target_link_libraries(kworkspace ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_LIBRARIES} )
+
+ set_target_properties(kworkspace PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS kworkspace ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- kdebase-workspace.orig/libs/plasma/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/libs/plasma/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -80,7 +80,7 @@
+ target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
+
+ if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+- target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
++ target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${OPENGL_gl_LIBRARY} ${KDE4_SOLID_LIBS} )
+ endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+
+ set_target_properties(plasma PROPERTIES VERSION 1.0.0 SOVERSION 1)
+--- kdebase-workspace.orig/libs/solid/control/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/libs/solid/control/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -28,7 +28,7 @@
+
+ kde4_add_library(solidcontrol SHARED ${solidcontrol_LIB_SRCS})
+
+-target_link_libraries(solidcontrol ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} solidcontrolifaces )
++target_link_libraries(solidcontrol ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} solidcontrolifaces ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
+
+ set_target_properties(solidcontrol PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ install(TARGETS solidcontrol ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- kdebase-workspace.orig/libs/solid/control/backends/fakenet/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/libs/solid/control/backends/fakenet/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -17,7 +17,7 @@
+ kde4_add_plugin(solid_fakenet module.cpp ${solid_fakenet_PART_SRCS})
+
+
+-target_link_libraries(solid_fakenet solidcontrolifaces ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} )
++target_link_libraries(solid_fakenet solidcontrolifaces ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTNETWORK_LIBRARY} )
+
+ install(TARGETS solid_fakenet DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/libs/taskmanager/CMakeLists.txt 2008-04-26 16:44:17.000000000 +0300
++++ kdebase-workspace/libs/taskmanager/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -7,7 +7,7 @@
+
+ kde4_add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
+
+-target_link_libraries(taskmanager ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} )
++target_link_libraries(taskmanager ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KDEUI_LIBS} ${X11_X11_LIB} )
+ if (X11_Xfixes_FOUND)
+ target_link_libraries(taskmanager ${X11_Xfixes_LIB})
+ endif (X11_Xfixes_FOUND)
+--- kdebase-workspace.orig/solid/bluez/CMakeLists.txt 2008-04-26 16:44:16.000000000 +0300
++++ kdebase-workspace/solid/bluez/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -18,7 +18,7 @@
+
+ kde4_add_plugin(solid_bluez module.cpp ${solid_bluez_PART_SRCS})
+
+-target_link_libraries(solid_bluez ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} solidcontrolifaces)
++target_link_libraries(solid_bluez ${KDE4_KDECORE_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} solidcontrolifaces)
+ install(TARGETS solid_bluez DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install(FILES solid_bluez.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends )
+--- kdebase-workspace.orig/solid/hal/CMakeLists.txt 2008-04-26 16:44:16.000000000 +0300
++++ kdebase-workspace/solid/hal/CMakeLists.txt 2008-04-26 16:45:20.000000000 +0300
+@@ -13,7 +13,7 @@
+
+ kde4_add_plugin(solid_hal_power module_power.cpp ${solid_hal_power_PART_SRCS})
+
+-target_link_libraries(solid_hal_power ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} solidcontrolifaces)
++target_link_libraries(solid_hal_power ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTDBUS_LIBRARY} solidcontrolifaces)
+
+
+
+--- kdebase-workspace.orig/kwin/kcmkwin/kwindecoration/CMakeLists.txt 2008-04-26 16:49:30.000000000 +0300
++++ kdebase-workspace/kwin/kcmkwin/kwindecoration/CMakeLists.txt 2008-04-26 16:49:30.000000000 +0300
+@@ -2,7 +2,7 @@
+
+ set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp )
+ kde4_add_plugin(kcm_kwindecoration ${kcm_kwindecoration_PART_SRCS})
+-target_link_libraries(kcm_kwindecoration ${KDE4_KDE3SUPPORT_LIBS} kdecorations ${X11_LIBRARIES})
++target_link_libraries(kcm_kwindecoration ${KDE4_KDE3SUPPORT_LIBS} kdecorations ${X11_LIBRARIES} ${QT_QTDBUS_LIBRARY})
+ install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+ ########### install files ###############
+--- kdebase-workspace.orig/kwin/kcmkwin/kwinrules/CMakeLists.txt 2008-04-26 16:50:25.000000000 +0300
++++ kdebase-workspace/kwin/kcmkwin/kwinrules/CMakeLists.txt 2008-04-26 16:59:43.000000000 +0300
+@@ -10,7 +10,7 @@
+
+ kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+
+ install(TARGETS kdeinit_kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kwin_rules_dialog ${INSTALL_TARGETS_DEFAULT_ARGS} )
+@@ -22,7 +22,7 @@
+
+ kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
+
+-target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} )
++target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+
+ install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/kwin/clients/b2/CMakeLists.txt 2008-04-26 17:11:38.000000000 +0300
++++ kdebase-workspace/kwin/clients/b2/CMakeLists.txt 2008-04-26 17:11:43.000000000 +0300
+@@ -9,7 +9,7 @@
+
+ kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS})
+
+-target_link_libraries(kwin3_b2 kdecorations)
++target_link_libraries(kwin3_b2 kdecorations ${X11_X11_LIB})
+
+ install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR})
+
+--- kdebase-workspace.orig/kwin/kcmkwin/kwincompositing/CMakeLists.txt 2008-04-26 17:00:36.000000000 +0300
++++ kdebase-workspace/kwin/kcmkwin/kwincompositing/CMakeLists.txt 2008-04-26 17:08:15.000000000 +0300
+@@ -11,7 +11,7 @@
+ )
+ kde4_add_ui_files(kcm_kwincompositing_PART_SRCS advanced.ui main.ui)
+ kde4_add_plugin(kcm_kwincompositing ${kcm_kwincompositing_PART_SRCS})
+-target_link_libraries(kcm_kwincompositing ${KDE4_KUTILS_LIBS})
++target_link_libraries(kcm_kwincompositing ${KDE4_KUTILS_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
+ install(TARGETS kcm_kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+ # CompositingPrefs uses OpenGL
+@@ -38,6 +38,9 @@
+ if (X11_Xfixes_FOUND)
+ target_link_libraries(kcm_kwincompositing ${X11_Xfixes_LIB})
+ endif (X11_Xfixes_FOUND)
++if (X11_Xext_FOUND)
++ target_link_libraries(kcm_kwincompositing ${X11_Xext_LIB})
++endif (X11_Xext_FOUND)
+
+
+ ########### install files ###############
+--- kdebase-workspace.orig/kwin/kcmkwin/kwindesktop/CMakeLists.txt 2008-04-26 17:09:49.000000000 +0300
++++ kdebase-workspace/kwin/kcmkwin/kwindesktop/CMakeLists.txt 2008-04-26 17:10:07.000000000 +0300
+@@ -5,7 +5,7 @@
+
+ kde4_add_plugin(kcm_kwindesktop ${kcm_kwindesktop_PART_SRCS})
+
+-target_link_libraries(kcm_kwindesktop ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} )
++target_link_libraries(kcm_kwindesktop ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS} ${X11_X11_LIB})
+
+ install(TARGETS kcm_kwindesktop DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/plasma/applets/devicenotifier/CMakeLists.txt 2008-04-26 17:20:03.000000000 +0300
++++ kdebase-workspace/plasma/applets/devicenotifier/CMakeLists.txt 2008-04-26 17:20:03.000000000 +0300
+@@ -6,7 +6,7 @@
+
+ kde4_add_ui_files(devicenotifier_SRCS deviceNotifierConfig.ui )
+ kde4_add_plugin(plasma_applet_devicenotifier ${devicenotifier_SRCS})
+-target_link_libraries(plasma_applet_devicenotifier plasma ${KDE4_KIO_LIBS})
++target_link_libraries(plasma_applet_devicenotifier plasma ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS plasma_applet_devicenotifier DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-applet-devicenotifier.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+--- kdebase-workspace.orig/plasma/applets/systemtray/CMakeLists.txt 2008-04-26 17:19:11.000000000 +0300
++++ kdebase-workspace/plasma/applets/systemtray/CMakeLists.txt 2008-04-26 17:19:23.000000000 +0300
+@@ -6,7 +6,7 @@
+ systemtraywidget.cpp)
+
+ kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS})
+-target_link_libraries(plasma_applet_systemtray ${KDE4_KDEUI_LIBS} plasma)
++target_link_libraries(plasma_applet_systemtray ${KDE4_KDEUI_LIBS} plasma ${X11_X11_LIB})
+
+ install(TARGETS plasma_applet_systemtray DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-applet-systemtray.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+--- kdebase-workspace.orig/plasma/dataengines/dict/CMakeLists.txt 2008-04-26 17:21:54.000000000 +0300
++++ kdebase-workspace/plasma/dataengines/dict/CMakeLists.txt 2008-04-26 17:21:54.000000000 +0300
+@@ -5,7 +5,7 @@
+ )
+
+ kde4_add_plugin(plasma_engine_dict ${dict_engine_SRCS})
+-target_link_libraries(plasma_engine_dict ${KDE4_KDECORE_LIBS} plasma)
++target_link_libraries(plasma_engine_dict ${KDE4_KDECORE_LIBS} plasma ${QT_QTNETWORK_LIBRARY})
+
+ install(TARGETS plasma_engine_dict DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-dict.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+--- kdebase-workspace.orig/kcontrol/keyboard/CMakeLists.txt 2008-04-26 18:15:37.000000000 +0300
++++ kdebase-workspace/kcontrol/keyboard/CMakeLists.txt 2008-04-26 18:20:13.000000000 +0300
+@@ -14,6 +14,7 @@
+
+
+ target_link_libraries(kcm_keyboard
++${X11_X11_LIB}
+ ${KDE4_KIO_LIBS}
+ )
+ if(X11_XTest_FOUND)
+--- kdebase-workspace.orig/kcontrol/kxkb/CMakeLists.txt 2008-04-26 17:36:10.000000000 +0300
++++ kdebase-workspace/kcontrol/kxkb/CMakeLists.txt 2008-04-26 17:36:47.000000000 +0300
+@@ -72,7 +72,7 @@
+
+ kde4_add_plugin(kcm_keyboard_layout ${kcm_keyboard_layout_PART_SRCS})
+
+-target_link_libraries(kcm_keyboard_layout ${KDE4_KIO_LIBS}
++target_link_libraries(kcm_keyboard_layout ${KDE4_KIO_LIBS} ${X11_X11_LIB}
+ ${XKB_SUPPORT_LIB}
+ )
+
+@@ -97,7 +97,7 @@
+
+ kde4_add_kdeinit_executable( kxkb ${kxkb_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kxkb ${X11_X11_LIB} ${X11_Xext_LIB} ${KDE4_KDEUI_LIBS}
++target_link_libraries(kdeinit_kxkb ${X11_X11_LIB} ${X11_Xext_LIB} ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY}
+ ${XKB_SUPPORT_LIB})
+
+ install(TARGETS kdeinit_kxkb ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- kdebase-workspace.orig/kcontrol/randr/CMakeLists.txt 2008-04-26 17:34:48.000000000 +0300
++++ kdebase-workspace/kcontrol/randr/CMakeLists.txt 2008-04-26 17:34:48.000000000 +0300
+@@ -33,7 +33,7 @@
+ kde4_add_plugin(kcm_randr ${kcm_randr_PART_SRCS})
+
+
+-target_link_libraries(kcm_randr ${KDE4_KDEUI_LIBS} ${X11_Xrandr_LIB} )
++target_link_libraries(kcm_randr ${KDE4_KDEUI_LIBS} ${X11_Xrandr_LIB} ${X11_X11_LIB} )
+
+ install(TARGETS kcm_randr DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/plasma/dataengines/mouse/CMakeLists.txt 2008-04-26 17:23:11.000000000 +0300
++++ kdebase-workspace/plasma/dataengines/mouse/CMakeLists.txt 2008-04-26 17:23:23.000000000 +0300
+@@ -9,7 +9,7 @@
+ endif (X11_Xfixes_FOUND)
+
+ kde4_add_plugin(plasma_engine_mouse ${mouse_engine_SRCS})
+-target_link_libraries(plasma_engine_mouse ${KDE4_KDEUI_LIBS} plasma)
++target_link_libraries(plasma_engine_mouse ${KDE4_KDEUI_LIBS} plasma ${X11_X11_LIB})
+ if (X11_Xfixes_FOUND)
+ target_link_libraries(plasma_engine_mouse ${X11_Xfixes_LIB})
+ endif (X11_Xfixes_FOUND)
+--- kdebase-workspace.orig/plasma/dataengines/soliddevice/CMakeLists.txt 2008-04-26 17:25:30.000000000 +0300
++++ kdebase-workspace/plasma/dataengines/soliddevice/CMakeLists.txt 2008-04-26 17:25:30.000000000 +0300
+@@ -8,7 +8,7 @@
+ )
+
+ kde4_add_plugin(plasma_engine_soliddevice ${soliddevice_engine_SRCS})
+-target_link_libraries(plasma_engine_soliddevice ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} plasma)
++target_link_libraries(plasma_engine_soliddevice ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} plasma ${QT_QTNETWORK_LIBRARY})
+
+ install(TARGETS plasma_engine_soliddevice DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-soliddevice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+--- kdebase-workspace.orig/plasma/plasma/CMakeLists.txt 2008-04-26 17:27:05.000000000 +0300
++++ kdebase-workspace/plasma/plasma/CMakeLists.txt 2008-04-26 17:29:17.000000000 +0300
+@@ -18,7 +18,11 @@
+
+ kde4_add_kdeinit_executable(plasma-qgv ${plasma_SRCS})
+
+-target_link_libraries(kdeinit_plasma-qgv plasma kworkspace ${KDE4_KIO_LIBS})
++if (X11_Xrender_FOUND)
++ target_link_libraries(kdeinit_plasma-qgv ${X11_Xrender_LIB})
++endif(X11_Xrender_FOUND)
++
++target_link_libraries(kdeinit_plasma-qgv plasma kworkspace ${KDE4_KIO_LIBS} )
+ set_target_properties(kdeinit_plasma-qgv PROPERTIES OUTPUT_NAME kdeinit4_plasma)
+ set_target_properties(plasma-qgv PROPERTIES OUTPUT_NAME plasma)
+
+--- kdebase-workspace.orig/plasma/runners/bookmarks/CMakeLists.txt 2008-04-26 17:29:02.000000000 +0300
++++ kdebase-workspace/plasma/runners/bookmarks/CMakeLists.txt 2008-04-26 17:29:02.000000000 +0300
+@@ -6,7 +6,7 @@
+ )
+
+ kde4_add_plugin(krunner_bookmarksrunner ${krunner_bookmarksrunner_SRCS})
+-target_link_libraries(krunner_bookmarksrunner ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} plasma)
++target_link_libraries(krunner_bookmarksrunner ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} plasma ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS krunner_bookmarksrunner DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/plasma/runners/webshortcuts/CMakeLists.txt 2008-04-26 17:29:52.000000000 +0300
++++ kdebase-workspace/plasma/runners/webshortcuts/CMakeLists.txt 2008-04-26 17:29:52.000000000 +0300
+@@ -3,7 +3,7 @@
+ )
+
+ kde4_add_plugin(krunner_webshortcuts ${krunner_webshortcuts_SRCS})
+-target_link_libraries(krunner_webshortcuts ${KDE4_KIO_LIBS} plasma)
++target_link_libraries(krunner_webshortcuts ${KDE4_KIO_LIBS} plasma ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS krunner_webshortcuts DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/plasma/runners/xesam/CMakeLists.txt 2008-04-26 17:30:20.000000000 +0300
++++ kdebase-workspace/plasma/runners/xesam/CMakeLists.txt 2008-04-26 17:30:20.000000000 +0300
+@@ -3,7 +3,7 @@
+ )
+
+ kde4_add_plugin(krunner_xesam ${krunner_xesam_SRCS})
+-target_link_libraries(krunner_xesam plasma)
++target_link_libraries(krunner_xesam plasma ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS krunner_xesam DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/kcontrol/access/CMakeLists.txt 2008-04-26 19:21:55.000000000 +0300
++++ kdebase-workspace/kcontrol/access/CMakeLists.txt 2008-04-26 19:26:34.000000000 +0300
+@@ -9,7 +9,7 @@
+ kde4_add_plugin(kcm_access ${kcm_access_PART_SRCS})
+
+
+-target_link_libraries(kcm_access ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
++target_link_libraries(kcm_access ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${X11_X11_LIB})
+
+ install(TARGETS kcm_access DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+@@ -21,7 +21,7 @@
+
+ kde4_add_kdeinit_executable( kaccess ${kaccess_KDEINIT_SRCS})
+
+-target_link_libraries(kdeinit_kaccess ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS})
++target_link_libraries(kdeinit_kaccess ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} )
+
+ install(TARGETS kdeinit_kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ install(TARGETS kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- kdebase-workspace.orig/kcontrol/colors/CMakeLists.txt 2008-04-26 18:35:11.000000000 +0300
++++ kdebase-workspace/kcontrol/colors/CMakeLists.txt 2008-04-26 18:35:11.000000000 +0300
+@@ -5,7 +5,7 @@
+ kde4_add_ui_files(kcm_colors_PART_SRCS colorsettings.ui preview.ui)
+
+ kde4_add_plugin(kcm_colors ${kcm_colors_PART_SRCS})
+-target_link_libraries(kcm_colors ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KDEUI_LIBS})
++target_link_libraries(kcm_colors ${KDE4_KFILE_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
+
+ install(TARGETS kcm_colors DESTINATION ${PLUGIN_INSTALL_DIR})
+ install( FILES colors.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+--- kdebase-workspace.orig/kcontrol/energy/CMakeLists.txt 2008-04-26 18:36:05.000000000 +0300
++++ kdebase-workspace/kcontrol/energy/CMakeLists.txt 2008-04-26 19:13:28.000000000 +0300
+@@ -13,7 +13,7 @@
+ kde4_add_plugin(kcm_energy ${kcm_energy_PART_SRCS})
+
+
+-target_link_libraries(kcm_energy ${KDE4_KIO_LIBS} )
++target_link_libraries(kcm_energy ${KDE4_KIO_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} ${X11_Xext_LIB} )
+
+ install(TARGETS kcm_energy DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/kcontrol/fonts/CMakeLists.txt 2008-04-26 19:16:56.000000000 +0300
++++ kdebase-workspace/kcontrol/fonts/CMakeLists.txt 2008-04-26 19:16:56.000000000 +0300
+@@ -11,7 +11,7 @@
+ kde4_add_plugin(kcm_fonts ${kcm_fonts_PART_SRCS})
+
+
+-target_link_libraries(kcm_fonts ${KDE4_KDEUI_LIBS} ${FONTCONFIG_LIBRARIES} ${FREETYPE_LIBRARIES})
++target_link_libraries(kcm_fonts ${KDE4_KDEUI_LIBS} ${FONTCONFIG_LIBRARIES} ${FREETYPE_LIBRARIES} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${X11_X11_LIB})
+
+ install(TARGETS kcm_fonts DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/kcontrol/input/CMakeLists.txt 2008-04-26 18:31:13.000000000 +0300
++++ kdebase-workspace/kcontrol/input/CMakeLists.txt 2008-04-26 18:31:46.000000000 +0300
+@@ -42,6 +42,7 @@
+ kde4_add_executable(kapplymousetheme ${kapplymousetheme_SRCS})
+
+ target_link_libraries(kapplymousetheme
++${X11_X11_LIB}
+ ${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB})
+ if (X11_Xcursor_FOUND)
+ target_link_libraries(kapplymousetheme ${X11_Xcursor_LIB})
+@@ -60,7 +61,7 @@
+ kde4_add_plugin(kcm_input ${kcm_input_PART_SRCS})
+
+
+-target_link_libraries(kcm_input ${KDE4_KDE3SUPPORT_LIBS})
++target_link_libraries(kcm_input ${KDE4_KDE3SUPPORT_LIBS} ${X11_X11_LIB})
+ if (LIBUSB_FOUND)
+ target_link_libraries(kcm_input ${LIBUSB_LIBRARIES})
+ endif (LIBUSB_FOUND)
+--- kdebase-workspace.orig/kcontrol/kdm/CMakeLists.txt 2008-04-26 18:33:14.000000000 +0300
++++ kdebase-workspace/kcontrol/kdm/CMakeLists.txt 2008-04-26 18:33:14.000000000 +0300
+@@ -29,7 +29,7 @@
+ kde4_add_plugin(kcm_kdm ${kcm_kdm_PART_SRCS})
+
+
+-target_link_libraries(kcm_kdm ${KDE4_KDE3SUPPORT_LIBS} ${BLITZ_LIBRARIES} ${KDE4_KNEWSTUFF2_LIBS})
++target_link_libraries(kcm_kdm ${KDE4_KDE3SUPPORT_LIBS} ${BLITZ_LIBRARIES} ${KDE4_KNEWSTUFF2_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_X11_LIB})
+
+ install(TARGETS kcm_kdm DESTINATION ${PLUGIN_INSTALL_DIR})
+
+--- kdebase-workspace.orig/kcontrol/keys/CMakeLists.txt 2008-04-26 19:20:45.000000000 +0300
++++ kdebase-workspace/kcontrol/keys/CMakeLists.txt 2008-04-26 19:20:45.000000000 +0300
+@@ -13,7 +13,7 @@
+ kde4_add_plugin(kcm_keys ${kcm_keys_PART_SRCS})
+
+
+-target_link_libraries(kcm_keys ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB})
++target_link_libraries(kcm_keys ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB} ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS kcm_keys DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/kcontrol/launch/CMakeLists.txt 2008-04-26 18:34:02.000000000 +0300
++++ kdebase-workspace/kcontrol/launch/CMakeLists.txt 2008-04-26 18:34:02.000000000 +0300
+@@ -13,7 +13,7 @@
+ kde4_add_plugin(kcm_launch ${kcm_launch_PART_SRCS})
+
+
+-target_link_libraries(kcm_launch ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
++target_link_libraries(kcm_launch ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
+
+ install(TARGETS kcm_launch DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+--- kdebase-workspace.orig/kcontrol/screensaver/CMakeLists.txt 2008-04-26 19:19:48.000000000 +0300
++++ kdebase-workspace/kcontrol/screensaver/CMakeLists.txt 2008-04-26 19:19:48.000000000 +0300
+@@ -26,7 +26,7 @@
+ kde4_add_plugin(kcm_screensaver ${kcm_screensaver_PART_SRCS})
+
+
+-target_link_libraries(kcm_screensaver ${KDE4_KDE3SUPPORT_LIBS})
++target_link_libraries(kcm_screensaver ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
+
+ if(HAVE_GLXCHOOSEVISUAL)
+ target_link_libraries(kcm_screensaver ${OPENGL_gl_LIBRARY})
+--- kdebase-workspace.orig/kcontrol/style/CMakeLists.txt 2008-04-26 19:18:38.000000000 +0300
++++ kdebase-workspace/kcontrol/style/CMakeLists.txt 2008-04-26 19:18:38.000000000 +0300
+@@ -12,7 +12,7 @@
+
+ kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
+
+-target_link_libraries(kcm_style ${KDE4_KDEUI_LIBS} ${BLITZ_LIBRARIES})
++target_link_libraries(kcm_style ${KDE4_KDEUI_LIBS} ${BLITZ_LIBRARIES} ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB})
+
+ install(TARGETS kcm_style DESTINATION ${PLUGIN_INSTALL_DIR})
+
Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series 2008-04-27 12:57:47 UTC (rev 10301)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series 2008-04-27 15:10:41 UTC (rev 10302)
@@ -7,3 +7,4 @@
12_be_better_at_honouring_user_kdm_theming.diff
13_kdm_override_docs.diff
14_correct_kde4home_for_kstartupconfig4.diff
+97_fix_target_link_libraries.diff
Modified: branches/kde4/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/rules 2008-04-27 12:57:47 UTC (rev 10301)
+++ branches/kde4/packages/kdebase-workspace/debian/rules 2008-04-27 15:10:41 UTC (rev 10302)
@@ -2,6 +2,9 @@
include debian/cdbs/kde.mk
+DEB_CMAKE_EXTRA_FLAGS += \
+ -DINSTALL_PRINTER_APPLET=TRUE
+
DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm
DEB_DH_MAKESHLIBS_ARGS_libplasma1 := -V'libplasma1 (>= 4:4.0.68+svn794641-1)'
More information about the pkg-kde-commits
mailing list