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/patch/kde-workspace.patch | 3 ++ .../kde-workspace/kde-workspace.no.plasma4.diff | 41 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 kde/patch/kde-workspace/kde-workspace.no.plasma4.diff (limited to 'kde/patch') 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) -- cgit v1.2.3