generic: adjust to konq library changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index 31be89c..0ad7ad6 100644 (file)
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -17,10 +17,11 @@ set_package_properties(LibArchive PROPERTIES
     PURPOSE "Required for among others tar, tar.gz, tar.bz2 formats in Ark"
 )
 
-kde4_optional_find_package(LibKonq)
-set_package_properties(LibKonq PROPERTIES
-    DESCRIPTION "libkonq library"
-    PURPOSE "Need to integrate in konqueror"
+kde4_optional_find_package(KDE4Workspace)
+set_package_properties(KDE4Workspace PROPERTIES
+    DESCRIPTION "KDE base workspace libraries"
+    URL "https://osdn.net/projects/kde/"
+    PURPOSE "Needed for popup menu plugin"
 )
 
 kde4_optional_find_package(LibDeflate)

diff --git a/ark/app/CMakeLists.txt b/ark/app/CMakeLists.txt
index 7ebd6e5..b1cdeb1 100644 (file)
--- a/ark/app/CMakeLists.txt
+++ b/ark/app/CMakeLists.txt
@@ -48,9 +48,7 @@ install(
 
 ########### konqueror ark_extract_here plugin ###############
 
-if (LibKonq_FOUND)
-    include_directories(${LIBKONQ_INCLUDE_DIR})
-
+if (KDE4WORKSPACE_FOUND)
     set(ark_dndextract_SRCS batchextract.cpp extractHereDndPlugin.cpp)
     kde4_add_plugin(ark_dndextract ${ark_dndextract_SRCS})
 
@@ -59,7 +57,7 @@ if (LibKonq_FOUND)
         ${KDE4_KDECORE_LIBS}
         ${KDE4_KPARTS_LIBS}
         ${KDE4_KFILE_LIBS}
-        ${LIBKONQ_LIBRARY}
+        ${KDE4WORKSPACE_KONQ_LIBRARY}
     )
 
     install(

diff --git a/gwenview/CMakeLists.txt b/gwenview/CMakeLists.txt
index 5f60019..0250d94 100644 (file)
--- a/gwenview/CMakeLists.txt
+++ b/gwenview/CMakeLists.txt
@@ -20,8 +20,9 @@ set_package_properties(Threads PROPERTIES
     TYPE REQUIRED
 )
 
-find_package(LibKonq)
-set_package_properties(LibKonq PROPERTIES
+find_package(KDE4Workspace)
+set_package_properties(KDE4Workspace PROPERTIES
+    DESCRIPTION "KDE base workspace libraries"
     URL "https://osdn.net/projects/kde/"
     PURPOSE "Standard file management features"
     TYPE REQUIRED

diff --git a/gwenview/app/CMakeLists.txt b/gwenview/app/CMakeLists.txt
index 87e6618..3dee21c 100644 (file)
--- a/gwenview/app/CMakeLists.txt
+++ b/gwenview/app/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
-    ${LIBKONQ_INCLUDE_DIR}
     # For lib/gwenviewconfig.h
     ${CMAKE_CURRENT_BINARY_DIR}/..
 )
@@ -41,7 +40,7 @@ add_executable(gwenview ${gwenview_SRCS})
 target_link_libraries(gwenview
     ${KDE4_KFILE_LIBS}
     ${KDE4_KIO_LIBS}
-    ${LIBKONQ_LIBRARY}
+    ${KDE4WORKSPACE_KONQ_LIBRARY}
     ${QT_QTCORE_LIBRARY}
     gwenviewlib
 )