proj/kde:master commit in: kde-frameworks/kwallet-runtime/
"Andreas Sturmlechner" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1786283071.7b79f49dfb94fe34ee61df6ed5f14290871529b3.asturm@gentoo> |
commit: 7b79f49dfb94fe34ee61df6ed5f14290871529b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 9 09:15:32 2026 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 13:44:31 2026 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7b79f49d
kde-frameworks/kwallet-runtime: Remove kwalletsettings.kcfg from install
It is provided by kde-frameworks/kwallet.
Upstream commit dc47c0410ca4a5dd060ba949c3c066afa5cca118
Follow-up to eca2a6f29bf3abfd2ae825b20d213c150100f3e6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kwallet-runtime/kwallet-runtime-9999.ebuild | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/kde-frameworks/kwallet-runtime/kwallet-runtime-9999.ebuild b/kde-frameworks/kwallet-runtime/kwallet-runtime-9999.ebuild
index 321272d4b3..f5d1a094a2 100644
--- a/kde-frameworks/kwallet-runtime/kwallet-runtime-9999.ebuild
+++ b/kde-frameworks/kwallet-runtime/kwallet-runtime-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}
"
BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )"
-PATCHES=( "${FILESDIR}/${PN}-6.29.0-stdalone.patch" )
+PATCHES=( "${FILESDIR}/${P}-stdalone.patch" )
src_prepare() {
ecm_src_prepare
@@ -59,13 +59,18 @@ src_configure() {
}
src_install() {
- ecm_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
- rm -v "${ED}"/usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.kwallet.service \
- "${ED}"/usr/share/dbus-1/services/org.kde.secretservicecompat.service || die
+ 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() {