* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet/files/, kde-frameworks/kwallet/
@ 2015-08-24 16:09 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-08-24 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 00bed7ea5a1386081ede9aef3d629e6757d2d668
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 16:09:01 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 16:09:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00bed7ea
kde-frameworks/kwallet: backport patch from upstream to avoid unwanted migration dialogues.
Package-Manager: portage-2.2.20.1
.../kwallet/files/kwallet-5.13.0-migration.patch | 152 +++++++++++++++++++++
kde-frameworks/kwallet/kwallet-5.13.0-r1.ebuild | 43 ++++++
2 files changed, 195 insertions(+)
diff --git a/kde-frameworks/kwallet/files/kwallet-5.13.0-migration.patch b/kde-frameworks/kwallet/files/kwallet-5.13.0-migration.patch
new file mode 100644
index 0000000..760a167
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.13.0-migration.patch
@@ -0,0 +1,152 @@
+From 127efedd1668b546d0ac8c83655a2056d0439f29 Mon Sep 17 00:00:00 2001
+From: Valentin Rusu <kde@rusu.info>
+Date: Fri, 7 Aug 2015 18:59:04 +0200
+Subject: [PATCH] Stop showing the migration wizard by default
+
+BUG:351056
+
+If the migration wizard is needed, then add this to kwalletrc
+[Migration]
+showMigrationWizard=true
+
+On systems having kwallet-pam the migration agent would also merge all the old
+wallets into the default LocalWallet, as a side effect. This would avoid
+wallet creation prompts, though.
+---
+ src/runtime/kwalletd/main.cpp | 2 +-
+ src/runtime/kwalletd/migrationagent.cpp | 42 ++++++++++++++++++++++++++------
+ src/runtime/kwalletd/migrationagent.h | 5 ++--
+ src/runtime/kwalletd/migrationwizard.cpp | 2 +-
+ 4 files changed, 39 insertions(+), 12 deletions(-)
+
+diff --git a/src/runtime/kwalletd/main.cpp b/src/runtime/kwalletd/main.cpp
+index c0fecaa..62fcd3a 100644
+--- a/src/runtime/kwalletd/main.cpp
++++ b/src/runtime/kwalletd/main.cpp
+@@ -186,7 +186,7 @@ int main(int argc, char **argv)
+ aboutdata.addAuthor(i18n("Thiago Maceira"), i18n("D-Bus Interface"), "thiago@kde.org");
+
+ KWalletD walletd;
+- MigrationAgent migrationAgent(&walletd);
++ MigrationAgent migrationAgent(&walletd, hash);
+ KDBusService dbusUniqueInstance(KDBusService::Unique | KDBusService::NoExitOnFailure);
+
+ // NOTE: the command should be parsed only after KDBusService instantiation
+diff --git a/src/runtime/kwalletd/migrationagent.cpp b/src/runtime/kwalletd/migrationagent.cpp
+index 6eaeb12..192a871 100644
+--- a/src/runtime/kwalletd/migrationagent.cpp
++++ b/src/runtime/kwalletd/migrationagent.cpp
+@@ -34,10 +34,12 @@
+
+ #define SERVICE_KWALLETD4 "org.kde.kwalletd"
+ #define ENTRY_ALREADY_MIGRATED "alreadyMigrated"
++#define ENTRY_SHOW_MIGRATION_WIZARD "showMigrationWizard"
+
+-MigrationAgent::MigrationAgent(KWalletD* kd) :
++MigrationAgent::MigrationAgent(KWalletD* kd, const char *hash) :
+ _kf5_daemon(kd)
+ , _kde4_daemon(0)
++ , _pam_hash(hash)
+ {
+ QTimer::singleShot(100, this, SLOT(migrateWallets()));
+ }
+@@ -118,11 +120,27 @@ bool MigrationAgent::isMigrationWizardOk()
+ {
+ bool ok = false;
+
+- MigrationWizard *wizard = new MigrationWizard(this);
+- int result = wizard->exec();
+- if (QDialog::Accepted == result) {
+- // the user either migrated the wallets, or choose not to be prompted again
+- ok = true;
++ // The migration wizard would no longer been shown by default.
++ // see BUG 351056
++ // NOTE if user wants to show the migration wizard, then he should add the
++ // following setting to the kwalletrc:
++ // [Migration]
++ // showMigrationWizard=true
++ KConfig kwalletrc("kwalletrc");
++ KConfigGroup cfg(&kwalletrc, "Migration");
++ bool showMigrationWizard = cfg.readEntry<bool>(ENTRY_SHOW_MIGRATION_WIZARD, false);
++
++ if (showMigrationWizard) {
++ MigrationWizard *wizard = new MigrationWizard(this);
++ int result = wizard->exec();
++ if (QDialog::Accepted == result) {
++ // the user either migrated the wallets, or choose not to be prompted again
++ ok = true;
++ }
++ } else {
++ if (performMigration(0, true)) {
++ qDebug() << "Migration failed.";
++ }
+ }
+
+ return ok;
+@@ -162,7 +180,7 @@ bool MigrationAgent::isEmptyOldWallet() const {
+ return wallets.length() == 0;
+ }
+
+-bool MigrationAgent::performMigration(WId wid)
++bool MigrationAgent::performMigration(WId wid, bool withoutWizard)
+ {
+ auto appId = i18n("KDE Wallet Migration Agent");
+ try {
+@@ -174,7 +192,15 @@ bool MigrationAgent::performMigration(WId wid)
+ emit progressMessage(i18n("Migrating wallet: %1", wallet));
+ emit progressMessage(i18n("* Creating KF5 wallet: %1", wallet));
+
+- int handle5 = _kf5_daemon->internalOpen(appId, wallet, false, 0, true, QString());
++ int handle5 = -1;
++ if (withoutWizard && (_pam_hash != nullptr)) {
++ // see BUG 351056 for why this hacky code
++ // If the user has several wallets, all the values will be
++ // merged into the single LocalWallet
++ handle5 = _kf5_daemon->pamOpen(KWallet::Wallet::LocalWallet(), _pam_hash, 0);
++ } else {
++ handle5 = _kf5_daemon->internalOpen(appId, wallet, false, 0, true, QString());
++ }
+ if (handle5 <0) {
+ emit progressMessage(i18n("ERROR when attempting new wallet creation. Aborting."));
+ return false;
+diff --git a/src/runtime/kwalletd/migrationagent.h b/src/runtime/kwalletd/migrationagent.h
+index 55a251d..c52509e 100644
+--- a/src/runtime/kwalletd/migrationagent.h
++++ b/src/runtime/kwalletd/migrationagent.h
+@@ -32,10 +32,10 @@ class KWalletD;
+ class MigrationAgent : public QObject {
+ Q_OBJECT
+ public:
+- MigrationAgent(KWalletD* kd);
++ MigrationAgent(KWalletD* kd, const char* hash);
+
+ bool isEmptyOldWallet() const;
+- bool performMigration(WId wid);
++ bool performMigration(WId wid, bool withoutWizard);
+
+ private Q_SLOTS:
+ void migrateWallets();
+@@ -52,6 +52,7 @@ Q_SIGNALS:
+ private:
+ KWalletD *_kf5_daemon;
+ org::kde::KWallet *_kde4_daemon;
++ const char *_pam_hash;
+ };
+
+ #endif // _MIGRATIONAGENT_H_
+diff --git a/src/runtime/kwalletd/migrationwizard.cpp b/src/runtime/kwalletd/migrationwizard.cpp
+index b7d3f70..cdd2a92 100644
+--- a/src/runtime/kwalletd/migrationwizard.cpp
++++ b/src/runtime/kwalletd/migrationwizard.cpp
+@@ -58,7 +58,7 @@ public:
+
+ virtual void initializePage() {
+ connect(_agent, SIGNAL(progressMessage(QString)), _ui._report, SLOT(append(QString)));
+- _migrationCompleted = _agent->performMigration(winId());
++ _migrationCompleted = _agent->performMigration(winId(), false);
+ emit completeChanged();
+ }
+
+--
+2.4.6
+
diff --git a/kde-frameworks/kwallet/kwallet-5.13.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-5.13.0-r1.ebuild
new file mode 100644
index 0000000..6d03bf7
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.13.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpg"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-libs/libgcrypt:0=
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ gpg? (
+ $(add_kdeapps_dep gpgmepp)
+ app-crypt/gpgme
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-migration.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package gpg Gpgme)
+ $(cmake-utils_use_find_package gpg KF5Gpgmepp)
+ )
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet/files/, kde-frameworks/kwallet/
@ 2016-09-28 9:49 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2016-09-28 9:49 UTC (permalink / raw
To: gentoo-commits
commit: a6d4f3a58e776ceb93484ce8122419f2eb57998a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 25 20:41:53 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 09:49:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d4f3a5
kde-frameworks/kwallet: Add missing boost header
Fixes build error with GpgME-1.7.0 (which was ported away from boost).
Gentoo-bug: 595096
Package-Manager: portage-2.3.0
| 22 ++++++++++++++++++++++
kde-frameworks/kwallet/kwallet-5.26.0.ebuild | 2 ++
2 files changed, 24 insertions(+)
--git a/kde-frameworks/kwallet/files/kwallet-5.26.0-missing-boost-header.patch b/kde-frameworks/kwallet/files/kwallet-5.26.0-missing-boost-header.patch
new file mode 100644
index 00000000..8bf16f0
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-5.26.0-missing-boost-header.patch
@@ -0,0 +1,22 @@
+commit 0ae542bfa6e266ead736d6cca5f979dac75e24f2
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Sep 25 14:56:55 2016 +0200
+
+ Add missing boost header
+
+ Fixes build error with GpgME-1.7.0 (which was ported away from boost).
+
+ REVIEW: 129012
+
+diff --git a/src/runtime/kwalletd/kwalletwizard.cpp b/src/runtime/kwalletd/kwalletwizard.cpp
+index bf36f3b..cd52e54 100644
+--- a/src/runtime/kwalletd/kwalletwizard.cpp
++++ b/src/runtime/kwalletd/kwalletwizard.cpp
+@@ -39,6 +39,7 @@
+ #include <QDebug>
+ #include <kmessagebox.h>
+ #include <gpgme.h>
++#include <boost/shared_ptr.hpp>
+ #endif
+
+ class PageIntro : public QWizardPage
diff --git a/kde-frameworks/kwallet/kwallet-5.26.0.ebuild b/kde-frameworks/kwallet/kwallet-5.26.0.ebuild
index a9f8152..b9a5850 100644
--- a/kde-frameworks/kwallet/kwallet-5.26.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.26.0.ebuild
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
man? ( $(add_frameworks_dep kdoctools) )
"
+PATCHES=( "${FILESDIR}/${P}-missing-boost-header.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package gpg Gpgme)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet/files/, kde-frameworks/kwallet/
@ 2025-01-27 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-01-27 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 3b5d77ab6d5e437fa8c8ef41f72146c73e79f023
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 18:16:13 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 18:42:34 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5d77ab
kde-frameworks/kwallet: drop 6.7.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kwallet/Manifest | 1 -
.../kwallet-6.7.0-no-exclude-deprecated.patch | 34 -------------
kde-frameworks/kwallet/kwallet-6.7.0-r1.ebuild | 55 ----------------------
3 files changed, 90 deletions(-)
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 3f9940fca7ef..cc5f26f45790 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,4 +1,3 @@
DIST kwallet-5.116.0.tar.xz 353948 BLAKE2B d8c38a71e72ea9ce316a9f5af440c502b4e21b69f9ae40e740a209bde3aaa6519dd26079c99ffe1b7441a464c1ebdb34b550f9127be89c0f2baede68003eb462 SHA512 fc96b2e87e565dadb960159c5412cc0862454331824510405f434dfda2146ecf4e2ca133345c0c46608143da10265f154a0225f4d8d82ae6f11a184b222d663d
DIST kwallet-6.10.0.tar.xz 358140 BLAKE2B 1157f45a3de89056a47677e7d9217619971ea3cc707549a859128c3a1bcc3637e022dad3917b41e388fc236d3b00ffd739993faad5034837927ce88a6c2408a8 SHA512 03a24d9e6eaad2b6c5a3c4e16b2b13847243259637cd0e113ba8c53a97a420f14dccb21f9bae79ad2823b5d6fd2461af40e9c8d6cc44d2d47528cd6106a7ec09
-DIST kwallet-6.7.0.tar.xz 353868 BLAKE2B 3799c6aa0978f4e5e0fb1afc694235e596d2c8df912ef1408455d21c1504e3cd67ae6be078791040edd63dfc8ac2abbf56c0aa7501fab7bd18fc1b8e35e5378e SHA512 acbc02873e8e73c0162f96b508df3ba4a58eb845d5e3970af1a243107701f52a317f350fefd907f27979a6b8ebe27d0d74f740ede395aef29774b25e03a259fe
DIST kwallet-6.9.0.tar.xz 353824 BLAKE2B fabc528687e1aa101616e8040d7858cf368155c0a62224816139c96000f7b82dfd962a924c0c859b52ce34a653fab20cb4f79797451c9442b3bd86429eef4390 SHA512 6c220a479d4207bb741c1bd268afed8b564ef2cef8fde6b68d3a9e24ebce93b5c2ee5b60d840dd27525b733d6d5bb93b1138d7cde8ca188433959a97685b1c49
diff --git a/kde-frameworks/kwallet/files/kwallet-6.7.0-no-exclude-deprecated.patch b/kde-frameworks/kwallet/files/kwallet-6.7.0-no-exclude-deprecated.patch
deleted file mode 100644
index 0c8c00629d20..000000000000
--- a/kde-frameworks/kwallet/files/kwallet-6.7.0-no-exclude-deprecated.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 38f293ce0b025ad30d7bc1fd5c0f8dd1d3b07c6c Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 18 Oct 2024 23:15:19 +0200
-Subject: [PATCH] Don't exclude deprecated functions from build
-
-Some of the deprecated API is part of the runtime DBus interface and might be used by older applications
-
-BUG: 493356
----
- CMakeLists.txt | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c31f8e12..8cffe41e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -33,11 +33,10 @@ option(BUILD_KWALLET_QUERY "Build kwallet-query tool" ON)
- option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
- add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
-
--if (TRUE) # TODO: port and remove remaining code in v5-time deprecated parts, then return to using 0
--set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 5.99.0 CACHE STRING "Control the range of deprecated API excluded from the build [default=5.99.0].")
--else() # normal
-+# kwalletd contains functions that are marked as deprecated.
-+# These are part of the public DBus API and are used by older applications
-+# Therefore we must not exclude those by default
- set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
--endif()
-
- find_package(KF6CoreAddons ${KF_DEP_VERSION} REQUIRED)
- find_package(KF6Config ${KF_DEP_VERSION} REQUIRED)
---
-GitLab
-
diff --git a/kde-frameworks/kwallet/kwallet-6.7.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-6.7.0-r1.ebuild
deleted file mode 100644
index 3e71b5667d7f..000000000000
--- a/kde-frameworks/kwallet/kwallet-6.7.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=6.6.2
-inherit ecm frameworks.kde.org optfeature
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86"
-IUSE="gpg +man"
-
-DEPEND="
- >=app-crypt/qca-2.3.1:2[qt6(-)]
- dev-libs/libgcrypt:0=
- >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
- =kde-frameworks/kcolorscheme-${PVCUT}*:6
- =kde-frameworks/kconfig-${PVCUT}*:6
- =kde-frameworks/kcoreaddons-${PVCUT}*:6
- =kde-frameworks/kcrash-${PVCUT}*:6
- =kde-frameworks/kdbusaddons-${PVCUT}*:6
- =kde-frameworks/ki18n-${PVCUT}*:6
- =kde-frameworks/knotifications-${PVCUT}*:6
- =kde-frameworks/kservice-${PVCUT}*:6
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
- =kde-frameworks/kwindowsystem-${PVCUT}*:6[X]
- gpg? ( app-crypt/gpgme:=[qt6(-)] )
-"
-RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )"
-
-PATCHES=( "${FILESDIR}/${P}-no-exclude-deprecated.patch" ) # KDE-bug 493356
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package gpg Gpgmepp)
- $(cmake_use_find_package man KF6DocTools)
- )
-
- 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
- ecm_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet/files/, kde-frameworks/kwallet/
@ 2025-05-13 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-05-13 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 4553af16a17bd69b35176430062c6accaf64406e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 11 18:19:44 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=4553af16
kde-frameworks/kwallet: 6.14.0 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kwallet/Manifest | 1 +
.../kwallet/files/kwallet-6.14.0-deps.patch | 75 ++++++++++++++++++++++
kde-frameworks/kwallet/kwallet-6.14.0.ebuild | 32 +++++++++
3 files changed, 108 insertions(+)
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index ffa4b612cdaa..a4d87bb09370 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,3 +1,4 @@
DIST kwallet-5.116.0-patchset.tar.xz 11808 BLAKE2B a359b21889cf51f8adf8ab71b82ca6f8e0a113d96e473ee6cd9c9b31bcce508d816032db58197816ec7113fb09553af2a41da39a2901970a98c53566f9d60fd3 SHA512 2cc168bcc13002e963215d75b2a69531189de14ca2dda9cd000f9a223553c8c8b77630d84ff8d597769ee5d9ba2cef7f50be33f399225ba160bdf4bc6a2842ff
DIST kwallet-5.116.0.tar.xz 353948 BLAKE2B d8c38a71e72ea9ce316a9f5af440c502b4e21b69f9ae40e740a209bde3aaa6519dd26079c99ffe1b7441a464c1ebdb34b550f9127be89c0f2baede68003eb462 SHA512 fc96b2e87e565dadb960159c5412cc0862454331824510405f434dfda2146ecf4e2ca133345c0c46608143da10265f154a0225f4d8d82ae6f11a184b222d663d
DIST kwallet-6.13.0.tar.xz 358072 BLAKE2B 13454aee225aa0896590e88648accefd4ac426da4ef3419fa94d07055a179dccdf82a71cab10eb1ec20d6bf28a849eb8c147330aff258cb4880bc65878e85cb6 SHA512 5333a41df065cb8ed254691c4eeea6951f417f28735a8d7321c4056ad60f6845e07e0603775b18baf1bd88a48732ac79ba8c09cf413e4c8feb1459d080f739f6
+DIST kwallet-6.14.0.tar.xz 365196 BLAKE2B 0770d7520b553c66bf6862d46e3caf64aad6b8d22ff0ff7cecbfe5a7a541c229e1882b106cd07e54347469ed38c403a162380ce973873549e848983f73b09de0 SHA512 3d3af678f808db4ab5851608e3909d3eff236b6f3c114a8efc1b6723024e6c14d26c82381323a82ce9d2ed83b77be9b8a26e0a96b67766379e83c65d39330a94
diff --git a/kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch b/kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch
new file mode 100644
index 000000000000..d6e28156f246
--- /dev/null
+++ b/kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch
@@ -0,0 +1,75 @@
+https://invent.kde.org/frameworks/kwallet/-/merge_requests/112
+
+From 0993bb19ae8d8f99f6b646ef99b2a8a40149efcc Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 30 Apr 2025 17:11:55 +0200
+Subject: [PATCH] Depend on what/when we use it
+
+If KWallet library can be built w/o the runtimes, then let's define
+the deps like that as well.
+
+Only runtime has translations.
+
+Only kwallet-query has docs.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 199685e4..8b2f91d0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ include(KDEGitCommitHooks)
+ include(ECMDeprecationSettings)
+
+ set(REQUIRED_QT_VERSION 6.7.0)
+-find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
++find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Widgets)
+
+ include(ECMAddQch)
+ include(ECMGenerateExportHeader)
+@@ -47,11 +47,11 @@ endif()
+ # Therefore we must not exclude those by default
+ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
+
+-find_package(KF6CoreAddons ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF6Config ${KF_DEP_VERSION} REQUIRED)
+-find_package(KF6WindowSystem ${KF_DEP_VERSION} REQUIRED)
+-find_package(KF6I18n ${KF_DEP_VERSION} REQUIRED)
+-find_package(KF6DocTools ${KF_DEP_VERSION})
++
++if(BUILD_KSECRETD OR BUILD_KWALLETD)
++ find_package(KF6 ${KF_DEP_VERSION} REQUIRED COMPONENTS CoreAddons I18n WindowSystem)
++endif()
+
+ ecm_set_disabled_deprecation_versions(
+ QT 6.9.0
+@@ -65,15 +65,20 @@ else()
+ endif()
+
+ add_definitions(-DTRANSLATION_DOMAIN=\"ksecretd6\")
+-ki18n_install(po)
++if(BUILD_KSECRETD OR BUILD_KWALLETD OR BUILD_KWALLET_QUERY)
++ ki18n_install(po)
++endif()
+ add_subdirectory(src)
+ if (BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
+ add_subdirectory(examples)
+ endif()
+-if (KF6DocTools_FOUND)
+- add_subdirectory(docs)
++if(BUILD_KWALLET_QUERY)
++ find_package(KF6DocTools ${KF_DEP_VERSION})
++ if(KF6DocTools_FOUND)
++ add_subdirectory(docs)
++ endif()
+ endif()
+
+ include(ECMFeatureSummary)
+--
+2.49.0
+
diff --git a/kde-frameworks/kwallet/kwallet-6.14.0.ebuild b/kde-frameworks/kwallet/kwallet-6.14.0.ebuild
new file mode 100644
index 000000000000..39851cbb9bd2
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-6.14.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+QTMIN=6.7.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Interface to KWallet Framework providing desktop-wide storage for passwords"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="minimal"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ =kde-frameworks/kconfig-${KDE_CATV}*:6
+"
+RDEPEND="${DEPEND}"
+PDEPEND="!minimal? ( =kde-frameworks/kwallet-runtime-${KDE_CATV}* )"
+
+PATCHES=( "${FILESDIR}/${PN}-6.14.0-deps.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_KSECRETD=OFF
+ -DBUILD_KWALLETD=OFF
+ -DBUILD_KWALLET_QUERY=OFF
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet/files/, kde-frameworks/kwallet/
@ 2025-08-11 4:31 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2025-08-11 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 4ae2a875cd0f7d6aac47eb42e871ca0df8987232
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 19:43:37 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 04:30:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae2a875
kde-frameworks/kwallet: drop 6.13.0-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kwallet/Manifest | 1 -
.../kwallet-6.13.0-kstart-use-desktop-file.patch | 62 ------------------
.../kwallet/files/kwallet-6.14.0-deps.patch | 75 ----------------------
kde-frameworks/kwallet/kwallet-6.13.0-r2.ebuild | 54 ----------------
kde-frameworks/kwallet/metadata.xml | 1 -
5 files changed, 193 deletions(-)
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index aaa4bb37362f..1f1a1e917aea 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,4 @@
DIST kwallet-5.116.0-patchset.tar.xz 11808 BLAKE2B a359b21889cf51f8adf8ab71b82ca6f8e0a113d96e473ee6cd9c9b31bcce508d816032db58197816ec7113fb09553af2a41da39a2901970a98c53566f9d60fd3 SHA512 2cc168bcc13002e963215d75b2a69531189de14ca2dda9cd000f9a223553c8c8b77630d84ff8d597769ee5d9ba2cef7f50be33f399225ba160bdf4bc6a2842ff
DIST kwallet-5.116.0.tar.xz 353948 BLAKE2B d8c38a71e72ea9ce316a9f5af440c502b4e21b69f9ae40e740a209bde3aaa6519dd26079c99ffe1b7441a464c1ebdb34b550f9127be89c0f2baede68003eb462 SHA512 fc96b2e87e565dadb960159c5412cc0862454331824510405f434dfda2146ecf4e2ca133345c0c46608143da10265f154a0225f4d8d82ae6f11a184b222d663d
-DIST kwallet-6.13.0.tar.xz 358072 BLAKE2B 13454aee225aa0896590e88648accefd4ac426da4ef3419fa94d07055a179dccdf82a71cab10eb1ec20d6bf28a849eb8c147330aff258cb4880bc65878e85cb6 SHA512 5333a41df065cb8ed254691c4eeea6951f417f28735a8d7321c4056ad60f6845e07e0603775b18baf1bd88a48732ac79ba8c09cf413e4c8feb1459d080f739f6
DIST kwallet-6.16.0.tar.xz 364628 BLAKE2B 6fc4e61a4ba09042b80c53dfc8e18e36612a406546912a94faa45a64c308cc4ca4d4d38ecf376f30a24a52f0272963b42154bae32e3c44a59086db09084f3553 SHA512 b80066e92f1b2573919a7ec1bcd80241dc230a913ef1762e8bece7a107ab7ac91f46a0bbd1605f3941c2d0f7de1098065b5fa982f4378c7d35063872a382a715
DIST kwallet-6.17.0.tar.xz 364964 BLAKE2B 425d7b8b03829ecd45ef63139f974cdc61a1ac90dead7158734d8b7ad0b83de40c6c0e77dfa95c8bfd11863c1ff695afb3881dc882dec4bd91b408fca85190f7 SHA512 2bdf569c2423b3198e5db21c4c74d1a617e65a5f06c7126337bcd135e7b0137fb1dbd7526902339a7f6390c20c77b0e99ace2a5b8ed977b827491b3db16bf9da
diff --git a/kde-frameworks/kwallet/files/kwallet-6.13.0-kstart-use-desktop-file.patch b/kde-frameworks/kwallet/files/kwallet-6.13.0-kstart-use-desktop-file.patch
deleted file mode 100644
index c30c5f9132b8..000000000000
--- a/kde-frameworks/kwallet/files/kwallet-6.13.0-kstart-use-desktop-file.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9ef0eb38cf3c9fe57ec3edcb8aaee5e49453b2f6 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Fri, 23 May 2025 09:47:34 +0200
-Subject: [PATCH 1/2] Drop codepath for kstart5
-
-By now kstart should be available everywhere
-
-Make it consistent with startManagerForKwalletd
----
- src/runtime/kwalletd/kwalletd.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
-index 72384176..4914128b 100644
---- a/src/runtime/kwalletd/kwalletd.cpp
-+++ b/src/runtime/kwalletd/kwalletd.cpp
-@@ -58,8 +58,6 @@ static void startManagerForKSecretD()
- {
- if (!QStandardPaths::findExecutable(QStringLiteral("kstart")).isEmpty()) {
- QProcess::startDetached(QStringLiteral("kstart"), {QStringLiteral("kwalletmanager5"), QStringLiteral("--"), QStringLiteral("--kwalletd")});
-- } else if (!QStandardPaths::findExecutable(QStringLiteral("kstart5")).isEmpty()) {
-- QProcess::startDetached(QStringLiteral("kstart"), {QStringLiteral("kwalletmanager5"), QStringLiteral("--"), QStringLiteral("--kwalletd")});
- } else {
- QProcess::startDetached(QStringLiteral("kwalletmanager5"), QStringList{QStringLiteral("--kwalletd")});
- }
---
-GitLab
-
-
-From ec907efee65039f148f3cabb33e6df64ddd6e09b Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 22 May 2025 11:00:40 +0200
-Subject: [PATCH 2/2] Use desktop file to launch kwalletmanager
-
-kstart puts the started process in a cgroup, which is good
-and what we want. However when started like this the cgroup
-naming doesn't follow the standard pattern to encode the desktop
-file name so tools like plasma-systemmonitor can't resolve
-the desktop file from it.
-
-Instead of giving the raw command ask kstart to start the
-corresponding desktop file, which makes this work
----
- src/runtime/kwalletd/kwalletd.cpp | 2 +-
- 1 file changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
-index 537c4b75..34e896d1 100644
---- a/src/runtime/kwalletd/kwalletd.cpp
-+++ b/src/runtime/kwalletd/kwalletd.cpp
-@@ -25,7 +25,7 @@ unsigned int KWalletD::s_lastTransaction = 0;
- static void startManagerForKwalletd()
- {
- if (!QStandardPaths::findExecutable(QStringLiteral("kstart")).isEmpty()) {
-- QProcess::startDetached(QStringLiteral("kstart"), {QStringLiteral("kwalletmanager5"), QStringLiteral("--"), QStringLiteral("--kwalletd")});
-+ QProcess::startDetached(QStringLiteral("kstart"), {QStringLiteral("--application"), QStringLiteral("kwalletmanager5-kwalletd")});
- } else {
- QProcess::startDetached(QStringLiteral("kwalletmanager5"), QStringList{QStringLiteral("--kwalletd")});
- }
---
-GitLab
-
diff --git a/kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch b/kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch
deleted file mode 100644
index d6e28156f246..000000000000
--- a/kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://invent.kde.org/frameworks/kwallet/-/merge_requests/112
-
-From 0993bb19ae8d8f99f6b646ef99b2a8a40149efcc Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 30 Apr 2025 17:11:55 +0200
-Subject: [PATCH] Depend on what/when we use it
-
-If KWallet library can be built w/o the runtimes, then let's define
-the deps like that as well.
-
-Only runtime has translations.
-
-Only kwallet-query has docs.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 199685e4..8b2f91d0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(KDEGitCommitHooks)
- include(ECMDeprecationSettings)
-
- set(REQUIRED_QT_VERSION 6.7.0)
--find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
-+find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Widgets)
-
- include(ECMAddQch)
- include(ECMGenerateExportHeader)
-@@ -47,11 +47,11 @@ endif()
- # Therefore we must not exclude those by default
- set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
-
--find_package(KF6CoreAddons ${KF_DEP_VERSION} REQUIRED)
- find_package(KF6Config ${KF_DEP_VERSION} REQUIRED)
--find_package(KF6WindowSystem ${KF_DEP_VERSION} REQUIRED)
--find_package(KF6I18n ${KF_DEP_VERSION} REQUIRED)
--find_package(KF6DocTools ${KF_DEP_VERSION})
-+
-+if(BUILD_KSECRETD OR BUILD_KWALLETD)
-+ find_package(KF6 ${KF_DEP_VERSION} REQUIRED COMPONENTS CoreAddons I18n WindowSystem)
-+endif()
-
- ecm_set_disabled_deprecation_versions(
- QT 6.9.0
-@@ -65,15 +65,20 @@ else()
- endif()
-
- add_definitions(-DTRANSLATION_DOMAIN=\"ksecretd6\")
--ki18n_install(po)
-+if(BUILD_KSECRETD OR BUILD_KWALLETD OR BUILD_KWALLET_QUERY)
-+ ki18n_install(po)
-+endif()
- add_subdirectory(src)
- if (BUILD_TESTING)
- add_subdirectory(autotests)
- add_subdirectory(tests)
- add_subdirectory(examples)
- endif()
--if (KF6DocTools_FOUND)
-- add_subdirectory(docs)
-+if(BUILD_KWALLET_QUERY)
-+ find_package(KF6DocTools ${KF_DEP_VERSION})
-+ if(KF6DocTools_FOUND)
-+ add_subdirectory(docs)
-+ endif()
- endif()
-
- include(ECMFeatureSummary)
---
-2.49.0
-
diff --git a/kde-frameworks/kwallet/kwallet-6.13.0-r2.ebuild b/kde-frameworks/kwallet/kwallet-6.13.0-r2.ebuild
deleted file mode 100644
index 5e74073f6538..000000000000
--- a/kde-frameworks/kwallet/kwallet-6.13.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 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/kwidgetsaddons-${KDE_CATV}*:6
- =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?]
- gpg? ( app-crypt/gpgme:=[qt6(-)] )
-"
-RDEPEND="${DEPEND}
- !<kde-frameworks/kwallet-5.116.0-r2:5[-kf6compat(-)]
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
-
-PATCHES=( "${FILESDIR}/${P}-kstart-use-desktop-file.patch" ) # bug 957631, in 6.15
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package gpg Gpgmepp)
- $(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/metadata.xml b/kde-frameworks/kwallet/metadata.xml
index af58e0b6e4f0..c2992c611657 100644
--- a/kde-frameworks/kwallet/metadata.xml
+++ b/kde-frameworks/kwallet/metadata.xml
@@ -10,7 +10,6 @@
<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="minimal">Pull in required runtime components for KWallet via <pkg>kde-frameworks/kwallet</pkg></flag>
</use>
<slots>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-08-11 4:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-27 18:43 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kwallet/files/, kde-frameworks/kwallet/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-08-11 4:31 Andreas Sturmlechner
2025-05-13 21:12 Andreas Sturmlechner
2016-09-28 9:49 Michael Palimaka
2015-08-24 16:09 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox