From c31681bf73cbc02d3f6207adf6ca6e80a832cde0 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 14:38:37 +0100 Subject: New dependency for kwin: libepoxy. --- kde/post-install/plasma-workspace.post-install | 27 ++++++++++++-------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'kde/post-install/plasma-workspace.post-install') diff --git a/kde/post-install/plasma-workspace.post-install b/kde/post-install/plasma-workspace.post-install index 6adbcb6..bb5ddec 100644 --- a/kde/post-install/plasma-workspace.post-install +++ b/kde/post-install/plasma-workspace.post-install @@ -7,35 +7,32 @@ cat $CWD/post-install/plasma-workspace/xinit/xinitrc.plasma \ > $PKG/etc/X11/xinit/xinitrc.plasma chmod 0755 $PKG/etc/X11/xinit/xinitrc.plasma -# Fix a path in the startkde script: -sed -e 's,/opt/kf5/lib64/libexec/kf5/start_kdeinit_wrapper,/usr/lib64/libexec/kf5/start_kdeinit_wrapper,' -i $PKG/opt/kf5/bin/startkde +## 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@,/opt/kf5,g" \ + | 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@,/opt/kf5,g" \ + | sed -e "s,@PREFIX@,/usr,g" \ > $PKG/usr/share/xsessions/kde5-plasma-safe.desktop -mkdir -p $PKG/opt/kf5/bin +mkdir -p $PKG/usr/bin cat $CWD/post-install/plasma-workspace/xsession/kde5init \ - | sed -e "s,@PREFIX@,/opt/kf5,g" \ + | sed -e "s,@PREFIX@,/usr,g" \ -e "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \ - > $PKG/opt/kf5/bin/kde5init -chmod 755 $PKG/opt/kf5/bin/kde5init + > $PKG/usr/bin/kde5init +chmod 755 $PKG/usr/bin/kde5init # What is "plugins/plugins"? -mv $PKG/opt/kf5/lib64/qt5/plugins/{plugins,}/phonon_platform -rmdir $PKG/opt/kf5/lib64/qt5/plugins/plugins +mv $PKG/usr/lib64/qt5/plugins/{plugins,}/phonon_platform +rmdir $PKG/usr/lib64/qt5/plugins/plugins # Move the polkit dbus configuration files to the proper place: mkdir -p $PKG/etc -mv $PKG/opt/kf5//etc/dbus-1 $PKG/etc/ - -# Create a utility symlink - required on x86 but not on x86_64 ??? -ln -s /usr/lib${LIBDIRSUFFIX}/libexec/kf5 $PKG/opt/kf5/lib${LIBDIRSUFFIX}/libexec/ +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/opt/kf5/lib$LIBDIRSUFFIX/libexec/kcheckpass +chmod +s $PKG/usr/lib$LIBDIRSUFFIX/libexec/kcheckpass -- cgit v1.2.3