public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/
Date: Sun, 29 Jan 2023 00:12:20 +0000 (UTC)	[thread overview]
Message-ID: <1674951133.dff14b6e05b77bda4478c71e1ef9af209096dacb.asturm@gentoo> (raw)

commit:     dff14b6e05b77bda4478c71e1ef9af209096dacb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 23:55:53 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 00:12:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff14b6e

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 <AT> gentoo.org>

 ...0-only-recreate-icons-if-icon-dir-changed.patch | 34 ++++++++++++++++++
 kde-frameworks/kded/kded-5.102.0-r1.ebuild         | 42 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)

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
+}


             reply	other threads:[~2023-01-29  0:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-29  0:12 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-04-22 16:21 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kded/files/, kde-frameworks/kded/ Andreas Sturmlechner
2017-12-02 21:57 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1674951133.dff14b6e05b77bda4478c71e1ef9af209096dacb.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox