summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-21 11:53:23 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-21 11:53:23 +0100
commite1989598d4f3a2f5e37508a4c67331a21d39d4ed (patch)
treeeade0244b64fecaadfdabcea1ddc1ac56de6db34
parent3691a1632674addd595ceafe0eb51fbb67c8921e (diff)
downloadktown-e1989598d4f3a2f5e37508a4c67331a21d39d4ed.tar.gz
ktown-e1989598d4f3a2f5e37508a4c67331a21d39d4ed.tar.xz
KDE Plasma: simplified cmake/ files for some modules.
Several custom cmake/* files could be symlinked to cmake/plasma.
-rw-r--r--README13
-rw-r--r--kde/cmake/baloo53
l---------[-rw-r--r--]kde/cmake/kde-cli-tools23
l---------[-rw-r--r--]kde/cmake/khelpcenter23
l---------[-rw-r--r--]kde/cmake/kio-extras23
l---------[-rw-r--r--]kde/cmake/ksysguard23
l---------[-rw-r--r--]kde/cmake/kwin23
l---------[-rw-r--r--]kde/cmake/oxygen20
l---------[-rw-r--r--]kde/cmake/systemsettings23
9 files changed, 14 insertions, 160 deletions
diff --git a/README b/README
index 8ba2750..017b338 100644
--- a/README
+++ b/README
@@ -35,12 +35,13 @@ ld frameworks plasma plasma-extra polkit-kde applications"
BUILD LOG FOR PLASMA:
-Need to recompile everything making sure that Qt4 is not picked up by accident,
-or else set "export QT_QPA_PLATFORM_PLUGIN_PATH=path/to/qt/plugins" to get rid
-of the start-time error:
-Failed to load platform plugin "xcb". Available platforms are:
-linuxfb minimal offscreen xcb
-Aborted
+TODO: Need to recompile everything making sure that Qt4 is not picked up by accident, or else set "export QT_QPA_PLATFORM_PLUGIN_PATH=path/to/qt/plugins" to get rid of the start-time error:
+ Failed to load platform plugin "xcb". Available platforms are:
+ linuxfb minimal offscreen xcb
+ Aborted
+TODO: change "qtpaths" to "qtpaths-qt5" in /usr/bin/startkde
+TODO: change "qdbus" to "qdbus-qt5" in /usr/bin/startkde
+TODO: rename /usr/bin/startkde to /usr/bin/startkde5 because it clashes with the script from kde-workspace. Also update the plasma*desktop scripts to call startkde5 instead of startkde. Remove kde5-plasma*.desktop because plasma-workspace now includes its own plasma.desktop
BUILD LOG FOR PLASMA-EXTRA:
diff --git a/kde/cmake/baloo5 b/kde/cmake/baloo5
index d296468..04a85a1 100644
--- a/kde/cmake/baloo5
+++ b/kde/cmake/baloo5
@@ -1,6 +1,3 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
# Change "-DKDEPIM_SUPPORT_BUILD=FALSE" to "-DKDEPIM_SUPPORT_BUILD=TRUE"
# if we have a kdepimlibs-framework package.
diff --git a/kde/cmake/kde-cli-tools b/kde/cmake/kde-cli-tools
index df39b44..eff359e 100644..120000
--- a/kde/cmake/kde-cli-tools
+++ b/kde/cmake/kde-cli-tools
@@ -1,22 +1 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file
diff --git a/kde/cmake/khelpcenter b/kde/cmake/khelpcenter
index df39b44..eff359e 100644..120000
--- a/kde/cmake/khelpcenter
+++ b/kde/cmake/khelpcenter
@@ -1,22 +1 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file
diff --git a/kde/cmake/kio-extras b/kde/cmake/kio-extras
index df39b44..eff359e 100644..120000
--- a/kde/cmake/kio-extras
+++ b/kde/cmake/kio-extras
@@ -1,22 +1 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file
diff --git a/kde/cmake/ksysguard b/kde/cmake/ksysguard
index df39b44..eff359e 100644..120000
--- a/kde/cmake/ksysguard
+++ b/kde/cmake/ksysguard
@@ -1,22 +1 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file
diff --git a/kde/cmake/kwin b/kde/cmake/kwin
index df39b44..eff359e 100644..120000
--- a/kde/cmake/kwin
+++ b/kde/cmake/kwin
@@ -1,22 +1 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file
diff --git a/kde/cmake/oxygen b/kde/cmake/oxygen
index 4757357..eff359e 100644..120000
--- a/kde/cmake/oxygen
+++ b/kde/cmake/oxygen
@@ -1,19 +1 @@
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file
diff --git a/kde/cmake/systemsettings b/kde/cmake/systemsettings
index df39b44..eff359e 100644..120000
--- a/kde/cmake/systemsettings
+++ b/kde/cmake/systemsettings
@@ -1,22 +1 @@
-# Makes the build fail:
-#export XDG_DATA_DIRS="/opt/kf5/share:$XDG_DATA_DIRS"
-
-mkdir build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DBUILD_TESTING=OFF \
- ..
-
+plasma \ No newline at end of file