Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/
Date: Sun, 29 Jan 2023 00:12:24
Message-Id: 1674951133.dff14b6e05b77bda4478c71e1ef9af209096dacb.asturm@gentoo
1 commit: dff14b6e05b77bda4478c71e1ef9af209096dacb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 28 23:55:53 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 00:12:13 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff14b6e
7
8 kde-frameworks/kded: Only recreate icons if an icon dir changed
9
10 Upstream commit 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e
11 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463353
12
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 ...0-only-recreate-icons-if-icon-dir-changed.patch | 34 ++++++++++++++++++
16 kde-frameworks/kded/kded-5.102.0-r1.ebuild | 42 ++++++++++++++++++++++
17 2 files changed, 76 insertions(+)
18
19 diff --git a/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
20 new file mode 100644
21 index 000000000000..3fd652bd2483
22 --- /dev/null
23 +++ b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
24 @@ -0,0 +1,34 @@
25 +From 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e Mon Sep 17 00:00:00 2001
26 +From: David Redondo <kde@×××××××××××××.de>
27 +Date: Tue, 24 Jan 2023 10:20:01 +0100
28 +Subject: [PATCH] Only recreate icons if an icon dir changed
29 +
30 +Other paths that we are watching can end in "icons"
31 +as we are watching subdirs. Make sure to not take the wrong code
32 +path and only do an icon change if one our watched icon dirs
33 +changes.
34 +BUG:463353
35 +FIXED-IN:5.103
36 +
37 +
38 +(cherry picked from commit b6a3e25e81014110f1e0f470832006cc60cbc86d)
39 +---
40 + src/kded.cpp | 2 +-
41 + 1 file changed, 1 insertion(+), 1 deletion(-)
42 +
43 +diff --git a/src/kded.cpp b/src/kded.cpp
44 +index 1f90f9c..b473f1c 100644
45 +--- a/src/kded.cpp
46 ++++ b/src/kded.cpp
47 +@@ -525,7 +525,7 @@ void Kded::dirDeleted(const QString &path)
48 +
49 + void Kded::update(const QString &path)
50 + {
51 +- if (path.endsWith(QLatin1String("/icons"))) {
52 ++ if (path.endsWith(QLatin1String("/icons")) && m_pDirWatch->contains(path)) {
53 + // If the dir was created or updated there could be new folders to merge into the active theme(s)
54 + QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
55 + message << 0;
56 +--
57 +GitLab
58 +
59
60 diff --git a/kde-frameworks/kded/kded-5.102.0-r1.ebuild b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
61 new file mode 100644
62 index 000000000000..81846924c148
63 --- /dev/null
64 +++ b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
65 @@ -0,0 +1,42 @@
66 +# Copyright 1999-2023 Gentoo Authors
67 +# Distributed under the terms of the GNU General Public License v2
68 +
69 +EAPI=8
70 +
71 +ECM_QTHELP="false"
72 +ECM_TEST="false"
73 +PVCUT=$(ver_cut 1-2)
74 +QTMIN=5.15.5
75 +inherit ecm frameworks.kde.org
76 +
77 +DESCRIPTION="Central daemon of KDE workspaces"
78 +
79 +LICENSE="LGPL-2+"
80 +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
81 +IUSE="+man"
82 +
83 +DEPEND="
84 + >=dev-qt/qtdbus-${QTMIN}:5
85 + >=dev-qt/qtgui-${QTMIN}:5
86 + >=dev-qt/qtwidgets-${QTMIN}:5
87 + =kde-frameworks/kconfig-${PVCUT}*:5[dbus]
88 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
89 + =kde-frameworks/kcrash-${PVCUT}*:5
90 + =kde-frameworks/kdbusaddons-${PVCUT}*:5
91 + =kde-frameworks/kinit-${PVCUT}*:5
92 + =kde-frameworks/kservice-${PVCUT}*:5
93 +"
94 +RDEPEND="${DEPEND}"
95 +BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
96 +
97 +PATCHES=(
98 + "${FILESDIR}/${P}-only-recreate-icons-if-icon-dir-changed.patch" # KDE-bug 463353
99 +)
100 +
101 +src_configure() {
102 + local mycmakeargs=(
103 + $(cmake_use_find_package man KF5DocTools)
104 + )
105 +
106 + ecm_src_configure
107 +}