rev 10335 - in branches/kde4/packages/kdebase-workspace/debian: . patches
Armin Berres
trigger-guest at alioth.debian.org
Mon Apr 28 17:42:09 UTC 2008
Author: trigger-guest
Date: 2008-04-28 17:42:09 +0000 (Mon, 28 Apr 2008)
New Revision: 10335
Modified:
branches/kde4/packages/kdebase-workspace/debian/changelog
branches/kde4/packages/kdebase-workspace/debian/control
branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff
Log:
libsm-dev, libxft-dev, libxtst-dev to build depends and update patch 97 accordingly
Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog 2008-04-28 15:42:27 UTC (rev 10334)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog 2008-04-28 17:42:09 UTC (rev 10335)
@@ -10,6 +10,10 @@
* Add 97_fix_target_link_libraries.diff which fixes linkage problems with
recent kdelibs5.
+ +++ Changes by Armin Berres:
+
+ * Add libsm-dev, libxft-dev and libxtst-dev to build depends.
+
-- 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
Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control 2008-04-28 15:42:27 UTC (rev 10334)
+++ branches/kde4/packages/kdebase-workspace/debian/control 2008-04-28 17:42:09 UTC (rev 10335)
@@ -10,7 +10,8 @@
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, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev
+ libsmbclient-dev, libxcb1-dev, libxine-dev, libstreamanalyzer-dev, libfontconfig-dev, libglu1-mesa-dev,
+ libsm-dev, libxft-dev, libxtst-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
Modified: 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 2008-04-28 15:42:27 UTC (rev 10334)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/97_fix_target_link_libraries.diff 2008-04-28 17:42:09 UTC (rev 10335)
@@ -1,5 +1,5 @@
---- 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
+--- a/kcminit/CMakeLists.txt
++++ b/kcminit/CMakeLists.txt
@@ -5,7 +5,7 @@
kde4_add_kdeinit_executable( kcminit ${kcminit_KDEINIT_SRCS})
@@ -18,8 +18,8 @@
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
+--- a/klipper/CMakeLists.txt
++++ b/klipper/CMakeLists.txt
@@ -18,11 +18,15 @@
kde4_add_kdeinit_executable(klipper ${klipper_KDEINIT_SRCS})
@@ -37,8 +37,8 @@
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
+--- a/kmenuedit/CMakeLists.txt
++++ b/kmenuedit/CMakeLists.txt
@@ -12,8 +12,7 @@
kde4_add_kdeinit_executable( kmenuedit ${kmenuedit_KDEINIT_SRCS})
@@ -49,8 +49,8 @@
install(TARGETS kdeinit_kmenuedit DESTINATION ${LIB_INSTALL_DIR} )
---- 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
+--- a/ksysguard/gui/CMakeLists.txt
++++ b/ksysguard/gui/CMakeLists.txt
@@ -55,7 +55,7 @@
kde4_add_kdeinit_executable(ksysguard ${ksysguard_KDEINIT_SRCS})
@@ -60,8 +60,8 @@
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
+--- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt
++++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
@@ -2,7 +2,7 @@
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
@@ -71,8 +71,8 @@
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
+--- a/kwin/lib/CMakeLists.txt
++++ b/kwin/lib/CMakeLists.txt
@@ -36,7 +36,7 @@
)
@@ -82,8 +82,8 @@
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
+--- a/libs/kworkspace/CMakeLists.txt
++++ b/libs/kworkspace/CMakeLists.txt
@@ -17,7 +17,7 @@
kde4_add_library(kworkspace SHARED ${kworkspace_LIB_SRCS})
@@ -93,8 +93,8 @@
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
+--- a/libs/plasma/CMakeLists.txt
++++ b/libs/plasma/CMakeLists.txt
@@ -80,7 +80,7 @@
target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
@@ -104,8 +104,8 @@
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
+--- a/libs/solid/control/CMakeLists.txt
++++ b/libs/solid/control/CMakeLists.txt
@@ -28,7 +28,7 @@
kde4_add_library(solidcontrol SHARED ${solidcontrol_LIB_SRCS})
@@ -115,8 +115,8 @@
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
+--- a/libs/solid/control/backends/fakenet/CMakeLists.txt
++++ b/libs/solid/control/backends/fakenet/CMakeLists.txt
@@ -17,7 +17,7 @@
kde4_add_plugin(solid_fakenet module.cpp ${solid_fakenet_PART_SRCS})
@@ -126,8 +126,8 @@
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
+--- a/libs/taskmanager/CMakeLists.txt
++++ b/libs/taskmanager/CMakeLists.txt
@@ -7,7 +7,7 @@
kde4_add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
@@ -137,8 +137,8 @@
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
+--- a/solid/bluez/CMakeLists.txt
++++ b/solid/bluez/CMakeLists.txt
@@ -18,7 +18,7 @@
kde4_add_plugin(solid_bluez module.cpp ${solid_bluez_PART_SRCS})
@@ -148,8 +148,8 @@
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
+--- a/solid/hal/CMakeLists.txt
++++ b/solid/hal/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_plugin(solid_hal_power module_power.cpp ${solid_hal_power_PART_SRCS})
@@ -159,8 +159,8 @@
---- 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
+--- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt
++++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
@@ -2,7 +2,7 @@
set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp )
@@ -170,8 +170,8 @@
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
+--- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
++++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt
@@ -10,7 +10,7 @@
kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
@@ -190,8 +190,8 @@
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
+--- a/kwin/clients/b2/CMakeLists.txt
++++ b/kwin/clients/b2/CMakeLists.txt
@@ -9,7 +9,7 @@
kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS})
@@ -201,8 +201,8 @@
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
+--- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt
++++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
@@ -11,7 +11,7 @@
)
kde4_add_ui_files(kcm_kwincompositing_PART_SRCS advanced.ui main.ui)
@@ -222,8 +222,8 @@
########### 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
+--- a/kwin/kcmkwin/kwindesktop/CMakeLists.txt
++++ b/kwin/kcmkwin/kwindesktop/CMakeLists.txt
@@ -5,7 +5,7 @@
kde4_add_plugin(kcm_kwindesktop ${kcm_kwindesktop_PART_SRCS})
@@ -233,8 +233,8 @@
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
+--- a/plasma/applets/devicenotifier/CMakeLists.txt
++++ b/plasma/applets/devicenotifier/CMakeLists.txt
@@ -6,7 +6,7 @@
kde4_add_ui_files(devicenotifier_SRCS deviceNotifierConfig.ui )
@@ -244,8 +244,8 @@
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
+--- a/plasma/applets/systemtray/CMakeLists.txt
++++ b/plasma/applets/systemtray/CMakeLists.txt
@@ -6,7 +6,7 @@
systemtraywidget.cpp)
@@ -255,8 +255,8 @@
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
+--- a/plasma/dataengines/dict/CMakeLists.txt
++++ b/plasma/dataengines/dict/CMakeLists.txt
@@ -5,7 +5,7 @@
)
@@ -266,8 +266,8 @@
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
+--- a/kcontrol/keyboard/CMakeLists.txt
++++ b/kcontrol/keyboard/CMakeLists.txt
@@ -14,6 +14,7 @@
@@ -276,8 +276,8 @@
${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
+--- a/kcontrol/kxkb/CMakeLists.txt
++++ b/kcontrol/kxkb/CMakeLists.txt
@@ -72,7 +72,7 @@
kde4_add_plugin(kcm_keyboard_layout ${kcm_keyboard_layout_PART_SRCS})
@@ -296,8 +296,8 @@
${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
+--- a/kcontrol/randr/CMakeLists.txt
++++ b/kcontrol/randr/CMakeLists.txt
@@ -33,7 +33,7 @@
kde4_add_plugin(kcm_randr ${kcm_randr_PART_SRCS})
@@ -307,8 +307,8 @@
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
+--- a/plasma/dataengines/mouse/CMakeLists.txt
++++ b/plasma/dataengines/mouse/CMakeLists.txt
@@ -9,7 +9,7 @@
endif (X11_Xfixes_FOUND)
@@ -318,8 +318,8 @@
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
+--- a/plasma/dataengines/soliddevice/CMakeLists.txt
++++ b/plasma/dataengines/soliddevice/CMakeLists.txt
@@ -8,7 +8,7 @@
)
@@ -329,8 +329,8 @@
install(TARGETS plasma_engine_soliddevice DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-dataengine-soliddevice.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
---- 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
+--- a/plasma/runners/bookmarks/CMakeLists.txt
++++ b/plasma/runners/bookmarks/CMakeLists.txt
@@ -6,7 +6,7 @@
)
@@ -340,8 +340,8 @@
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
+--- a/plasma/runners/webshortcuts/CMakeLists.txt
++++ b/plasma/runners/webshortcuts/CMakeLists.txt
@@ -3,7 +3,7 @@
)
@@ -351,8 +351,8 @@
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
+--- a/plasma/runners/xesam/CMakeLists.txt
++++ b/plasma/runners/xesam/CMakeLists.txt
@@ -3,7 +3,7 @@
)
@@ -362,8 +362,8 @@
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
+--- a/kcontrol/access/CMakeLists.txt
++++ b/kcontrol/access/CMakeLists.txt
@@ -9,7 +9,7 @@
kde4_add_plugin(kcm_access ${kcm_access_PART_SRCS})
@@ -382,8 +382,8 @@
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
+--- a/kcontrol/colors/CMakeLists.txt
++++ b/kcontrol/colors/CMakeLists.txt
@@ -5,7 +5,7 @@
kde4_add_ui_files(kcm_colors_PART_SRCS colorsettings.ui preview.ui)
@@ -393,8 +393,8 @@
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
+--- a/kcontrol/energy/CMakeLists.txt
++++ b/kcontrol/energy/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_plugin(kcm_energy ${kcm_energy_PART_SRCS})
@@ -404,8 +404,8 @@
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
+--- a/kcontrol/fonts/CMakeLists.txt
++++ b/kcontrol/fonts/CMakeLists.txt
@@ -11,7 +11,7 @@
kde4_add_plugin(kcm_fonts ${kcm_fonts_PART_SRCS})
@@ -415,8 +415,8 @@
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
+--- a/kcontrol/input/CMakeLists.txt
++++ b/kcontrol/input/CMakeLists.txt
@@ -42,6 +42,7 @@
kde4_add_executable(kapplymousetheme ${kapplymousetheme_SRCS})
@@ -434,8 +434,8 @@
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
+--- a/kcontrol/kdm/CMakeLists.txt
++++ b/kcontrol/kdm/CMakeLists.txt
@@ -29,7 +29,7 @@
kde4_add_plugin(kcm_kdm ${kcm_kdm_PART_SRCS})
@@ -445,8 +445,8 @@
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
+--- a/kcontrol/keys/CMakeLists.txt
++++ b/kcontrol/keys/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_plugin(kcm_keys ${kcm_keys_PART_SRCS})
@@ -456,8 +456,8 @@
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
+--- a/kcontrol/launch/CMakeLists.txt
++++ b/kcontrol/launch/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_plugin(kcm_launch ${kcm_launch_PART_SRCS})
@@ -467,8 +467,8 @@
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
+--- a/kcontrol/screensaver/CMakeLists.txt
++++ b/kcontrol/screensaver/CMakeLists.txt
@@ -26,7 +26,7 @@
kde4_add_plugin(kcm_screensaver ${kcm_screensaver_PART_SRCS})
@@ -478,8 +478,8 @@
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
+--- a/kcontrol/style/CMakeLists.txt
++++ b/kcontrol/style/CMakeLists.txt
@@ -12,7 +12,7 @@
kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
@@ -489,3 +489,52 @@
install(TARGETS kcm_style DESTINATION ${PLUGIN_INSTALL_DIR})
+--- a/khotkeys/libkhotkeysprivate/CMakeLists.txt
++++ b/khotkeys/libkhotkeysprivate/CMakeLists.txt
+@@ -83,6 +83,9 @@
+ )
+
+ kde4_add_library(khotkeysprivate SHARED ${khotkeysprivate_SRCS})
++IF (X11_XTest_FOUND)
++ target_link_libraries(khotkeysprivate ${X11_XTest_LIB})
++ENDIF (X11_XTest_FOUND)
+ target_link_libraries(khotkeysprivate kworkspace ${KDE4_KDE3SUPPORT_LIBS})
+ set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
+ install(TARGETS khotkeysprivate DESTINATION ${LIB_INSTALL_DIR})
+--- a/home/trigger/devel/debian/kde/pkg-kde/branches/kde4/kde4-svn/kdebase-workspace/kcontrol/kfontinst/lib/CMakeLists.txt
++++ /dev/null
+@@ -1,13 +0,0 @@
+-include_directories(${FREETYPE_INCLUDE_DIR})
+-
+-set(kfontinst_LIB_SRCS Misc.cpp DisabledFonts.cpp Fc.cpp)
+-set(kfontinstui_LIB_SRCS FcEngine.cpp )
+-
+-kde4_add_library(kfontinst SHARED ${kfontinst_LIB_SRCS})
+-target_link_libraries(kfontinst ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+-set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-
+-kde4_add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
+-target_link_libraries(kfontinstui ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_Xft_LIB} kfontinst )
+-set_target_properties(kfontinstui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+-install(TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS} )
+--- a/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
++++ b/kcontrol/kfontinst/kcmfontinst/CMakeLists.txt
+@@ -9,7 +9,7 @@
+
+ kde4_add_plugin(kcm_fontinst ${kcm_fontinst_PART_SRCS})
+
+-target_link_libraries(kcm_fontinst ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} kfontinstui kfontinst )
++target_link_libraries(kcm_fontinst ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} kfontinstui kfontinst ${QT_QTDBUS_LIBRARY} ${X11_X11_LIB} )
+
+ install(TARGETS kcm_fontinst DESTINATION ${PLUGIN_INSTALL_DIR} )
+ install( FILES fontinst.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+--- a/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
++++ b/kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt
+@@ -2,6 +2,6 @@
+ include_directories(${FREETYPE_INCLUDE_DIR})
+ include_directories(${STRIGI_INCLUDE_DIR})
+ kde4_add_library(font MODULE FontThroughAnalyzer.cpp FontEngine.cpp )
+-target_link_libraries(font ${STREAMANALYZER_LIBRARY} kfontinst )
++target_link_libraries(font ${STREAMANALYZER_LIBRARY} ${STRIGI_STREAMANALYZER_LIBRARY} kfontinst )
+ set_target_properties(font PROPERTIES PREFIX strigita_)
+ install(TARGETS font LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
More information about the pkg-kde-commits
mailing list