From a610fa5881ebcaed0595b3263792948ac4bb0f9e Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 20 Jun 2023 04:59:24 +0300
Subject: [PATCH] generic: build fixes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kfirewall/kcm/kfirewallhelper.cpp |  1 -
 khash/CMakeLists.txt              |  8 ++++----
 kman/CMakeLists.txt               | 25 +++++++++++++++++++------
 kprintjobs/CMakeLists.txt         |  6 +++---
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/kfirewall/kcm/kfirewallhelper.cpp b/kfirewall/kcm/kfirewallhelper.cpp
index e0649fc7..e0319702 100644
--- a/kfirewall/kcm/kfirewallhelper.cpp
+++ b/kfirewall/kcm/kfirewallhelper.cpp
@@ -133,7 +133,6 @@ KFirewallHelper::KFirewallHelper(const char* const helper, QObject *parent)
 {
 }
 
-
 int KFirewallHelper::apply(const QVariantMap &parameters)
 {
     if (parameters.isEmpty()) {
diff --git a/khash/CMakeLists.txt b/khash/CMakeLists.txt
index 1b894e28..67560435 100644
--- a/khash/CMakeLists.txt
+++ b/khash/CMakeLists.txt
@@ -3,8 +3,8 @@ project(khash)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -16,8 +16,8 @@ set(khash_SRCS
 add_executable(khash ${khash_SRCS})
 
 target_link_libraries(khash
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KFILE_LIBS}
+    KDE4::kdeui
+    KDE4::kfile
     ${QT_QTNETWORK_LIBRARY}
 )
 
diff --git a/kman/CMakeLists.txt b/kman/CMakeLists.txt
index 974c9db5..d74b0559 100644
--- a/kman/CMakeLists.txt
+++ b/kman/CMakeLists.txt
@@ -1,8 +1,8 @@
 project(kman)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    find_package(KDE4 4.19.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.19.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -13,8 +13,21 @@ set(kman_sources
 )
 
 add_executable(kman ${kman_sources})
-target_link_libraries(kman ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KARCHIVE_LIBS})
+target_link_libraries(kman
+    KDE4::kdeui
+    KDE4::kfile
+    KDE4::karchive
+)
 
-install(TARGETS kman DESTINATION ${KDE4_BIN_INSTALL_DIR})
-install(FILES kmanui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman)
-install(PROGRAMS kman.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR})
+install(
+    TARGETS kman
+    DESTINATION ${KDE4_BIN_INSTALL_DIR}
+)
+install(
+    FILES kmanui.rc
+    DESTINATION ${KDE4_DATA_INSTALL_DIR}/kman
+)
+install(
+    PROGRAMS kman.desktop
+    DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
+)
diff --git a/kprintjobs/CMakeLists.txt b/kprintjobs/CMakeLists.txt
index 8d6a3c06..1a41dbef 100644
--- a/kprintjobs/CMakeLists.txt
+++ b/kprintjobs/CMakeLists.txt
@@ -3,8 +3,8 @@ project(kprintjobs)
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     include(FeatureSummary)
 
-    find_package(KDE4 4.23.0 REQUIRED)
-    include(KDE4Defaults)
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
     include_directories(${KDE4_INCLUDES})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
@@ -21,7 +21,7 @@ qt4_generate_dbus_interface(kded_kprintjobs.h org.kde.kprintjobs.xml)
 
 kde4_add_plugin(kded_kprintjobs ${kded_kprintjobs_SRCS})
 target_link_libraries(kded_kprintjobs PRIVATE
-    ${KDE4_KDECORE_LIBS}
+    KDE4::kdecore
     ${QT_QTDBUS_LIBRARY}
     cups
 )