mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
kde-frameworks/kwallet: drop 6.13.0-r2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user