From f4f83660bd73e9c9ccf87c0eed420d855ef537c9 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 26 Jan 2015 21:57:57 +0100 Subject: Final KDE.SlackBuild harness, ready for the upcoming release of Plasma 5.2.0. All bugs have bee ironed out I hope... Final changes: eigen2: updated to latest version so 'step' can compile. kde-workspace: required to build this, or else kdeartwork won't compile. Frameworks as well as Plasma use /usr/lib{,64} as the libexec directory (not sure if this is the best solution but it solves a lot of path issues). Applications: modified the build order so that KF5 applications are built first (before kde-workspace overwrites part of plasma-workspace). My final package set will not have kde-workspace but if you compile this yourself, your last step needs to be: # removepkg kde-workspace # upgradepkg --reinstall /path/to/plasma-workspace --- kde/cmake/baloo5 | 1 + kde/cmake/frameworks | 1 + kde/cmake/kwayland | 1 + kde/cmake/plasma | 1 + kde/cmake/polkit-kde-framework | 1 + kde/cmake/sddm-kcm | 1 + kde/doinst.sh/sddm-qt5 | 1 + kde/modularize | 1 + kde/modules/applications | 32 +++++++++++++------------- kde/modules/plasma-extra | 2 ++ kde/pkgsrc/polkit-kde-kcmodules-framework | 2 ++ kde/post-install/plasma-workspace.post-install | 2 +- 12 files changed, 29 insertions(+), 17 deletions(-) create mode 120000 kde/cmake/kwayland create mode 120000 kde/cmake/polkit-kde-framework create mode 120000 kde/cmake/sddm-kcm create mode 100644 kde/pkgsrc/polkit-kde-kcmodules-framework (limited to 'kde') diff --git a/kde/cmake/baloo5 b/kde/cmake/baloo5 index 04a85a1..77ae5f5 100644 --- a/kde/cmake/baloo5 +++ b/kde/cmake/baloo5 @@ -15,6 +15,7 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \ -DBUILD_TESTING=OFF \ diff --git a/kde/cmake/frameworks b/kde/cmake/frameworks index fd9ec67..c05a2c3 100644 --- a/kde/cmake/frameworks +++ b/kde/cmake/frameworks @@ -13,6 +13,7 @@ cd build -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ + -DLIBEXEC_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 \ diff --git a/kde/cmake/kwayland b/kde/cmake/kwayland new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/kwayland @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/plasma b/kde/cmake/plasma index de786f3..38ab64d 100644 --- a/kde/cmake/plasma +++ b/kde/cmake/plasma @@ -13,6 +13,7 @@ cd build -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \ -DLIB_SUFFIX=${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 \ diff --git a/kde/cmake/polkit-kde-framework b/kde/cmake/polkit-kde-framework new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/polkit-kde-framework @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/cmake/sddm-kcm b/kde/cmake/sddm-kcm new file mode 120000 index 0000000..eff359e --- /dev/null +++ b/kde/cmake/sddm-kcm @@ -0,0 +1 @@ +plasma \ No newline at end of file diff --git a/kde/doinst.sh/sddm-qt5 b/kde/doinst.sh/sddm-qt5 index 8fdf0ce..88ab236 100644 --- a/kde/doinst.sh/sddm-qt5 +++ b/kde/doinst.sh/sddm-qt5 @@ -45,6 +45,7 @@ Then, run an "upgradepkg --reinstall" of this sddm-qt5 package so that it can ru EOT else chroot . passwd -l sddm > /dev/null + chroot . gpasswd -a sddm video > /dev/null fi fi diff --git a/kde/modularize b/kde/modularize index a1d90d9..cf8933f 100644 --- a/kde/modularize +++ b/kde/modularize @@ -135,6 +135,7 @@ ksshaskpass sddm-qt5 sddm-theme-breeze kdeconnect-framework +polkit-kde-kcmodules-framework # applications # old kdebase: diff --git a/kde/modules/applications b/kde/modules/applications index 0fdeddb..6cf4e6d 100644 --- a/kde/modules/applications +++ b/kde/modules/applications @@ -1,8 +1,23 @@ # https://community.kde.org/Applications/14.12_Release_Notes +# +# Ported to KF5: +libkeduvocdocument +kate +konsole +analitza +gwenview +kalgebra +kanagram +khangman +kig +parley +kapptemplate +okteta +# # old kdebase: kde-baseapps kde-wallpapers -#kde-workspace +kde-workspace kde-runtime kde-base-artwork # Old kdesdk: @@ -154,18 +169,3 @@ step # kdewebdev: kdewebdev -# -# Ported to KF5: -libkeduvocdocument -kate -konsole -analitza -gwenview -kalgebra -kanagram -khangman -kig -parley -kapptemplate -okteta - diff --git a/kde/modules/plasma-extra b/kde/modules/plasma-extra index 53fa9c0..06274c7 100644 --- a/kde/modules/plasma-extra +++ b/kde/modules/plasma-extra @@ -1,4 +1,6 @@ sddm-qt5 sddm-theme-breeze kdeconnect-framework +polkit-kde-kcmodules-framework + diff --git a/kde/pkgsrc/polkit-kde-kcmodules-framework b/kde/pkgsrc/polkit-kde-kcmodules-framework new file mode 100644 index 0000000..eeede40 --- /dev/null +++ b/kde/pkgsrc/polkit-kde-kcmodules-framework @@ -0,0 +1,2 @@ +plasma-extra/polkit-kde-kcmodules-1 + diff --git a/kde/post-install/plasma-workspace.post-install b/kde/post-install/plasma-workspace.post-install index c9fa086..17384b4 100644 --- a/kde/post-install/plasma-workspace.post-install +++ b/kde/post-install/plasma-workspace.post-install @@ -35,5 +35,5 @@ mkdir -p $PKG/etc mv $PKG//etc/kde/dbus-1 $PKG/etc/ # For shadow, this file needs to be setuid root just like the KDE4 version: -chmod +s $PKG/usr/lib$LIBDIRSUFFIX/libexec/kcheckpass +chmod +s $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass -- cgit v1.2.3