commit: 083caec9c08ede91b2cf0691ed7c950eda7fa37c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri May 16 16:36:45 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri May 16 16:39:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=083caec9
kde-frameworks/kwallet-runtime: drop 6.14.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/kwallet-runtime/Manifest | 1 - ...wallet-runtime-6.14.0-no-hang-if-disabled.patch | 101 --------------------- .../kwallet-runtime-6.14.0-r1.ebuild | 69 -------------- 3 files changed, 171 deletions(-) diff --git a/kde-frameworks/kwallet-runtime/Manifest b/kde-frameworks/kwallet-runtime/Manifest index 11dcaba2d468..bb9efca3eb51 100644 --- a/kde-frameworks/kwallet-runtime/Manifest +++ b/kde-frameworks/kwallet-runtime/Manifest @@ -1,2 +1 @@ -DIST kwallet-6.14.0.tar.xz 365196 BLAKE2B 0770d7520b553c66bf6862d46e3caf64aad6b8d22ff0ff7cecbfe5a7a541c229e1882b106cd07e54347469ed38c403a162380ce973873549e848983f73b09de0 SHA512 3d3af678f808db4ab5851608e3909d3eff236b6f3c114a8efc1b6723024e6c14d26c82381323a82ce9d2ed83b77be9b8a26e0a96b67766379e83c65d39330a94 DIST kwallet-6.14.1.tar.xz 365448 BLAKE2B e9c636c597be002983cf5c5e467adf90b02d644b77f34fdf6e2b1f5756499558deda2582fecaec44ad5ed4d1d88069f6f77cca1ae4fc6e6eee79602c35432805 SHA512 6966bad18a1e02e47aed9bfbb587aed9c107fdf6ba3780be17052935ba5604ab4a9b1336379e5bec57e2c0254c5c04b0ed65b35dea93eb902e46ce1ccb2c1b74 diff --git a/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-no-hang-if-disabled.patch b/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-no-hang-if-disabled.patch deleted file mode 100644 index d1d07f0a9d6a..000000000000 --- a/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-no-hang-if-disabled.patch +++ /dev/null @@ -1,101 +0,0 @@ -From a8490198ca9293cce3667a1ae5c09c5c825f139b Mon Sep 17 00:00:00 2001 -From: Marco Martin <[email protected]> -Date: Thu, 15 May 2025 14:32:25 +0200 -Subject: [PATCH 1/2] Don't make clients hang if kwallet is disabled - -check if kwallet is disabled only after creating KWalletD, -because if we were Dbus activated, the caller will stay -hanged if we never bring up the service - -BUG:504014 ---- - src/runtime/kwalletd/main.cpp | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp -index 03c9ceaf..50b628d8 100644 ---- a/src/runtime/kwalletd/main.cpp -+++ b/src/runtime/kwalletd/main.cpp -@@ -47,16 +47,19 @@ int main(int argc, char **argv) - parser.process(application); - aboutData.processCommandLine(&parser); - -+ KDBusService dbusUniqueInstance(KDBusService::Unique); -+ -+ KWalletD wallet; -+ - // check if kwallet is disabled -+ // do this after creating KWalletD, because if we were -+ // Dbus activated, the caller will stay hanged if we never -+ // bring up the service - if (!isWalletEnabled()) { - qCDebug(KWALLETD_LOG) << "kwallet is disabled!"; - - return (0); - } - -- KDBusService dbusUniqueInstance(KDBusService::Unique); -- -- KWalletD wallet; -- - return application.exec(); - } --- -GitLab - - -From 80ba18a9d52328acc45b541f423a5db587b1aea8 Mon Sep 17 00:00:00 2001 -From: Marco Martin <[email protected]> -Date: Thu, 15 May 2025 15:29:45 +0200 -Subject: [PATCH 2/2] return -1 when disabled - ---- - src/runtime/ksecretd/main.cpp | 2 +- - src/runtime/kwalletd/main.cpp | 13 +++++-------- - 2 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/runtime/ksecretd/main.cpp b/src/runtime/ksecretd/main.cpp -index df668a1d..97dcf3c3 100644 ---- a/src/runtime/ksecretd/main.cpp -+++ b/src/runtime/ksecretd/main.cpp -@@ -192,7 +192,7 @@ int main(int argc, char **argv) - /* Do not keep dbus-daemon waiting for the org.freedesktop.secrets if kwallet is disabled */ - KWalletFreedesktopService(nullptr); - -- return (0); -+ return (-1); - } - - KSecretD secretd; -diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp -index 50b628d8..0682c7d5 100644 ---- a/src/runtime/kwalletd/main.cpp -+++ b/src/runtime/kwalletd/main.cpp -@@ -47,19 +47,16 @@ int main(int argc, char **argv) - parser.process(application); - aboutData.processCommandLine(&parser); - -- KDBusService dbusUniqueInstance(KDBusService::Unique); -- -- KWalletD wallet; -- - // check if kwallet is disabled -- // do this after creating KWalletD, because if we were -- // Dbus activated, the caller will stay hanged if we never -- // bring up the service - if (!isWalletEnabled()) { - qCDebug(KWALLETD_LOG) << "kwallet is disabled!"; - -- return (0); -+ return (-1); - } - -+ KDBusService dbusUniqueInstance(KDBusService::Unique); -+ -+ KWalletD wallet; -+ - return application.exec(); - } --- -GitLab - diff --git a/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0-r1.ebuild b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0-r1.ebuild deleted file mode 100644 index 68d263f09601..000000000000 --- a/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="kwallet" -QTMIN=6.7.2 -inherit ecm frameworks.kde.org optfeature - -DESCRIPTION="Framework providing desktop-wide storage for passwords" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="gpg +man +keyring +legacy-kwallet X" - -DEPEND=" - >=app-crypt/qca-2.3.9:2[qt6(+)] - dev-libs/libgcrypt:0= - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 - =kde-frameworks/kconfig-${KDE_CATV}*:6 - =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 - =kde-frameworks/kcrash-${KDE_CATV}*:6 - =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 - =kde-frameworks/ki18n-${KDE_CATV}*:6 - =kde-frameworks/knotifications-${KDE_CATV}*:6 - =kde-frameworks/kservice-${KDE_CATV}*:6 - =kde-frameworks/kwallet-${KDE_CATV}*:6 - =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 - =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?] - gpg? ( app-crypt/gpgme:=[qt6(-)] ) - legacy-kwallet? ( app-crypt/libsecret ) -" -RDEPEND="${DEPEND} - !<kde-frameworks/kwallet-5.116.0-r2:5[-kf6compat(-)] - !<kde-frameworks/kwallet-6.14.0:6 -" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" - -PATCHES=( - "${FILESDIR}/${P}-stdalone.patch" - "${FILESDIR}/${P}-no-hang-if-disabled.patch" # KDE-bug #504014 -) - -src_prepare() { - ecm_src_prepare - cmake_run_in src cmake_comment_add_subdirectory api -} - -src_configure() { - local mycmakeargs=( - -DBUILD_KWALLET_QUERY=ON # could be split easily together w/ docs - $(cmake_use_find_package gpg Gpgmepp) - -DBUILD_KSECRETD=$(usex keyring) - -DBUILD_KWALLETD=$(usex legacy-kwallet) - $(cmake_use_find_package man KF6DocTools) - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Auto-unlocking after Plasma login" "kde-plasma/kwallet-pam" - optfeature "KWallet management" "kde-apps/kwalletmanager" - elog "For more information, read https://wiki.gentoo.org/wiki/KDE#KWallet"; - fi -}
