From c9d475387c8f2d286f41e2cfb64ebeec08021f55 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 11 Sep 2026 19:21:01 +0200
Subject: [PATCH] kde-frameworks/kwallet-runtime: Backport countless 6.30 fixes
 and one from 6.31

Nicolas Fella (31):
      Drop pseudo access control for wallet
      Fix memory leaks in kwalletd
      Fix logic errors in internalOpen
      Drop unused function
      Drop isPath handling
      Propagate locked status from backend to kwalletd
      Drop Close When Idle handling from kwalletd
      Drop unused handleSession from ksecretd
      ksecretd: Drop KWalletSessionStore
      ksecretd: Remove unused force parameter from close()
      Add desktop file for kwalletd
      Drop long-time commented out code
      ksecretd: Drop unneeded intermediate function
      ksecretd: Make parameter names consistent
      ksecretd: Make sure collection is reported as unlocked after PAM unlock
      ksecretd: Drop unused walletOpened signal
      Drop unneeded KSecretD::doCloseSignals
      Remove unneeded KSecretD::networkWallet
      ksecretd: Drop CloseCancelled handling
      ksecretd: Remove unused force parameter from internalClose()
      Drop defunct Leave Open option from kcfg
      ksecretd: Drop appId
      ksecretd: Fix Completed argument when dismissing collection creation
      Drop KSecretD::sync
      Remove unused WId parameter from sync()
      ksecretd: Remove wrong comment
      ksecretd: Remove unused sessionTimeout parameter from pamOpen
      ksecretd: Remove unused method parameters
      Remove some default function args
      Remove unused variable
      Properly handle when the portal fails to open the wallet

Bug: https://bugs.gentoo.org/981072
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 kde-frameworks/kwallet-runtime/Manifest       |  1 +
 .../kwallet-runtime-6.29.0-r1.ebuild          | 88 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild

diff --git a/kde-frameworks/kwallet-runtime/Manifest b/kde-frameworks/kwallet-runtime/Manifest
index 55c2f7a0c725e..9cba9e8df6c66 100644
--- a/kde-frameworks/kwallet-runtime/Manifest
+++ b/kde-frameworks/kwallet-runtime/Manifest
@@ -1,3 +1,4 @@
 DIST kwallet-6.27.0.tar.xz 381384 BLAKE2B 7b5f44e65a4074a57e847265d0b8694ea019715338987a858b988b706109c6184fde528b175fe5012abdb8b885485f8969e010557c042c245951dfcc25393a4e SHA512 5f422280e8ba36a89a0754189f4c8074c13f2cc9b028b03cc4eb72ac93d56ff5c84dfbeb35c9213eee537e4c3576a1e042cbba4da77ce9004a99ed495877013b
+DIST kwallet-6.29.0-patchset-1.tar.xz 33220 BLAKE2B 1e3dc5572ae678c1346cb8648af28f9bf2c27488110ec89e30359041733154954911d0ef035dac92bcf1205ad905f7cf9d40cc8f911c4fdec1187fcd86fe286e SHA512 1a046cc6bec24c0a071f80b1f64fd3a77057719d5bf9f8c8b5adc1abc79904a2df03965cdbcca8c36664048f4b0b0d89a7d3fd562b61d0be403597d46a3113f0
 DIST kwallet-6.29.0.tar.xz 382604 BLAKE2B a05b6f89f4affc7e3b96fa031d84bf5b4548ac1ed2a20db9ac029e389fd4d1f0b942a8a7989c6c3448fd897246101d51fb081d83295a9ad714c197c32a9b05a7 SHA512 d2584ee74dbedaa09a2360aee620c081b3bba09257a27a24e3d0033aa16a44ff5990c432b67d8557d86fab660bce06fd8fd41e5020c7754c02e8a0575a6e0caa
 DIST kwallet-6.30.0.tar.xz 378552 BLAKE2B eff1a85b8f5d45a090cb32ceca3a3b007f1aa5ff4b61dedbf9ff9c9842e9e9f4bbb2672286d3c5e5c42937c445cf833b4fcd4ee712b2412f38ab046c43553cd7 SHA512 3d040fbd907d50dd1a82164fc93af144a7b80026acc2cf1eb0fe65677a2c34a13a202a35160f9bfbf282f91905d4597eafa6291e049db766330242fa516e3ac7
diff --git a/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild
new file mode 100644
index 0000000000000..80bae859348dd
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.29.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_NAME="kwallet"
+PATCHSET="${KDE_ORG_NAME}-${PV}-patchset-1"
+QTMIN=6.10.1
+inherit ecm frameworks.kde.org optfeature
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/kde/${PATCHSET}.tar.xz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gpg +man +keyring +legacy-kwallet X"
+
+DEPEND="
+	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-${PV}-r1:6
+	=kde-frameworks/kwallet-${PV}*:6
+	=kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6
+	=kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?]
+	gpg? ( dev-libs/qgpgme:= )
+	keyring? ( >=app-crypt/qca-2.3.9:2[qt6(+)] )
+	legacy-kwallet? ( app-crypt/libsecret )
+"
+RDEPEND="${DEPEND}
+	!<kde-frameworks/kwallet-5.116.0-r2:5[-kf6compat(-)]
+	!<kde-frameworks/kwallet-6.14.0:6
+	keyring? ( =kde-frameworks/ksecretd-services-${KDE_CATV}* )
+"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-stdalone.patch" # downstream
+	"${WORKDIR}/${PATCHSET}" # in 6.30/6.31
+)
+
+src_prepare() {
+	ecm_src_prepare
+	cmake_comment_add_subdirectory -f src 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
+}
+
+src_install() {
+	# provided by kde-frameworks/kwallet
+	ECM_REMOVE_FROM_INSTALL=( /usr/share/config.kcfg/kwalletsettings.kcfg )
+
+	# provided by kde-frameworks/ksecretd-services
+	if use keyring; then
+		ECM_REMOVE_FROM_INSTALL+=(
+			/usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.kwallet.service
+			/usr/share/dbus-1/services/org.kde.secretservicecompat.service
+		)
+	fi
+
+	ecm_src_install
+}
+
+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
+}