summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-01-29 00:55:53 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2023-01-29 01:12:13 +0100
commitdff14b6e05b77bda4478c71e1ef9af209096dacb (patch)
tree3633e06b7186f1594a5cd1a9daa77bf5fe17c7f4 /kde-frameworks/kded
parentkde-frameworks/kguiaddons: Fix clipboard in Wayland session (diff)
downloadgentoo-dff14b6e05b77bda4478c71e1ef9af209096dacb.tar.gz
gentoo-dff14b6e05b77bda4478c71e1ef9af209096dacb.tar.bz2
gentoo-dff14b6e05b77bda4478c71e1ef9af209096dacb.zip
kde-frameworks/kded: Only recreate icons if an icon dir changed
Upstream commit 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e KDE-bug: https://bugs.kde.org/show_bug.cgi?id=463353 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kded')
-rw-r--r--kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch34
-rw-r--r--kde-frameworks/kded/kded-5.102.0-r1.ebuild42
2 files changed, 76 insertions, 0 deletions
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
new file mode 100644
index 000000000000..3fd652bd2483
--- /dev/null
+++ b/kde-frameworks/kded/files/kded-5.102.0-only-recreate-icons-if-icon-dir-changed.patch
@@ -0,0 +1,34 @@
+From 23cb03267ae1b1cdb8a75be1992d2fbf122aaa6e Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 24 Jan 2023 10:20:01 +0100
+Subject: [PATCH] Only recreate icons if an icon dir changed
+
+Other paths that we are watching can end in "icons"
+as we are watching subdirs. Make sure to not take the wrong code
+path and only do an icon change if one our watched icon dirs
+changes.
+BUG:463353
+FIXED-IN:5.103
+
+
+(cherry picked from commit b6a3e25e81014110f1e0f470832006cc60cbc86d)
+---
+ src/kded.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kded.cpp b/src/kded.cpp
+index 1f90f9c..b473f1c 100644
+--- a/src/kded.cpp
++++ b/src/kded.cpp
+@@ -525,7 +525,7 @@ void Kded::dirDeleted(const QString &path)
+
+ void Kded::update(const QString &path)
+ {
+- if (path.endsWith(QLatin1String("/icons"))) {
++ if (path.endsWith(QLatin1String("/icons")) && m_pDirWatch->contains(path)) {
+ // If the dir was created or updated there could be new folders to merge into the active theme(s)
+ QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KIconLoader"), QStringLiteral("org.kde.KIconLoader"), QStringLiteral("iconChanged"));
+ message << 0;
+--
+GitLab
+
diff --git a/kde-frameworks/kded/kded-5.102.0-r1.ebuild b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
new file mode 100644
index 000000000000..81846924c148
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.102.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="false"
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.5
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Central daemon of KDE workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+man"
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/kconfig-${PVCUT}*:5[dbus]
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/kcrash-${PVCUT}*:5
+ =kde-frameworks/kdbusaddons-${PVCUT}*:5
+ =kde-frameworks/kinit-${PVCUT}*:5
+ =kde-frameworks/kservice-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-only-recreate-icons-if-icon-dir-changed.patch" # KDE-bug 463353
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package man KF5DocTools)
+ )
+
+ ecm_src_configure
+}