From 5ca6654eb86cac9e597d82e1bebb78d9e6563597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 20 Aug 2013 08:47:47 +0200
Subject: [PATCH] Fix linking

KDEUI is dead which caused collateral damage.
---
 CMakeLists.txt                                     | 12 +++++++++++-
 clients/aurorae/src/CMakeLists.txt                 |  3 ++-
 clients/aurorae/themes/plastik/code/CMakeLists.txt |  2 +-
 effects/CMakeLists.txt                             |  3 ++-
 libkdecorations/CMakeLists.txt                     |  1 -
 scripting/CMakeLists.txt                           |  2 ++
 tests/CMakeLists.txt                               |  1 +
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11daea2bb1..85bd41505f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,20 +225,30 @@ set(kwin_OWN_LIBS
 set(kwin_QT_LIBS
     ${Qt5Quick_LIBRARIES}
     ${Qt5X11Extras_LIBRARIES}
+    Qt5::DBus
 )
 
 set(kwin_KDE_LIBS
     ${KDE4Support_LIBRARIES}
-    ${KDE4_KDEUI_LIBRARY}
     ${KDECLARATIVE_LIBRARIES}
+    KF5::KConfigCore
+    KF5::KCoreAddons
     KF5::KCrash
+    KF5::KI18n
+    KF5::KIconThemes
+    KF5::KNotifications
+    KF5::KService
     KF5::plasma
     KF5::KWindowSystem
+    KF5::XmlGui
 )
 
 set(kwin_XLIB_LIBS
     ${X11_X11_LIB}
     ${X11_Xcursor_LIB}
+    ${X11_Xext_LIB} # XShapeSelectInput
+    ${X11_ICE_LIB}
+    ${X11_SM_LIB}
 )
 
 set(kwin_XCB_LIBS
diff --git a/clients/aurorae/src/CMakeLists.txt b/clients/aurorae/src/CMakeLists.txt
index f0dacf2644..1f817f5e4b 100644
--- a/clients/aurorae/src/CMakeLists.txt
+++ b/clients/aurorae/src/CMakeLists.txt
@@ -32,9 +32,10 @@ set(decoration_plugin_SRCS
 
 add_library(decorationplugin SHARED ${decoration_plugin_SRCS})
 target_link_libraries(decorationplugin
-    ${KDE4_KDEUI_LIBRARY} # KGlobalSettings
+    ${KDE4Support_LIBRARIES} # KGlobalSettings
     ${Qt5Declarative_LIBRARIES}
     kdecorations
+    KF5::KConfigWidgets
 )
 install(TARGETS decorationplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kwin/decoration)
 
diff --git a/clients/aurorae/themes/plastik/code/CMakeLists.txt b/clients/aurorae/themes/plastik/code/CMakeLists.txt
index 4f928a4383..03053464d5 100644
--- a/clients/aurorae/themes/plastik/code/CMakeLists.txt
+++ b/clients/aurorae/themes/plastik/code/CMakeLists.txt
@@ -6,6 +6,6 @@ set(plastik_plugin_SRCS
 qt4_automoc(${plastik_plugin_SRCS})
 
 add_library(plastikplugin SHARED ${plastik_plugin_SRCS})
-target_link_libraries(plastikplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBRARY} kdecorations)
+target_link_libraries(plastikplugin ${QT_QTCORE_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} KF5::KConfigWidgets kdecorations)
 install(TARGETS plastikplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
 install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 89e8f8977f..67217677c4 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -4,11 +4,11 @@ set(kwin_effect_OWN_LIBS
 
 set(kwin_effect_KDE_LIBS
     ${KDE4Support_LIBRARIES}
-    ${KDE4_KDEUI_LIBRARY} # KGlobalSettings::dndEventDelay() in PW and DG
     ${KDE4_KDECORE_LIBS} # kdebug
     KF5::KWindowSystem
     KF5::plasma # screenedge effect
     KF5::KDE4Attic # windowgeometry effect using KLocale
+    KF5::KIconThemes
 )
 
 set(kwin_effect_QT_LIBS
@@ -94,6 +94,7 @@ macro( KWIN4_ADD_EFFECT_CONFIG name )
         KF5::KCoreAddons
         KF5::KConfigWidgets
         KF5::KI18n
+        KF5::XmlGui
         )
     install( TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )
 endmacro()
diff --git a/libkdecorations/CMakeLists.txt b/libkdecorations/CMakeLists.txt
index dfbb263843..ab80b911fa 100644
--- a/libkdecorations/CMakeLists.txt
+++ b/libkdecorations/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(kdecorations
     ${Qt5Widgets_LIBRARIES}
     ${Qt5X11Extras_LIBRARIES}
     ${KDE4Support_LIBRARIES} # kdebug
-    ${KDE4_KDEUI_LIBRARY} # KGlobalSettings::windowTitleFont
     KF5::KConfigCore
     KF5::KI18n
     KF5::KService # KLibrary
diff --git a/scripting/CMakeLists.txt b/scripting/CMakeLists.txt
index 6330f38ff5..afc82483eb 100644
--- a/scripting/CMakeLists.txt
+++ b/scripting/CMakeLists.txt
@@ -2,7 +2,9 @@ set(kcm_kwin4_genericscripted_SRCS genericscriptedconfig.cpp)
 kde4_add_plugin( kcm_kwin4_genericscripted ${kcm_kwin4_genericscripted_SRCS} )
 target_link_libraries( kcm_kwin4_genericscripted
     KF5::KConfigWidgets #KCModule
+    KF5::KI18n
     KF5::KService
     KF5::plasma
+    Qt5::DBus
     ${Qt5UiTools_LIBRARIES} )
 install( TARGETS kcm_kwin4_genericscripted DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 16a8c88e26..86615d3eb4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries( testVirtualDesktops
                        ${Qt5Widgets_LIBRARIES}
                        KF5::KI18n
                        KF5::XmlGui
+                       KF5::KWindowSystem
 )
 
 ########################################################