* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet-runtime/files/, kde-frameworks/kwallet-runtime/
@ 2025-05-15 15:35 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-05-15 15:35 UTC (permalink / raw
To: gentoo-commits
commit: 3a4f8f8c3b3c367238ce3edf2dc38ee8ffda1e18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 14:49:56 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 15 15:34:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4f8f8c
kde-frameworks/kwallet-runtime: Fix hanging clients w/ KWallet disabled
See also: https://invent.kde.org/frameworks/kwallet/-/merge_requests/117
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=504014
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...wallet-runtime-6.14.0-no-hang-if-disabled.patch | 101 +++++++++++++++++++++
.../kwallet-runtime-6.14.0-r1.ebuild | 69 ++++++++++++++
2 files changed, 170 insertions(+)
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
new file mode 100644
index 000000000000..d1d07f0a9d6a
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-no-hang-if-disabled.patch
@@ -0,0 +1,101 @@
+From a8490198ca9293cce3667a1ae5c09c5c825f139b Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+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 <notmart@gmail.com>
+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
new file mode 100644
index 000000000000..68d263f09601
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0-r1.ebuild
@@ -0,0 +1,69 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet-runtime/files/, kde-frameworks/kwallet-runtime/
@ 2025-05-16 16:41 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-05-16 16:41 UTC (permalink / raw
To: gentoo-commits
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 <notmart@gmail.com>
-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 <notmart@gmail.com>
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet-runtime/files/, kde-frameworks/kwallet-runtime/
@ 2025-05-13 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-05-13 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 1906cc8c7bf950f5cfb9c3ed68f43e14b2cc2395
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 11 18:19:47 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 13 20:55:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1906cc8c
kde-frameworks/kwallet-runtime: 6.14.0 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kwallet-runtime/Manifest | 1 +
.../files/kwallet-runtime-6.14.0-stdalone.patch | 189 +++++++++++++++++++++
.../kwallet-runtime/kwallet-runtime-6.14.0.ebuild | 66 +++++++
kde-frameworks/kwallet-runtime/metadata.xml | 21 +++
4 files changed, 277 insertions(+)
diff --git a/kde-frameworks/kwallet-runtime/Manifest b/kde-frameworks/kwallet-runtime/Manifest
new file mode 100644
index 000000000000..9f7bcc47d915
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/Manifest
@@ -0,0 +1 @@
+DIST kwallet-6.14.0.tar.xz 365196 BLAKE2B 0770d7520b553c66bf6862d46e3caf64aad6b8d22ff0ff7cecbfe5a7a541c229e1882b106cd07e54347469ed38c403a162380ce973873549e848983f73b09de0 SHA512 3d3af678f808db4ab5851608e3909d3eff236b6f3c114a8efc1b6723024e6c14d26c82381323a82ce9d2ed83b77be9b8a26e0a96b67766379e83c65d39330a94
diff --git a/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-stdalone.patch b/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-stdalone.patch
new file mode 100644
index 000000000000..5fc7b3bfb69c
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/files/kwallet-runtime-6.14.0-stdalone.patch
@@ -0,0 +1,189 @@
+From 8e59e6a833dc8cec95d25fe7a1c00ba52b045060 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 30 Apr 2025 18:12:08 +0200
+Subject: [PATCH 1/2] In src/runtime, try to find system KF6Wallet if target
+ not yet exists
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/runtime/CMakeLists.txt | 4 ++++
+ src/runtime/ksecretd/CMakeLists.txt | 2 +-
+ src/runtime/ksecretd/autotests/CMakeLists.txt | 2 +-
+ src/runtime/kwallet-query/src/CMakeLists.txt | 2 +-
+ src/runtime/kwalletbackend/CMakeLists.txt | 3 +--
+ 5 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
+index b38948d1..4e833b3f 100644
+--- a/src/runtime/CMakeLists.txt
++++ b/src/runtime/CMakeLists.txt
+@@ -1,3 +1,7 @@
++if(NOT TARGET KF6::Wallet)
++ find_package(KF6Wallet ${KF_DEP_VERSION} REQUIRED)
++endif()
++
+ if(BUILD_KSECRETD OR BUILD_KWALLETD)
+ find_package(Gpgmepp 1.7.0) # provided by GpgME
+
+diff --git a/src/runtime/ksecretd/CMakeLists.txt b/src/runtime/ksecretd/CMakeLists.txt
+index 016ee52c..439254f1 100644
+--- a/src/runtime/ksecretd/CMakeLists.txt
++++ b/src/runtime/ksecretd/CMakeLists.txt
+@@ -128,7 +128,7 @@ endif ()
+
+ target_link_libraries(ksecretd
+ KF6WalletBackend
+- KF6Wallet
++ KF6::Wallet
+ Qt6::Widgets
+ KF6::I18n
+ KF6::ColorScheme
+diff --git a/src/runtime/ksecretd/autotests/CMakeLists.txt b/src/runtime/ksecretd/autotests/CMakeLists.txt
+index 2499edc6..728a34bf 100644
+--- a/src/runtime/ksecretd/autotests/CMakeLists.txt
++++ b/src/runtime/ksecretd/autotests/CMakeLists.txt
+@@ -66,7 +66,7 @@ ecm_add_test(
+ kwalletfreedesktoppromptadaptor.cpp
+ TEST_NAME fdo_secrets_test
+ LINK_LIBRARIES
+- KF6Wallet
++ KF6::Wallet
+ KF6WalletBackend
+ Qt6::Widgets
+ Qt6::Test
+diff --git a/src/runtime/kwallet-query/src/CMakeLists.txt b/src/runtime/kwallet-query/src/CMakeLists.txt
+index b809048f..dc785494 100644
+--- a/src/runtime/kwallet-query/src/CMakeLists.txt
++++ b/src/runtime/kwallet-query/src/CMakeLists.txt
+@@ -9,7 +9,7 @@ target_sources(kwallet-query PRIVATE
+
+
+ TARGET_LINK_LIBRARIES(kwallet-query
+- KF6Wallet
++ KF6::Wallet
+ KF6::CoreAddons
+ KF6::I18n
+ Qt6::Widgets
+diff --git a/src/runtime/kwalletbackend/CMakeLists.txt b/src/runtime/kwalletbackend/CMakeLists.txt
+index b7849dc7..e883b77a 100644
+--- a/src/runtime/kwalletbackend/CMakeLists.txt
++++ b/src/runtime/kwalletbackend/CMakeLists.txt
+@@ -36,8 +36,6 @@ set_target_properties(KF6WalletBackend PROPERTIES
+ SOVERSION ${KWALLETBACKEND_SOVERSION}
+ )
+
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../api/KWallet)
+-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../api/KWallet)
+ include_directories(${LIBGCRYPT_INCLUDE_DIRS})
+
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+@@ -71,6 +69,7 @@ target_link_libraries(KF6WalletBackend
+ KF6::CoreAddons
+ KF6::Notifications
+ KF6::I18n
++ KF6::Wallet
+ ${LIBGCRYPT_LIBRARIES}
+ ${Qca_LIBRARY}
+ )
+--
+2.49.0
+
+
+From ff4bbd29e92570836f0a2dab2ef7e714b5cfa42a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 30 Apr 2025 18:02:08 +0200
+Subject: [PATCH 2/2] Split runtime logging categories into separate file
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 6 ------
+ src/api/CMakeLists.txt | 6 ++++++
+ src/runtime/CMakeLists.txt | 6 ++++++
+ src/runtime/ksecretd/CMakeLists.txt | 2 +-
+ src/runtime/kwalletbackend/CMakeLists.txt | 2 +-
+ src/runtime/kwalletd/CMakeLists.txt | 2 +-
+ 6 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4ec4ca79..3c0163d7 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,9 +1,3 @@
+
+ add_subdirectory(api)
+ add_subdirectory(runtime)
+-
+-ecm_qt_install_logging_categories(
+- EXPORT KWALLET
+- FILE kwallet.categories
+- DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+-)
+diff --git a/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
+index ef921ee4..b4810d80 100644
+--- a/src/api/CMakeLists.txt
++++ b/src/api/CMakeLists.txt
+@@ -1,2 +1,8 @@
+
+ add_subdirectory(KWallet)
++
++ecm_qt_install_logging_categories(
++ EXPORT KWALLET
++ FILE kwallet.categories
++ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
++)
+diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
+index 4e833b3f..3705c45d 100644
+--- a/src/runtime/CMakeLists.txt
++++ b/src/runtime/CMakeLists.txt
+@@ -25,3 +25,9 @@ endif()
+ if(BUILD_KWALLET_QUERY)
+ add_subdirectory(kwallet-query)
+ endif()
++
++ecm_qt_install_logging_categories(
++ EXPORT KWALLET_RUNTIME
++ FILE kwallet-runtime.categories
++ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
++)
+diff --git a/src/runtime/ksecretd/CMakeLists.txt b/src/runtime/ksecretd/CMakeLists.txt
+index 439254f1..75ccd198 100644
+--- a/src/runtime/ksecretd/CMakeLists.txt
++++ b/src/runtime/ksecretd/CMakeLists.txt
+@@ -66,7 +66,7 @@ ecm_qt_declare_logging_category(ksecretd
+ CATEGORY_NAME kf.wallet.ksecretd
+ OLD_CATEGORY_NAMES kf5.kwallet.ksecretd
+ DESCRIPTION "ksecretd"
+- EXPORT KWALLET
++ EXPORT KWALLET_RUNTIME
+ )
+
+ ki18n_wrap_ui(ksecretd
+diff --git a/src/runtime/kwalletbackend/CMakeLists.txt b/src/runtime/kwalletbackend/CMakeLists.txt
+index e883b77a..95ea54c1 100644
+--- a/src/runtime/kwalletbackend/CMakeLists.txt
++++ b/src/runtime/kwalletbackend/CMakeLists.txt
+@@ -55,7 +55,7 @@ ecm_qt_declare_logging_category(KF6WalletBackend
+ CATEGORY_NAME kf.wallet.backend
+ OLD_CATEGORY_NAMES kf5.kwallet.kwalletbackend
+ DESCRIPTION "kwalletbackend"
+- EXPORT KWALLET
++ EXPORT KWALLET_RUNTIME
+ )
+
+
+diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt
+index 627fb69c..4a5f6135 100644
+--- a/src/runtime/kwalletd/CMakeLists.txt
++++ b/src/runtime/kwalletd/CMakeLists.txt
+@@ -54,7 +54,7 @@ ecm_qt_declare_logging_category(kwalletd6
+ IDENTIFIER KWALLETD_LOG
+ CATEGORY_NAME kf.wallet.kwalletd
+ DESCRIPTION "kwalletd"
+- EXPORT KWALLET
++ EXPORT KWALLET_RUNTIME
+ )
+
+ target_link_libraries(kwalletd6
+--
+2.49.0
+
diff --git a/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0.ebuild b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0.ebuild
new file mode 100644
index 000000000000..52cda5ae5f24
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/kwallet-runtime-6.14.0.ebuild
@@ -0,0 +1,66 @@
+# 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}/${PN}-6.14.0-stdalone.patch" )
+
+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
+}
diff --git a/kde-frameworks/kwallet-runtime/metadata.xml b/kde-frameworks/kwallet-runtime/metadata.xml
new file mode 100644
index 000000000000..dec410a82e0b
--- /dev/null
+++ b/kde-frameworks/kwallet-runtime/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=frameworks-kwallet</bugs-to>
+ <remote-id type="kde-invent">frameworks/kwallet</remote-id>
+ </upstream>
+ <use>
+ <flag name="gpg">Support wallets with GnuPG encryption in addition to the default blowfish-encrypted file</flag>
+ <flag name="legacy-kwallet">Support KWallet D-Bus API for applications still using it</flag>
+ </use>
+ <slots>
+ <subslots>
+ Must only be used by packages that are known to use private parts of the Frameworks API.
+ </subslots>
+ </slots>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-16 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-15 15:35 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet-runtime/files/, kde-frameworks/kwallet-runtime/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-05-16 16:41 Andreas Sturmlechner
2025-05-13 21:12 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox