summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2025-07-05 14:36:51 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2025-07-05 15:12:06 +0200
commit29f08bfb273689c553296b250439f00bf3d27fcf (patch)
tree37fff23e31d20c14f5d6c194de1d4934ea148580
parent3815a558d2c8cbc396748cf62fcfec44519e632f (diff)
downloadkde-29f08bfb273689c553296b250439f00bf3d27fcf.tar.gz
kde-29f08bfb273689c553296b250439f00bf3d27fcf.tar.bz2
kde-29f08bfb273689c553296b250439f00bf3d27fcf.zip
kde-frameworks/kwallet: Drop upstreamed patch
Upstream commit 8ebeb462c39700e907d6f704dc29c5dba8748e57 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-frameworks/kwallet/files/kwallet-6.14.0-deps.patch75
-rw-r--r--kde-frameworks/kwallet/kwallet-9999.ebuild2
2 files changed, 0 insertions, 77 deletions
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 d6e28156f24..00000000000
--- 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-9999.ebuild b/kde-frameworks/kwallet/kwallet-9999.ebuild
index 4719284cad6..8fbfd1e41e4 100644
--- a/kde-frameworks/kwallet/kwallet-9999.ebuild
+++ b/kde-frameworks/kwallet/kwallet-9999.ebuild
@@ -19,8 +19,6 @@ DEPEND="
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