From def38206675dca42941436fc396efb46fd42ce4b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 30 Apr 2022 22:35:28 +0200 Subject: kde-plasma/libkworkspace: drop 5.23.5* Signed-off-by: Andreas Sturmlechner --- kde-plasma/libkworkspace/Manifest | 1 - ...bkworkspace-5.23.3-synchronous-dbus-calls.patch | 48 ----------------- .../libkworkspace/libkworkspace-5.23.5.ebuild | 60 ---------------------- 3 files changed, 109 deletions(-) delete mode 100644 kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch delete mode 100644 kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 7ff845648d60..be5c47e6ef60 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,3 +1,2 @@ -DIST plasma-workspace-5.23.5.tar.xz 9010724 BLAKE2B 215b862bcf31c4cadc381f80edbc28f6f63d73066dcb43200b1527a07312bda2721ed1cee700d009f4c67add01a1546a7b0cbae944b28dd3ad22e5ae29212bc5 SHA512 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099 DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch deleted file mode 100644 index 411bebf70412..000000000000 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.23.3-synchronous-dbus-calls.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ecd45f28dc5c3a4b1716d09e0ba121ec5fb2a50 Mon Sep 17 00:00:00 2001 -From: Joe Breuer -Date: Mon, 1 Nov 2021 07:19:51 +0000 -Subject: [PATCH] Fix sleep/suspend sometimes not working ... from - ksmserver-logout-greeter, by making the DBus calls synchronous. - ---- - libkworkspace/sessionmanagementbackend.cpp | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/sessionmanagementbackend.cpp b/sessionmanagementbackend.cpp -index 83cd39395..a77a8a475 100644 ---- a/sessionmanagementbackend.cpp -+++ b/sessionmanagementbackend.cpp -@@ -137,7 +137,6 @@ void LogindSessionBackend::shutdown() - { - // logind will confirm credentials with the caller, if the app quits after sending this - // this may fail -- // its not really needed for suspend tasks where the calling app won't be closing - m_login1->PowerOff(true).waitForFinished(); - } - -@@ -148,17 +147,19 @@ void LogindSessionBackend::reboot() - - void LogindSessionBackend::suspend() - { -- m_login1->Suspend(true); -+ // these need to be synchronous as well - ksmserver-logout-greeter specifically calls these -+ // and will quit immediately after -+ m_login1->Suspend(true).waitForFinished(); - } - - void LogindSessionBackend::hybridSuspend() - { -- m_login1->HybridSleep(true); -+ m_login1->HybridSleep(true).waitForFinished(); - } - - void LogindSessionBackend::hibernate() - { -- m_login1->Hibernate(true); -+ m_login1->Hibernate(true).waitForFinished();; - } - - bool LogindSessionBackend::canShutdown() const --- -GitLab - diff --git a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild deleted file mode 100644 index b98c065c49a8..000000000000 --- a/kde-plasma/libkworkspace/libkworkspace-5.23.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.86.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -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/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -PATCHES=( - # Pending: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1164 - "${FILESDIR}"/${PN}-5.23.3-synchronous-dbus-calls.patch # bug 818124 -) - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -} -- cgit v1.2.3-65-gdbad