diff options
Diffstat (limited to 'kde-plasma')
-rw-r--r-- | kde-plasma/Manifest.gz | bin | 8772 -> 8781 bytes | |||
-rw-r--r-- | kde-plasma/breeze/Manifest | 3 | ||||
-rw-r--r-- | kde-plasma/breeze/breeze-5.21.5-r1.ebuild (renamed from kde-plasma/breeze/breeze-5.21.5.ebuild) | 2 | ||||
-rw-r--r-- | kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch | 50 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/Manifest | 3 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch | 108 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild (renamed from kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild) | 20 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/Manifest | 3 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch | 33 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild | 2 |
10 files changed, 208 insertions, 16 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex 51d27625382e..1acd3992e807 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index b1a9354676b4..a2e62d815d68 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,5 +1,6 @@ +AUX breeze-5.21.5-fix-splitter-proxy.patch 2306 BLAKE2B 5d95c306c34482a1aa07a64671ecd4687dc61048829b129d15c302b16c30a79d97c2896f1b84c7fa7e2dc26d486742b3cbfbb9e8b42166b92586baf6efef3a3e SHA512 6e2eb41d9c44acca58d2e4c2a93c3fd73e808bc6eccafeae8278351b9a780a0f75d8ee80343fb55cee0880fd4081537223caf430ed2093edb8b59f1b27f84fee DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb EBUILD breeze-5.20.5.ebuild 1265 BLAKE2B baa89c16e94aef4c3897609a0bf12cdc27fc2ba2e9c968a3a736e8cf56f9ab299792207726c68f9f66dc3f0a8fcc1feb7a25e35d74ba74274a5d386a220474b1 SHA512 45c00dcc2299ba52cebbb75a24a9ebbf2ca6cedb45a5c6ffaa39f51ea70a666632276be32719826530f992c362acc4f2c97a8617573801cab4f69555f71e78ba -EBUILD breeze-5.21.5.ebuild 1268 BLAKE2B 3a861b41bf751ba791c81a5e4fc5b92fcf9b8cb6bc85973331cf622cb537c61a64e0f5e88b7c72c135e8c865b8af4224f8f39542ebdf6e1d521ad8ae51adf437 SHA512 0bb2d875223c501579fad443bdcbed1dee09c48eb5b0c7d63f9f03a8d04a64c48dce5a41e5d32ab1db9cb3ad210604c37501ece5c193b2160a8d1e9c8c3473bd +EBUILD breeze-5.21.5-r1.ebuild 1325 BLAKE2B 31bb7f89fd40b7afb9a495b49ab29a423ae124e2bba390eb9ab2cf5372de6d850faa1559c8c8f214e55402458e861e89ed49e116feeba57449a9b71817747328 SHA512 120bf11e9d6a707f523c73e13bacad3f3bf6d1502a766ba5c1093a0278365360b25981568b9a709a3ea836103f9a16943dd6d246583d7dbad081b64b68f378a2 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/breeze/breeze-5.21.5.ebuild b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild index d1a274a975e7..c87f6e948b99 100644 --- a/kde-plasma/breeze/breeze-5.21.5.ebuild +++ b/kde-plasma/breeze/breeze-5.21.5-r1.ebuild @@ -43,6 +43,8 @@ PDEPEND=" >=kde-plasma/kde-cli-tools-${PVCUT}:5 " +PATCHES=( "${FILESDIR}/${P}-fix-splitter-proxy.patch" ) + src_configure() { local mycmakeargs=( $(cmake_use_find_package X XCB) diff --git a/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch b/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch new file mode 100644 index 000000000000..52646721a4b8 --- /dev/null +++ b/kde-plasma/breeze/files/breeze-5.21.5-fix-splitter-proxy.patch @@ -0,0 +1,50 @@ +From f99b7ef621c9c69544158d245699fd8104db6753 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Sat, 15 May 2021 17:45:54 +0200 +Subject: [PATCH] Fix informing the underlying widget when leaving + SplitterProxy + +While the SplitterProxy is active, it intercepts all relevant events, so that +the underlying widget still thinks it's in the same "on splitter" state. When +the SplitterProxy is left, the underlying widget is sent a HoverLeave/HoverMove +event to make it aware of the new current cursor position. Without this, it +doesn't know that it's not supposed to be in the "on splitter" state, and when +it regains focus it just re-activates the SplitterProxy at the current cursor +position. + +This was broken by accident in d201a1f187 ("Fix SplitterProxy not clearing +when above another QSplitterHandle"), which moved the hide() call past the +call to QCoreApplication::sendEvent. Previously that made isVisible() false, +which also prevented the interception of the HoverLeave/HoverMove events. + +BUG: 436473 +--- + kstyle/breezesplitterproxy.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp +index 0cf5685f..d4db407b 100644 +--- a/kstyle/breezesplitterproxy.cpp ++++ b/kstyle/breezesplitterproxy.cpp +@@ -341,11 +341,14 @@ namespace Breeze + // send hover event + if( _splitter ) + { +- QHoverEvent hoverEvent( +- qobject_cast<QSplitterHandle*>(_splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove, +- _splitter.data()->mapFromGlobal(QCursor::pos()), _hook); +- QCoreApplication::sendEvent( _splitter.data(), &hoverEvent ); ++ // SplitterProxy intercepts HoverLeave/HoverMove events to _splitter, ++ // but this is meant to reach it directly. Unset _splitter to stop interception. ++ auto splitter = _splitter; + _splitter.clear(); ++ QHoverEvent hoverEvent( ++ qobject_cast<QSplitterHandle*>(splitter.data()) ? QEvent::HoverLeave : QEvent::HoverMove, ++ splitter.data()->mapFromGlobal(QCursor::pos()), _hook); ++ QCoreApplication::sendEvent( splitter.data(), &hoverEvent ); + } + + // kill timer if any +-- +GitLab + diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 5297dd745156..c2b7ee1af2a5 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,6 +1,7 @@ AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f +AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28a7212d6fcec6692c51047ebe5459c9502bfc0fab9a46687fa57424d29691d20987ed9e2bd207b7d2d99a13ddfa7b5091267fa18 SHA512 710d9804ec23fed811d57e1f713738b435a526511609540f45953fa678eb733542682487d8a429940b20dd26bb898fbd70f2d6da3727fa6d26ff9cd839c6c447 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 EBUILD libkworkspace-5.20.5.ebuild 1409 BLAKE2B 522dd3752451c44c7e3552c48fe51e91cea10ba2707844dcaaaf7b01aab0310a7c6499beeb5fe1b33dcb5d91670936748df735d99fe2ee2bf77ab1e4a22d5433 SHA512 42954b88ffa84cc9aa30fa82fc00061c5cc5225210e47cc948de50ea7c7fb620bb9b07bc4bdc37d4c5be0610b4b4fe8de7be3970dcc11737842ee599be119a15 -EBUILD libkworkspace-5.21.5.ebuild 1412 BLAKE2B f022a0cc934e44f8946777f1b893075a4b2fef8f118f565f198f0ba44a5c384f167032bb145ef4dfe9394e7d2655f818fffa0a41f1c4be8e5690c3a949cabb48 SHA512 9035fad1e243a43cf806bb37077684f5ad5e88d380204d99bc5d173037e75560d057789ac98b218a92db9e7725338c44b77ecfb1990d237da79eaca41f97d8ee +EBUILD libkworkspace-5.21.5-r1.ebuild 1242 BLAKE2B 6527e217d14ec8e5b021416e3f8d5fa5b437d46a6ef191d63d78c1d1eba895c953bf4e1eb41d9233636b74906023c6761c7ec710014069b138b31df8338b5db0 SHA512 081e2b0b73db8c93f4e345f4ba7e38c196304ac8c7e32402755e875bffa902c3f0287e7bfedadf00eaee5c21ade56f8e6d2310f0be2dad48d2e4be3ccbbc7870 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch new file mode 100644 index 000000000000..8c4e88949c56 --- /dev/null +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.21.5-standalone.patch @@ -0,0 +1,108 @@ +From 0a8473a131caf3b076e8dd8932964a07103d810a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 2 Feb 2020 18:29:57 +0100 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++- + 1 file changed, 66 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4babcb683..419158539 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,56 @@ ++project(libkworkspace) ++ ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++ set(PROJECT_VERSION "5.21.5") ++ set(PROJECT_VERSION_MAJOR 5) ++ ++ cmake_minimum_required(VERSION 3.6) ++ ++ set(QT_MIN_VERSION "5.15.0") ++ set(KF5_MIN_VERSION "5.78") ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) ++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) ++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ++ ++ include(KDEInstallDirs) ++ include(KDECMakeSettings) ++ include(KDECompilerSettings NO_POLICY_SCOPE) ++ include(ECMMarkNonGuiExecutable) ++ include(CMakePackageConfigHelpers) ++ include(WriteBasicConfigVersionFile) ++ include(CheckIncludeFiles) ++ include(FeatureSummary) ++ include(ECMQtDeclareLoggingCategory) ++ include(KDEPackageAppTemplates) ++ include(ECMMarkAsTest) ++ include(GenerateExportHeader) ++ ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) ++ ++ find_package(KWinDBusInterface CONFIG REQUIRED) ++ find_package(KScreenLocker 5.13.80 REQUIRED) ++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) ++ ++ find_package(X11) ++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" ++ URL "http://www.x.org" ++ TYPE OPTIONAL ++ PURPOSE "Required for X11 support") ++ ++ if(X11_FOUND) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) ++ set(HAVE_X11 1) ++ endif() ++ ++ if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ endif() ++ ++ check_include_files(unistd.h HAVE_UNISTD_H) ++ ++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) ++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) ++endif() + + set(kworkspace_LIB_SRCS kdisplaymanager.cpp + kworkspace.cpp +@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) ++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) ++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) ++else() + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++endif() + + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" + "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" +@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) + qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) + +-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) + qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) + + add_library(kworkspace ${kworkspace_LIB_SRCS}) +@@ -101,3 +161,8 @@ if(BUILD_TESTING) + add_subdirectory(autotests) + add_subdirectory(tests) + endif() ++ ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") ++ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ++endif() +-- +2.31.1 + diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild index d5de9a8d1e73..10cabe55d613 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild @@ -20,11 +20,10 @@ IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 x11-libs/libICE x11-libs/libSM @@ -32,13 +31,12 @@ RDEPEND=" x11-libs/libXau " DEPEND="${RDEPEND} + >=kde-frameworks/kinit-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 " S="${S}/${PN}" -PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) - src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic if [[ ${KDE_BUILD_TYPE} = release ]]; then @@ -46,13 +44,11 @@ src_prepare() { rm -rf po/*/docs || die cp -a ../po ./ || die fi - ecm_src_prepare - if [[ ${KDE_BUILD_TYPE} = release ]]; then - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" + eapply "${FILESDIR}/${P}-standalone.patch" + cat >> CMakeLists.txt <<- _EOF_ || die + ki18n_install(po) + _EOF_ + + ecm_src_prepare } diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 9d96854ff31f..4fdcac4f3957 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -9,10 +9,11 @@ AUX plasma-workspace-5.20.5-revert-activate-krunner.patch 2362 BLAKE2B 0f2d2220f AUX plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch 1475 BLAKE2B 79b9ca4dff4f88c2343e294c9243a2221f20d14ebbda8dca87b371143eee618b7f9118ec1435c6168cc1be81a129ab9b6d21615c08f777355b0cdd6978b9847e SHA512 0a0c87db98be7fed51d0b193f683a60fe6119f7f47e82966bc01cc5c5afe6f74d7f3edd8939e709f2f72363741a5cbd7f464890fbe0bb88d25c4f5b235d3dfb2 AUX plasma-workspace-5.21.5-dangerous-shortcuts.patch 2114 BLAKE2B 88cb2dc9bb202aa44ec75eb69ff806a2b48cf23d2aecf1db89b747269aa1f4689b6577cee5ef14399bd91839db366e2aae155e2bce2b6e8683aaacb63b267cc9 SHA512 42a3954e7d6a1c78e9f59a073be4dd671e1cce51b72d9ebb415d1e5bce1136c3a5fcbb8fc723ef7c82fd7a8ddda18a12935a375e7abd12d771a5911f3cc8e8c4 AUX plasma-workspace-5.21.5-revert-activate-krunner.patch 2369 BLAKE2B e3b8b1ae433a8e212ac65dd7a20cc56ac190200afdad33bc0f24243d1bbbb5a7db40025f6fea033d3e7a9ca71f77650962af39c8c624d07cbc1a3fb1c939faf9 SHA512 2235fdd5624fa3a8d4727cf553801e35b074e22d1db78ccdf12b2e40448e8d3ef85c20e74936359cd84155a288a4fe1df1142370a61790325ce93c5163b78c60 +AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50 AUX plasma-workspace-5.21.5-transparency-panelConfig.patch 1174 BLAKE2B fa68999f0c9f4bed18d2b00b3129c271a3d63359f618b05eebb1cbb0dc759b8daec6019069ac64adfe10fb76acd833bd3fbdbf48b83d5859d4dbdacea37a4dd8 SHA512 19878656585d8ae980b9d3350506cbcb2f5841535bf042e66a6fbb2873680207730d7f6a06065aa94268264c4d252c02d434fa6f96358906ea7c01c16188f172 AUX plasma-workspace-5.21.5-transparency.patch 14371 BLAKE2B 6ce2619103bbff528c31b89d1aec8064e79768b66513c9b5a66d4d994f3824e733473755f3b866729c7a0a92a43209dfd641e864ee66dd69875364a93d5d69cd SHA512 cf0a6140a3905ed58f3fec0ada1f8dad4faa59f2b12e3084f26832b4e93db0c5e9a0fd86667c40ba9ddc7bb5108c3ab7e5c7a39db274e2cb46f3605707b2ae7b DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 EBUILD plasma-workspace-5.20.5-r4.ebuild 6402 BLAKE2B 9421322f197d94628fad7ea6fda583c2b86ca5858f83989d85003f141a5eb7e7fbe69761f71c653abd3d093ec7eae610e4db5769475c5aedc82da78e2b5cc2fe SHA512 f23ce6fa49a5dc0f8515b76c2a4c9425b4c41891ae4e1e06b211d86a2826df1bfd54bf26496f1bc53f9bac422a81151fe53e510f8c01287e7dfdfe10b1e5b06f -EBUILD plasma-workspace-5.21.5.ebuild 6342 BLAKE2B debd29183c047d08af9aa49239c228351b0dfc3848f9374b0ad7cd663f6c46e9654e9e5ba4a38cbb47aa554aca63116f053f2fb90a92ebb96f011e51efe27135 SHA512 95bde9a0280f849db3ddbd1a079e36ad1804cad5b3ff7dc13f84bf9375c741021a698bd55d448ddafead4bae3bdad42f7acb3956f4ccc7b2eef6a327bcf2f4a8 +EBUILD plasma-workspace-5.21.5.ebuild 6353 BLAKE2B 290903d9d22a174803c592752d697de2267ffffaff097b704efd760fc449597726c6e202481801b277c6ee45a274c1b63e002b901f0f3589048b2caecc480b64 SHA512 aaa4f90762f3cf8989dbb7bd2324217a46917b8738da7d6b4df691bcb64c84a44bd5fa2f3743432dcc564dd019981b09bab84b51a9706b993978f56abb5bda9b MISC metadata.xml 820 BLAKE2B 4b861592915543bb74f501d3b06bb2599d45232a016a7a6d89b62e56624b401ab6852ed471a4ccfbd2ee4a435ad18a3c25eb5df331b6d066378a3217755863de SHA512 c292e4c1476f1222269e26be998648b05c5ce0201193434e4b5b81f2a9d794bdf4a961a203edc77cf4d5b9a967454feb0c9514549170ab6f79218e6ed356cc72 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch new file mode 100644 index 000000000000..c96c0ba623d6 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch @@ -0,0 +1,33 @@ +From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Mon, 22 Oct 2018 10:35:10 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 6 +++- + 1 file changed, 5 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67f82cfb7..88a8c09b4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + + find_package(KF5TextEditor) + find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(LibKWorkspace 5.21.5) + + find_package(KF5Screen CONFIG REQUIRED) + find_package(KScreenLocker 5.13.80 REQUIRED) +@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS) + option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE) + + add_subdirectory(doc) +-add_subdirectory(libkworkspace) ++if(NOT LibKWorkspace_FOUND) ++ message(STATUS "System LibKWorkspace not found, using bundled.") ++ add_subdirectory(libkworkspace) ++endif() + add_subdirectory(libdbusmenuqt) + add_subdirectory(appmenu) + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild index 35b280c763ac..6e92371027f8 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild @@ -144,7 +144,7 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" + "${FILESDIR}/${P}-split-libkworkspace.patch" # downstream patch "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478 "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285 |