From e71879ef4de231c224f959c00f2fc2d3e6f11d6e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 20 Apr 2017 21:32:33 +0200
Subject: Process the changes in the new Applications 17.04

---
 kde/cmake/k3b              |  1 +
 kde/cmake/kajongg          | 14 +++++++-------
 kde/cmake/kcachegrind      |  1 +
 kde/cmake/kdav             |  1 +
 kde/cmake/kde-dev-utils    |  1 +
 kde/cmake/kdesdk-kioslaves |  1 +
 kde/cmake/khelpcenter      |  2 +-
 kde/cmake/libkgapi         |  1 +
 8 files changed, 14 insertions(+), 8 deletions(-)
 create mode 120000 kde/cmake/kcachegrind
 create mode 120000 kde/cmake/kdav
 create mode 120000 kde/cmake/kde-dev-utils
 create mode 120000 kde/cmake/kdesdk-kioslaves
 create mode 120000 kde/cmake/libkgapi

(limited to 'kde/cmake')

diff --git a/kde/cmake/k3b b/kde/cmake/k3b
index 00abdd5..01164dd 100644
--- a/kde/cmake/k3b
+++ b/kde/cmake/k3b
@@ -17,5 +17,6 @@ cd build
     -DBUILD_TESTING:BOOL=OFF \
     -DK3B_ENABLE_HAL_SUPPORT:BOOL=OFF \
     -DK3B_ENABLE_PERMISSION_HELPER:BOOL=ON \
+    -DKDE_INSTALL_LIBEXECDIR=/usr/libexec \
     ..
 
diff --git a/kde/cmake/kajongg b/kde/cmake/kajongg
index 83b8c47..32a909b 100644
--- a/kde/cmake/kajongg
+++ b/kde/cmake/kajongg
@@ -1,10 +1,3 @@
-# Temporary kludge to allow badly ported app to compile:
-if ! grep -q 'cmake_minimum_required' CMakeLists.txt ; then
-  # Prepend a cmake_minimum_required stanza at the top, which enables
-  # newer cmake features which the build needs:
-  sed -i -e '1icmake_minimum_required(VERSION 2.8.9)\' CMakeLists.txt
-fi
-
 mkdir build
 cd build
   cmake \
@@ -19,6 +12,13 @@ cd build
     -DMAN_INSTALL_DIR=/usr/man \
     -DSYSCONF_INSTALL_DIR=/etc/kde \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
+    -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
+    -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+    -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF \
+    -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
     -DINSTALL_KAJONGG=TRUE \
     ..
 
diff --git a/kde/cmake/kcachegrind b/kde/cmake/kcachegrind
new file mode 120000
index 0000000..ab12832
--- /dev/null
+++ b/kde/cmake/kcachegrind
@@ -0,0 +1 @@
+applications5
\ No newline at end of file
diff --git a/kde/cmake/kdav b/kde/cmake/kdav
new file mode 120000
index 0000000..ab12832
--- /dev/null
+++ b/kde/cmake/kdav
@@ -0,0 +1 @@
+applications5
\ No newline at end of file
diff --git a/kde/cmake/kde-dev-utils b/kde/cmake/kde-dev-utils
new file mode 120000
index 0000000..ab12832
--- /dev/null
+++ b/kde/cmake/kde-dev-utils
@@ -0,0 +1 @@
+applications5
\ No newline at end of file
diff --git a/kde/cmake/kdesdk-kioslaves b/kde/cmake/kdesdk-kioslaves
new file mode 120000
index 0000000..ab12832
--- /dev/null
+++ b/kde/cmake/kdesdk-kioslaves
@@ -0,0 +1 @@
+applications5
\ No newline at end of file
diff --git a/kde/cmake/khelpcenter b/kde/cmake/khelpcenter
index eff359e..ab12832 120000
--- a/kde/cmake/khelpcenter
+++ b/kde/cmake/khelpcenter
@@ -1 +1 @@
-plasma
\ No newline at end of file
+applications5
\ No newline at end of file
diff --git a/kde/cmake/libkgapi b/kde/cmake/libkgapi
new file mode 120000
index 0000000..ab12832
--- /dev/null
+++ b/kde/cmake/libkgapi
@@ -0,0 +1 @@
+applications5
\ No newline at end of file
-- 
cgit v1.2.3