From da1be5a21ba06235b67a999f696ec66e35dc17a1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 00:06:49 +0100 Subject: Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0. KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015 --- kde/cmake/baloo5 | 4 ++-- kde/cmake/kde-cli-tools | 4 ++-- kde/cmake/kdeconnect-framework | 1 + kde/cmake/kdeplasma-addons | 1 + kde/cmake/khelpcenter | 4 ++-- kde/cmake/kio-extras | 4 ++-- kde/cmake/ksysguard | 4 ++-- kde/cmake/kwin | 4 ++-- kde/cmake/networkmanager-qt | 21 +++++++++++++++++++++ kde/cmake/oxygen | 4 ++-- kde/cmake/oxygen-fonts | 0 kde/cmake/plasma | 5 +++-- kde/cmake/plasma-workspace-wallpapers | 1 + kde/cmake/plasma5-nm | 1 + kde/cmake/systemsettings | 4 ++-- 15 files changed, 44 insertions(+), 18 deletions(-) create mode 120000 kde/cmake/kdeconnect-framework create mode 120000 kde/cmake/kdeplasma-addons create mode 100644 kde/cmake/networkmanager-qt delete mode 100644 kde/cmake/oxygen-fonts create mode 120000 kde/cmake/plasma-workspace-wallpapers create mode 120000 kde/cmake/plasma5-nm (limited to 'kde/cmake') diff --git a/kde/cmake/baloo5 b/kde/cmake/baloo5 index 33f041f..d296468 100644 --- a/kde/cmake/baloo5 +++ b/kde/cmake/baloo5 @@ -14,8 +14,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/kde-cli-tools b/kde/cmake/kde-cli-tools index bc6a9b7..df39b44 100644 --- a/kde/cmake/kde-cli-tools +++ b/kde/cmake/kde-cli-tools @@ -11,8 +11,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/kdeconnect-framework b/kde/cmake/kdeconnect-framework new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kdeconnect-framework @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/kdeplasma-addons b/kde/cmake/kdeplasma-addons new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kdeplasma-addons @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/khelpcenter b/kde/cmake/khelpcenter index bc6a9b7..df39b44 100644 --- a/kde/cmake/khelpcenter +++ b/kde/cmake/khelpcenter @@ -11,8 +11,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/kio-extras b/kde/cmake/kio-extras index bc6a9b7..df39b44 100644 --- a/kde/cmake/kio-extras +++ b/kde/cmake/kio-extras @@ -11,8 +11,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/ksysguard b/kde/cmake/ksysguard index bc6a9b7..df39b44 100644 --- a/kde/cmake/ksysguard +++ b/kde/cmake/ksysguard @@ -11,8 +11,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/kwin b/kde/cmake/kwin index bc6a9b7..df39b44 100644 --- a/kde/cmake/kwin +++ b/kde/cmake/kwin @@ -11,8 +11,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/networkmanager-qt b/kde/cmake/networkmanager-qt new file mode 100644 index 0000000..fd9ec67 --- /dev/null +++ b/kde/cmake/networkmanager-qt @@ -0,0 +1,21 @@ +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 \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ + -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ + -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ + -Dlconvert_executable=/usr/lib$LIBDIRSUFFIX/qt5/bin/lconvert \ + .. + diff --git a/kde/cmake/oxygen b/kde/cmake/oxygen index aa828a2..4757357 100644 --- a/kde/cmake/oxygen +++ b/kde/cmake/oxygen @@ -8,8 +8,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ diff --git a/kde/cmake/oxygen-fonts b/kde/cmake/oxygen-fonts deleted file mode 100644 index e69de29..0000000 diff --git a/kde/cmake/plasma b/kde/cmake/plasma index 1dfcf63..72fc444 100644 --- a/kde/cmake/plasma +++ b/kde/cmake/plasma @@ -11,8 +11,9 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ diff --git a/kde/cmake/plasma-workspace-wallpapers b/kde/cmake/plasma-workspace-wallpapers new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/plasma-workspace-wallpapers @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/plasma5-nm b/kde/cmake/plasma5-nm new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/plasma5-nm @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/systemsettings b/kde/cmake/systemsettings index bc6a9b7..df39b44 100644 --- a/kde/cmake/systemsettings +++ b/kde/cmake/systemsettings @@ -11,8 +11,8 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/kf5 \ - -DMAN_INSTALL_DIR=man \ + -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 \ -- cgit v1.2.3