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. --- kde/modules/applications | 2 +- kde/post-install/plasma-workspace.post-install | 29 +++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'kde') 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