From d594a1771148862d9baedd18f56e8611b519355f Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 16 Feb 2015 21:19:53 +0100 Subject: kde-workspace: stripped so that it can co-exist with plasma-workspace Plasma 5 still needs this package, for kget and because kdeartwork fails to compile if kde-workspace is absent. The stripped package contains the bare minimum and none of its files are found in plasma-desktop. --- kde/KDE.SlackBuild | 18 ++++++-- kde/build/kde-workspace | 1 - kde/build/kdelibs | 1 - kde/build/kdepim | 1 - kde/build/kdepim-runtime | 1 - kde/build/kdepimlibs | 1 - kde/cmake/applications | 10 ++-- kde/cmake/cmake | 2 + kde/cmake/gwenview | 2 +- kde/cmake/kalgebra | 2 +- kde/cmake/kanagram | 2 +- kde/cmake/kapptemplate | 2 +- kde/cmake/kate | 2 +- kde/cmake/kde-workspace | 54 ++++++++++++++++++++++ kde/cmake/kdeartwork | 1 + kde/cmake/khangman | 2 +- kde/cmake/kig | 2 +- kde/cmake/konsole | 2 +- kde/cmake/libkeduvocdocument | 2 +- kde/cmake/okteta | 2 +- kde/cmake/parley | 2 +- kde/doinst.sh/kde-workspace | 16 ------- kde/modularize | 20 +++++++- kde/modules/applications | 10 ++-- kde/modules/extragear | 17 +++++++ kde/modules/frameworks | 2 +- kde/modules/kdebase | 3 +- kde/modules/plasma-extra | 1 - kde/patch/kde-workspace.patch | 3 ++ .../kde-workspace/kde-workspace.no.plasma4.diff | 41 ++++++++++++++++ kde/post-install/kde-workspace.post-install | 54 ++++++---------------- kde/post-install/kde-workspace/config/Xsession | 2 +- kde/post-install/kde-workspace/xinit/xinitrc.kde | 4 +- 33 files changed, 191 insertions(+), 94 deletions(-) delete mode 100644 kde/build/kde-workspace delete mode 100644 kde/build/kdelibs delete mode 100644 kde/build/kdepim delete mode 100644 kde/build/kdepim-runtime delete mode 100644 kde/build/kdepimlibs create mode 100644 kde/cmake/kde-workspace create mode 100644 kde/patch/kde-workspace/kde-workspace.no.plasma4.diff diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild index 80439ea..d374f98 100755 --- a/kde/KDE.SlackBuild +++ b/kde/KDE.SlackBuild @@ -189,14 +189,14 @@ precheck() { # First find out if the pkg source is different from the actual pkg name: if [ -f $CWD/pkgsrc/$MODULE ]; then MODBASE=$(basename $(cat $CWD/pkgsrc/$MODULE)) - MODLOC=$(dirname $(cat $CWD/pkgsrc/$MODULE)) + MODLOC=$(dirname $(cat $CWD/pkgsrc/$MODULE))/ else MODBASE=$MODULE MODLOC="" fi MODSRC="$(find $CWD/src/$MODLOC -name $MODBASE-*.tar.* |grep -E "$MODBASE-[^-]+.tar.*$|$MODBASE-[0-9].+.tar.*$")" if [ -z "$MODSRC" ] ; then - echo "Module '$MODULE' does not have a matching source tarball ($MODLOC/$MODBASE)!" + echo "Module '$MODULE' does not have a matching source tarball ($MODLOC$MODBASE)!" if [ "$CHECKOUT" = "yes" -o "$CHECKOUT" = "YES" ]; then echo "Checking out KDE component at branch '$VERSION'." git archive --format=tar --prefix ${MODBASE}-${VERSION}/ --remote ${KDEGITURI}/${MODBASE}.git v${VERSION} | xz -c > $CWD/src/${MODLOC}/${MODBASE}-${VERSION}.tar.xz @@ -321,8 +321,16 @@ build_mod_pkg () { . $CWD/cmake/cmake fi - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 + # Run make, using custom make script if needed: + if [ -r $CWD/make/${PKGNAME} ]; then + . $CWD/make/${PKGNAME} + elif [ -r $CWD/make/${kde_module} ]; then + . $CWD/make/${kde_module} + else + # This is the default make && make install routine: + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + fi fi # Back to source toplevel builddir, since cmake may have run in a subdir: @@ -543,11 +551,11 @@ KDEMODS=" \ kdebase \ kdebindings kdepim \ - extragear \ frameworks \ plasma \ plasma-extra \ applications \ + extragear \ " # Allow for specification of individual packages to be built: diff --git a/kde/build/kde-workspace b/kde/build/kde-workspace deleted file mode 100644 index 0cfbf08..0000000 --- a/kde/build/kde-workspace +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/kde/build/kdelibs b/kde/build/kdelibs deleted file mode 100644 index 0cfbf08..0000000 --- a/kde/build/kdelibs +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/kde/build/kdepim b/kde/build/kdepim deleted file mode 100644 index 0cfbf08..0000000 --- a/kde/build/kdepim +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/kde/build/kdepim-runtime b/kde/build/kdepim-runtime deleted file mode 100644 index 0cfbf08..0000000 --- a/kde/build/kdepim-runtime +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/kde/build/kdepimlibs b/kde/build/kdepimlibs deleted file mode 100644 index 0cfbf08..0000000 --- a/kde/build/kdepimlibs +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/kde/cmake/applications b/kde/cmake/applications index e239d7e..7f99619 100644 --- a/kde/cmake/applications +++ b/kde/cmake/applications @@ -11,13 +11,9 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -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 \ - -DBUILD_TESTING=OFF \ - -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \ + -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ + -DKDE4_BUILD_TESTS=OFF \ .. diff --git a/kde/cmake/cmake b/kde/cmake/cmake index 263c12c..3a86efe 100644 --- a/kde/cmake/cmake +++ b/kde/cmake/cmake @@ -11,6 +11,8 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc/kde \ + -DLIB_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. diff --git a/kde/cmake/gwenview b/kde/cmake/gwenview index b379e29..ab12832 120000 --- a/kde/cmake/gwenview +++ b/kde/cmake/gwenview @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/kalgebra b/kde/cmake/kalgebra index b379e29..ab12832 120000 --- a/kde/cmake/kalgebra +++ b/kde/cmake/kalgebra @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/kanagram b/kde/cmake/kanagram index b379e29..ab12832 120000 --- a/kde/cmake/kanagram +++ b/kde/cmake/kanagram @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/kapptemplate b/kde/cmake/kapptemplate index b379e29..ab12832 120000 --- a/kde/cmake/kapptemplate +++ b/kde/cmake/kapptemplate @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/kate b/kde/cmake/kate index b379e29..ab12832 120000 --- a/kde/cmake/kate +++ b/kde/cmake/kate @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/kde-workspace b/kde/cmake/kde-workspace new file mode 100644 index 0000000..0cf312c --- /dev/null +++ b/kde/cmake/kde-workspace @@ -0,0 +1,54 @@ +mkdir build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DKDE4_BUILD_TESTS=OFF \ + -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_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ + -DLIBEXEC_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_appmenu:BOOL=OFF \ + -DBUILD_cursors:BOOL=OFF \ + -DBUILD_doc:BOOL=OFF \ + -DBUILD_freespacenotifier:BOOL=OFF \ + -DBUILD_kcheckpass:BOOL=OFF \ + -DBUILD_kcminit:BOOL=OFF \ + -DBUILD_kcontrol:BOOL=OFF \ + -DBUILD_kdm:BOOL=OFF \ + -DBUILD_khotkeys:BOOL=OFF \ + -DBUILD_kinfocenter:BOOL=OFF \ + -DBUILD_klipper:BOOL=OFF \ + -DBUILD_kmenuedit:BOOL=OFF \ + -DBUILD_krunner:BOOL=OFF \ + -DBUILD_kscreensaver:BOOL=ON \ + -DBUILD_ksmserver:BOOL=OFF \ + -DBUILD_ksplash:BOOL=OFF \ + -DBUILD_kstartupconfig:BOOL=OFF \ + -DBUILD_kstyles:BOOL=ON \ + -DBUILD_ksysguard:BOOL=OFF \ + -DBUILD_ksystraycmd:BOOL=OFF \ + -DBUILD_ktouchpadenabler:BOOL=ON \ + -DBUILD_kwin:BOOL=OFF \ + -DBUILD_kwrited:BOOL=OFF \ + -DBUILD_module:BOOL=OFF \ + -DBUILD_plasma:BOOL=OFF \ + -DBUILD_powerdevil:BOOL=OFF \ + -DBUILD_python:BOOL=OFF \ + -DBUILD_qguiplatformplugin_kde:BOOL=OFF \ + -DBUILD_ruby:BOOL=OFF \ + -DBUILD_screenlocker:BOOL=OFF \ + -DBUILD_solid-actions-kcm:BOOL=OFF \ + -DBUILD_statusnotifierwatcher:BOOL=OFF \ + -DBUILD_systemsettings:BOOL=OFF \ + -DBUILD_webkit:BOOL=OFF \ + -Wno-dev \ + .. + diff --git a/kde/cmake/kdeartwork b/kde/cmake/kdeartwork index 4f394d4..9bfd7d6 100644 --- a/kde/cmake/kdeartwork +++ b/kde/cmake/kdeartwork @@ -12,5 +12,6 @@ cd build -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DKSCREENSAVER_SOUND_SUPPORT=ON \ + -DBUILD_kwin-styles=OFF \ .. diff --git a/kde/cmake/khangman b/kde/cmake/khangman index b379e29..ab12832 120000 --- a/kde/cmake/khangman +++ b/kde/cmake/khangman @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/kig b/kde/cmake/kig index b379e29..ab12832 120000 --- a/kde/cmake/kig +++ b/kde/cmake/kig @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/konsole b/kde/cmake/konsole index b379e29..ab12832 120000 --- a/kde/cmake/konsole +++ b/kde/cmake/konsole @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/libkeduvocdocument b/kde/cmake/libkeduvocdocument index b379e29..ab12832 120000 --- a/kde/cmake/libkeduvocdocument +++ b/kde/cmake/libkeduvocdocument @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/okteta b/kde/cmake/okteta index b379e29..ab12832 120000 --- a/kde/cmake/okteta +++ b/kde/cmake/okteta @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/cmake/parley b/kde/cmake/parley index b379e29..ab12832 120000 --- a/kde/cmake/parley +++ b/kde/cmake/parley @@ -1 +1 @@ -applications \ No newline at end of file +applications5 \ No newline at end of file diff --git a/kde/doinst.sh/kde-workspace b/kde/doinst.sh/kde-workspace index 793bae7..e01f8b8 100644 --- a/kde/doinst.sh/kde-workspace +++ b/kde/doinst.sh/kde-workspace @@ -1,21 +1,5 @@ #!/bin/sh -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/kde/kdm/backgroundrc.new -config etc/kde/kdm/kdmrc.new - if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 fi diff --git a/kde/modularize b/kde/modularize index cf8933f..6226f73 100644 --- a/kde/modularize +++ b/kde/modularize @@ -324,7 +324,8 @@ nepomuk-core nepomuk-widgets kfilemetadata kactivities -kde-workspace +katepart4 +konsolepart4 # kdebindings smokegen @@ -351,4 +352,21 @@ kdepimlibs # extragear calligra +k3b +kaudiocreator +kplayer +kwebkitpart +oxygen-gtk2 +oxygen-gtk3 +kdevplatform +kdevelop-pg-qt +kdevelop +kdev-python +kdevelop-php +kdevelop-php-docs +skanlite +kio-mtp +libktorrent +ktorrent +partitionmanager diff --git a/kde/modules/applications b/kde/modules/applications index 6cf4e6d..7f78876 100644 --- a/kde/modules/applications +++ b/kde/modules/applications @@ -1,5 +1,11 @@ # https://community.kde.org/Applications/14.12_Release_Notes # +# Some of the old kdegraphics: +libkipi +libkexiv2 +libkdcraw +libksane + # Ported to KF5: libkeduvocdocument kate @@ -35,10 +41,6 @@ lokalize poxml umbrello # The old kdegraphics: -libkipi -libkexiv2 -libkdcraw -libksane kdegraphics-mobipocket kdegraphics-strigi-analyzer okular diff --git a/kde/modules/extragear b/kde/modules/extragear index 2889bf5..2a5ea89 100644 --- a/kde/modules/extragear +++ b/kde/modules/extragear @@ -1,2 +1,19 @@ calligra +k3b +#kaudiocreator +#kplayer +kwebkitpart +oxygen-gtk2 +oxygen-gtk3 +kdevplatform +#kdevelop-pg-qt +kdevelop +kdev-python +kdevelop-php +kdevelop-php-docs +skanlite +kio-mtp +#libktorrent +#ktorrent +partitionmanager diff --git a/kde/modules/frameworks b/kde/modules/frameworks index 0a0e453..b91301c 100644 --- a/kde/modules/frameworks +++ b/kde/modules/frameworks @@ -14,7 +14,6 @@ sonnet kconfig kwindowsystem solid -kglobalaccel karchive kdbusaddons kcoreaddons @@ -25,6 +24,7 @@ networkmanager-qt # Tier 2, depends on Tier 1, Qt5, system libraries: kauth kcrash +kglobalaccel kjobwidgets kcompletion kdoctools diff --git a/kde/modules/kdebase b/kde/modules/kdebase index 182e20a..563e6c5 100644 --- a/kde/modules/kdebase +++ b/kde/modules/kdebase @@ -4,4 +4,5 @@ baloo-widgets nepomuk-core nepomuk-widgets kactivities -#kde-workspace +katepart4 +konsolepart4 diff --git a/kde/modules/plasma-extra b/kde/modules/plasma-extra index 06274c7..a03ebd8 100644 --- a/kde/modules/plasma-extra +++ b/kde/modules/plasma-extra @@ -1,5 +1,4 @@ sddm-qt5 -sddm-theme-breeze kdeconnect-framework polkit-kde-kcmodules-framework diff --git a/kde/patch/kde-workspace.patch b/kde/patch/kde-workspace.patch index a653e5c..4a355d1 100644 --- a/kde/patch/kde-workspace.patch +++ b/kde/patch/kde-workspace.patch @@ -7,3 +7,6 @@ cat $CWD/patch/kde-workspace/kde-workspace.batteryapplet.diff | patch -p1 --verb # Fix crash when DesktopNames isn't set (fixed in 4.11.10): #cat $CWD/patch/kde-workspace/kde-workspace.desktopnames.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# In Plasma 5 we do not need the Plasma 4 core apps, they conflict. +cat $CWD/patch/kde-workspace/kde-workspace.no.plasma4.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/kde-workspace/kde-workspace.no.plasma4.diff b/kde/patch/kde-workspace/kde-workspace.no.plasma4.diff new file mode 100644 index 0000000..0dbd674 --- /dev/null +++ b/kde/patch/kde-workspace/kde-workspace.no.plasma4.diff @@ -0,0 +1,41 @@ +--- kde-workspace-4.11.16/CMakeLists.txt.orig 2015-01-29 19:49:17.000000000 +0100 ++++ kde-workspace-4.11.16/CMakeLists.txt 2015-02-05 22:15:27.261461332 +0100 +@@ -219,22 +219,22 @@ + macro_optional_add_subdirectory( systemsettings ) + endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") + +-# core apps +-if(NOT WIN32) +- macro_optional_add_subdirectory( kcheckpass ) +- macro_optional_add_subdirectory( kwin ) +- macro_optional_add_subdirectory( ksmserver ) +- +- find_package(JPEG REQUIRED) +- find_package(PNG REQUIRED) +- macro_optional_add_subdirectory( ksplash ) +- +- macro_optional_add_subdirectory( powerdevil ) +- macro_optional_add_subdirectory( qguiplatformplugin_kde ) +- if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin) +- macro_optional_add_subdirectory( ksysguard ) +- endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin) +-endif(NOT WIN32) ++## core apps ++#if(NOT WIN32) ++# macro_optional_add_subdirectory( kcheckpass ) ++# macro_optional_add_subdirectory( kwin ) ++# macro_optional_add_subdirectory( ksmserver ) ++# ++# find_package(JPEG REQUIRED) ++# find_package(PNG REQUIRED) ++# macro_optional_add_subdirectory( ksplash ) ++# ++# macro_optional_add_subdirectory( powerdevil ) ++# macro_optional_add_subdirectory( qguiplatformplugin_kde ) ++# if (NOT CMAKE_SYSTEM_NAME MATCHES Darwin) ++# macro_optional_add_subdirectory( ksysguard ) ++# endif (NOT CMAKE_SYSTEM_NAME MATCHES Darwin) ++#endif(NOT WIN32) + + if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") + macro_optional_add_subdirectory(kcontrol) diff --git a/kde/post-install/kde-workspace.post-install b/kde/post-install/kde-workspace.post-install index 5cbabf5..5b168b1 100644 --- a/kde/post-install/kde-workspace.post-install +++ b/kde/post-install/kde-workspace.post-install @@ -5,47 +5,23 @@ mkdir -p $PKG/etc/X11/xinit cat $CWD/post-install/kde-workspace/xinit/xinitrc.kde > $PKG/etc/X11/xinit/xinitrc.kde chmod 0755 $PKG/etc/X11/xinit/xinitrc.kde -# Setup config files for KDM: -$PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/share/config/kdm - -# Add Slackware's standard xsessions path to kdmrc and remove the redundant -# xsession files for XFCE (those are installed by the xcfe package): -if ! grep -q "SessionsDirs=/usr/share/xsessions" $PKG/usr/share/config/kdm/kdmrc ; then - sed -i -e "/SessionsDirs=/s#SessionsDirs=\(.*\)\$#SessionsDirs=/usr/share/xsessions,\1#" $PKG/usr/share/config/kdm/kdmrc -fi -rm $PKG/usr/share/apps/kdm/sessions/xfce*.desktop - -# Similarly, allow other login managers to show KDE Plasma desktop sessions: -mkdir -p $PKG/usr/share/xsessions -mv $PKG/usr/share/apps/kdm/sessions/kde-plasma*.desktop \ - $PKG/usr/share/xsessions/ - -# Not allowing root to login at the console is just plain silly. If they -# have physical access to the machine, what's the point of trying to stop -# this? Even the kdmrc file says this is supposed to be the default. -sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \ - $PKG/usr/share/config/kdm/kdmrc -# We are also not ready to create a separate 'kdm' non-root user: -sed -i 's/GreeterUID=kdm/#&/' \ - $PKG/usr/share/config/kdm/kdmrc - -# Add a .new suffix so we don't mangle an existing file: -mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new +# This is fubar: +rm -f $PKG/usr/share/icons/hicolor/index.theme -cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig -cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \ - > $PKG/usr/share/config/kdm/Xsession +# Rename the startkde script so that it does not conflict with plasma-workspace: +mv $PKG/usr/bin/startkde $PKG/usr/bin/startkde4 -# Add a .new suffix so we don't mangle an existing file: -mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new +# Remove symlinks that clash with plasma-workspace: +for SOFILE in libksgrd libksignalplotter liblsofui libprocesscore libprocessui libtaskmanager ; do + rm $PKG/usr/lib${LIBDIRSUFFIX}/${SOFILE}.so +done -# Move the KDM files someplace FHS compliant: -mkdir -p $PKG/etc/kde -mv $PKG/usr/share/config/kdm $PKG/etc/kde -( cd $PKG/usr/share/config ; ln -sf ../../../etc/kde/kdm . ) +# Remove include files that clash with plasma-workspace: +for INCDIR in ksysguard taskmanager ; do + rm -r $PKG/usr/include/${INCDIR} +done -# Move the polkit dbus configuration files to the proper place: -mv $PKG/etc/kde/dbus-1 $PKG/etc/ +# Remove the dbus and polkit dbus files that clash woth plasma-workspace: +rm -r $PKG/etc/kde/dbus-1 $PKG/etc/dbus-1 $PKG/usr/share/dbus-1 +rm -r $PKG/usr/share/polkit-1 -# This is fubar: -rm -f $PKG/usr/share/icons/hicolor/index.theme diff --git a/kde/post-install/kde-workspace/config/Xsession b/kde/post-install/kde-workspace/config/Xsession index 736f5d5..c52783e 100644 --- a/kde/post-install/kde-workspace/config/Xsession +++ b/kde/post-install/kde-workspace/config/Xsession @@ -79,7 +79,7 @@ case $session in exec $HOME/.xsession ;; default) - exec /usr/bin/startkde + exec /usr/bin/startkde4 ;; *) eval exec "$session" diff --git a/kde/post-install/kde-workspace/xinit/xinitrc.kde b/kde/post-install/kde-workspace/xinit/xinitrc.kde index a33eb06..fe5b8b1 100644 --- a/kde/post-install/kde-workspace/xinit/xinitrc.kde +++ b/kde/post-install/kde-workspace/xinit/xinitrc.kde @@ -26,7 +26,7 @@ fi # Start the window manager: if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - ck-launch-session startkde + ck-launch-session startkde4 else - startkde + startkde4 fi -- cgit v1.2.3