From e1989598d4f3a2f5e37508a4c67331a21d39d4ed Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 21 Jan 2015 11:53:23 +0100 Subject: KDE Plasma: simplified cmake/ files for some modules. Several custom cmake/* files could be symlinked to cmake/plasma. --- README | 13 +++++++------ kde/cmake/baloo5 | 3 --- kde/cmake/kde-cli-tools | 23 +---------------------- kde/cmake/khelpcenter | 23 +---------------------- kde/cmake/kio-extras | 23 +---------------------- kde/cmake/ksysguard | 23 +---------------------- kde/cmake/kwin | 23 +---------------------- kde/cmake/oxygen | 20 +------------------- kde/cmake/systemsettings | 23 +---------------------- 9 files changed, 14 insertions(+), 160 deletions(-) mode change 100644 => 120000 kde/cmake/kde-cli-tools mode change 100644 => 120000 kde/cmake/khelpcenter mode change 100644 => 120000 kde/cmake/kio-extras mode change 100644 => 120000 kde/cmake/ksysguard mode change 100644 => 120000 kde/cmake/kwin mode change 100644 => 120000 kde/cmake/oxygen mode change 100644 => 120000 kde/cmake/systemsettings 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 deleted file mode 100644 index df39b44..0000000 --- a/kde/cmake/kde-cli-tools +++ /dev/null @@ -1,22 +0,0 @@ -# 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 \ - .. - diff --git a/kde/cmake/kde-cli-tools b/kde/cmake/kde-cli-tools new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kde-cli-tools @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/khelpcenter b/kde/cmake/khelpcenter deleted file mode 100644 index df39b44..0000000 --- a/kde/cmake/khelpcenter +++ /dev/null @@ -1,22 +0,0 @@ -# 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 \ - .. - diff --git a/kde/cmake/khelpcenter b/kde/cmake/khelpcenter new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/khelpcenter @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/kio-extras b/kde/cmake/kio-extras deleted file mode 100644 index df39b44..0000000 --- a/kde/cmake/kio-extras +++ /dev/null @@ -1,22 +0,0 @@ -# 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 \ - .. - diff --git a/kde/cmake/kio-extras b/kde/cmake/kio-extras new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kio-extras @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/ksysguard b/kde/cmake/ksysguard deleted file mode 100644 index df39b44..0000000 --- a/kde/cmake/ksysguard +++ /dev/null @@ -1,22 +0,0 @@ -# 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 \ - .. - diff --git a/kde/cmake/ksysguard b/kde/cmake/ksysguard new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/ksysguard @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/kwin b/kde/cmake/kwin deleted file mode 100644 index df39b44..0000000 --- a/kde/cmake/kwin +++ /dev/null @@ -1,22 +0,0 @@ -# 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 \ - .. - diff --git a/kde/cmake/kwin b/kde/cmake/kwin new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kwin @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/oxygen b/kde/cmake/oxygen deleted file mode 100644 index 4757357..0000000 --- a/kde/cmake/oxygen +++ /dev/null @@ -1,19 +0,0 @@ -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 \ - .. - diff --git a/kde/cmake/oxygen b/kde/cmake/oxygen new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/oxygen @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/systemsettings b/kde/cmake/systemsettings deleted file mode 100644 index df39b44..0000000 --- a/kde/cmake/systemsettings +++ /dev/null @@ -1,22 +0,0 @@ -# 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 \ - .. - diff --git a/kde/cmake/systemsettings b/kde/cmake/systemsettings new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/systemsettings @@ -0,0 +1 @@ +plasma \ No newline at end of file -- cgit v1.2.3