From f7b649b324482634c80355998d3011fa72272cec Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 21 Jan 2015 21:58:23 +0100 Subject: Plasma-workspace:rRemove custom kde5-plasma*.desktop files. Also we no longer compile kde-workspace since most of this package's files clash with plasma-workspace and we are targeting a KDE 5 workspace anyway, not a KDE 4 one. --- README | 25 +++++++++++++--------- kde/modules/applications | 2 +- kde/post-install/plasma-workspace.post-install | 29 +++++++++++++------------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/README b/README index 017b338..a52f9d4 100644 --- a/README +++ b/README @@ -6,6 +6,8 @@ Plasma 5.1.2 and Applications 14.12.1. Compared to Applications 14.12.0, the Applications 14.12.1 adds LTS releases of kdelibs, kdepimlibs, kdepim-runtime, kdepim and kde-workspace. +I am going to skip kde-workspace because its contents largely collide with +the plasma-workspace and we want to have a Plasma Workspace. 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. @@ -16,7 +18,7 @@ Preliminary build procedure (not verified 100% yet): - (crude) get rid of Slackware's KDE: # removepkg /var/log/packages/*-4.10.5-* - # removepkg libscreen + # removepkg libkscreen - 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. @@ -24,24 +26,27 @@ Preliminary build procedure (not verified 100% yet): there is a kdepimlibs-framework, and currently it causes kdepimlibs-4.14 to pick up Qt5 dependencies making its build fail - logoff/login to activate Qt5 profile script. -- 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" +- build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdepim extragear" - check that everything built correctly - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - check that everything built correctly -- build kdei +- (optionally) build kdei BUILD LOG FOR PLASMA: -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: +DONE: 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 + >> The fix was to rebuild the qt5 package, not all of the rest :-) +SKIP: change "qtpaths" to "qtpaths-qt5" in /usr/bin/startkde + (not needed for Slackware, because /etc/profile.d/qt5.sh expands $PATH) +SKIP: change "qdbus" to "qdbus-qt5" in /usr/bin/startkde + (not needed for Slackware, because /etc/profile.d/qt5.sh expands $PATH) +SKIP: 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. + (I removed kde-workspace instead, we do not need that anyway) +DONE: Remove kde5-plasma*.desktop because plasma-workspace now includes its own plasma.desktop BUILD LOG FOR PLASMA-EXTRA: @@ -63,5 +68,5 @@ DONE: kalgebra (needed a refreshed curses patch) SKIP: step (don't understand where the compilation error comes from) ============================================================================== - Eric Hameleers / alien at slackware dot com / 14-jan-2015 + Eric Hameleers / alien at slackware dot com / 21-jan-2015 diff --git a/kde/modules/applications b/kde/modules/applications index fd9695a..0fdeddb 100644 --- a/kde/modules/applications +++ b/kde/modules/applications @@ -2,7 +2,7 @@ # old kdebase: kde-baseapps kde-wallpapers -kde-workspace +#kde-workspace kde-runtime kde-base-artwork # Old kdesdk: diff --git a/kde/post-install/plasma-workspace.post-install b/kde/post-install/plasma-workspace.post-install index bb5ddec..c9fa086 100644 --- a/kde/post-install/plasma-workspace.post-install +++ b/kde/post-install/plasma-workspace.post-install @@ -10,20 +10,21 @@ chmod 0755 $PKG/etc/X11/xinit/xinitrc.plasma ## Fix a path in the startkde script: #sed -e 's,/opt/kd5/lib64/libexec/kf5/start_kdeinit_wrapper,/usr/lib64/libexec/kf5/start_kdeinit_wrapper,' -i $PKG/opt/kf5/bin/startkde -# Allow other login managers to show KDE Plasma2 desktop sessions: -mkdir -p $PKG/usr/share/xsessions -cat $CWD/post-install/plasma-workspace/xsession/kde5-plasma.desktop \ - | sed -e "s,@PREFIX@,/usr,g" \ - > $PKG/usr/share/xsessions/kde5-plasma.desktop -cat $CWD/post-install/plasma-workspace/xsession/kde5-plasma-safe.desktop \ - | sed -e "s,@PREFIX@,/usr,g" \ - > $PKG/usr/share/xsessions/kde5-plasma-safe.desktop -mkdir -p $PKG/usr/bin -cat $CWD/post-install/plasma-workspace/xsession/kde5init \ - | sed -e "s,@PREFIX@,/usr,g" \ - -e "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \ - > $PKG/usr/bin/kde5init -chmod 755 $PKG/usr/bin/kde5init +# No longer needed, plasma-workspace includes its own file now: +## Allow other login managers to show KDE Plasma2 desktop sessions: +#mkdir -p $PKG/usr/share/xsessions +#cat $CWD/post-install/plasma-workspace/xsession/kde5-plasma.desktop \ +# | sed -e "s,@PREFIX@,/usr,g" \ +# > $PKG/usr/share/xsessions/kde5-plasma.desktop +#cat $CWD/post-install/plasma-workspace/xsession/kde5-plasma-safe.desktop \ +# | sed -e "s,@PREFIX@,/usr,g" \ +# > $PKG/usr/share/xsessions/kde5-plasma-safe.desktop +#mkdir -p $PKG/usr/bin +#cat $CWD/post-install/plasma-workspace/xsession/kde5init \ +# | sed -e "s,@PREFIX@,/usr,g" \ +# -e "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \ +# > $PKG/usr/bin/kde5init +#chmod 755 $PKG/usr/bin/kde5init # What is "plugins/plugins"? mv $PKG/usr/lib64/qt5/plugins/{plugins,}/phonon_platform -- cgit v1.2.3