* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/files/, kde-frameworks/kiconthemes/
@ 2021-04-04 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 33d9a83ffd4af95fe91811d508ba23f3bce5112f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 11:22:17 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 13:19:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d9a83f
kde-frameworks/kiconthemes: Fix SVG icon display, QGnomePlatform fix
Upstream commits:
3262669e3abfa7171463e3bf34f7c60eacf6bc77
5a5d7b57fee23d934d90989133f870404557ff6f
e4fb7dda788e5dc44ada56f089053453f3ff0c1c
See also: https://invent.kde.org/frameworks/kiconthemes/-/merge_requests/26
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434451
Reported-by: Gerion Entrup <gerion.entrup <AT> flump.de>
Closes: https://bugs.gentoo.org/779079
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kiconthemes-5.80.0-fix-svg-icons.patch | 22 +++++
....0-revert-avoid-plugin-load-racecondition.patch | 68 ++++++++++++++++
| 95 ++++++++++++++++++++++
.../kiconthemes/kiconthemes-5.80.0-r1.ebuild | 38 +++++++++
4 files changed, 223 insertions(+)
diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-fix-svg-icons.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-fix-svg-icons.patch
new file mode 100644
index 00000000000..adaef7a0f2b
--- /dev/null
+++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-fix-svg-icons.patch
@@ -0,0 +1,22 @@
+From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Fri, 19 Mar 2021 19:56:07 +0100
+Subject: [PATCH] don't register our engine per default
+
+---
+ src/kiconengineplugin.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kiconengineplugin.json b/src/kiconengineplugin.json
+index a5b4228..bc09e41 100644
+--- a/src/kiconengineplugin.json
++++ b/src/kiconengineplugin.json
+@@ -1,4 +1,4 @@
+ {
+- "Keys": [ "KIconEngine", "svg", "svgz", "svg.gz" ]
++ "Keys": [ "KIconEngine" ]
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-avoid-plugin-load-racecondition.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-avoid-plugin-load-racecondition.patch
new file mode 100644
index 00000000000..4af27c7d7c1
--- /dev/null
+++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-avoid-plugin-load-racecondition.patch
@@ -0,0 +1,68 @@
+From e4fb7dda788e5dc44ada56f089053453f3ff0c1c Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Mon, 29 Mar 2021 19:42:15 +0200
+Subject: [PATCH] Revert "avoid race condition on loading the plugin"
+
+This reverts commit 65ee2fac5eae6f69a6c72b315f0e5d702f1c4493.
+---
+ src/kiconloader.cpp | 12 ------------
+ src/kicontheme.cpp | 12 ++++++++++++
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 33c378b..f608966 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -383,8 +383,6 @@ public:
+ bool mCustomPalette = false;
+ };
+
+-extern void initRCCIconTheme();
+-
+ class KIconLoaderGlobalData : public QObject
+ {
+ Q_OBJECT
+@@ -392,16 +390,6 @@ class KIconLoaderGlobalData : public QObject
+ public:
+ KIconLoaderGlobalData()
+ {
+- // ensure we load rcc files for application bundles (+ setup their theme)
+- initRCCIconTheme();
+-
+- // Set the icon theme fallback to breeze
+- // Most of our apps use "lots" of icons that most of the times
+- // are only available with breeze, we still honour the user icon
+- // theme but if the icon is not found there, we go to breeze
+- // since it's almost sure it'll be there
+- QIcon::setFallbackThemeName(QStringLiteral("breeze"));
+-
+ const QStringList genericIconsFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime/generic-icons"));
+ // qCDebug(KICONTHEMES) << genericIconsFiles;
+ for (const QString &file : genericIconsFiles) {
+diff --git a/src/kicontheme.cpp b/src/kicontheme.cpp
+index 8e499d2..5be083d 100644
+--- a/src/kicontheme.cpp
++++ b/src/kicontheme.cpp
+@@ -57,7 +57,19 @@ void initRCCIconTheme()
+ }
+ }
+ }
++Q_COREAPP_STARTUP_FUNCTION(initRCCIconTheme)
+
++// Set the icon theme fallback to breeze
++// Most of our apps use "lots" of icons that most of the times
++// are only available with breeze, we still honour the user icon
++// theme but if the icon is not found there, we go to breeze
++// since it's almost sure it'll be there
++static void setBreezeFallback()
++{
++ QIcon::setFallbackThemeName(QStringLiteral("breeze"));
++}
++
++Q_COREAPP_STARTUP_FUNCTION(setBreezeFallback)
+ class KIconThemeDir;
+ class KIconThemePrivate
+ {
+--
+GitLab
+
--git a/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-private-header-to-avoid-extern.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-private-header-to-avoid-extern.patch
new file mode 100644
index 00000000000..e861ce6c73f
--- /dev/null
+++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-private-header-to-avoid-extern.patch
@@ -0,0 +1,95 @@
+From 5a5d7b57fee23d934d90989133f870404557ff6f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Mon, 29 Mar 2021 19:41:56 +0200
+Subject: [PATCH] Revert "add private header to avoid extern in .cpp file"
+
+This reverts commit bd648dd0755d03dc01b267b3cdcec09b045da696.
+---
+ src/kiconloader.cpp | 7 ++-----
+ src/kicontheme.cpp | 4 +++-
+ src/kicontheme_p.h | 19 -------------------
+ 3 files changed, 5 insertions(+), 25 deletions(-)
+ delete mode 100644 src/kicontheme_p.h
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 3a6bf2b..33c378b 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -11,7 +11,6 @@
+ */
+
+ #include "kiconloader.h"
+-#include "kicontheme_p.h"
+
+ // kdecore
+ #include <KConfigGroup>
+@@ -384,6 +383,8 @@ public:
+ bool mCustomPalette = false;
+ };
+
++extern void initRCCIconTheme();
++
+ class KIconLoaderGlobalData : public QObject
+ {
+ Q_OBJECT
+@@ -391,10 +392,6 @@ class KIconLoaderGlobalData : public QObject
+ public:
+ KIconLoaderGlobalData()
+ {
+- // we trigger the rcc loading & fallback theme setting here instead of the old way via Q_COREAPP_STARTUP_FUNCTION
+- // so that loading the icon engine plugin doesn't trigger changing the icon theme while loading the first icon
+- // if nothing else initialized this before.
+-
+ // ensure we load rcc files for application bundles (+ setup their theme)
+ initRCCIconTheme();
+
+diff --git a/src/kicontheme.cpp b/src/kicontheme.cpp
+index af9fd81..8e499d2 100644
+--- a/src/kicontheme.cpp
++++ b/src/kicontheme.cpp
+@@ -10,7 +10,6 @@
+ */
+
+ #include "kicontheme.h"
+-#include "kicontheme_p.h"
+
+ #include "debug.h"
+
+@@ -33,6 +32,9 @@
+
+ Q_GLOBAL_STATIC(QString, _themeOverride)
+
++// Support for icon themes in RCC files.
++// The intended use case is standalone apps on Windows / MacOS / etc.
++// For this reason we use AppDataLocation: BINDIR/data on Windows, Resources on OS X
+ void initRCCIconTheme()
+ {
+ const QString iconThemeRcc = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("icontheme.rcc"));
+diff --git a/src/kicontheme_p.h b/src/kicontheme_p.h
+deleted file mode 100644
+index eea889f..0000000
+--- a/src/kicontheme_p.h
++++ /dev/null
+@@ -1,19 +0,0 @@
+-/*
+- This file is part of the KDE libraries
+- SPDX-FileCopyrightText: 2021 Christoph Cullmann <cullmann@kde.org>
+-
+- SPDX-License-Identifier: LGPL-2.0-or-later
+-*/
+-
+-#ifndef KICONTHEME_P_H
+-#define KICONTHEME_P_H
+-
+-/**
+- * Support for icon themes in RCC files.
+- * The intended use case is standalone apps on Windows / MacOS / etc.
+- * For this reason we use AppDataLocation: BINDIR/data on Windows, Resources on OS X.
+- * Will be triggered by KIconLoaderGlobalData construction.
+- */
+-void initRCCIconTheme();
+-
+-#endif
+--
+GitLab
+
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.80.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.80.0-r1.ebuild
new file mode 100644
index 00000000000..4e3b8c18589
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.80.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RESTRICT+=" test" # bug 574770
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-svg-icons.patch" # bug 779079
+ "${FILESDIR}/${P}-revert-private-header-to-avoid-extern.patch"
+ "${FILESDIR}/${P}-revert-avoid-plugin-load-racecondition.patch"
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/files/, kde-frameworks/kiconthemes/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 541af0e365ad327b0753902ef33177df02920d46
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 13:22:37 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541af0e3
kde-frameworks/kiconthemes: Fix icon loading preference
Upstream commit 13181b03eac3c85f0649d5399d8c3037c388928c
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445804
Bug: https://bugs.gentoo.org/827932
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kiconthemes-5.88.0-fix-icon-preference.patch | 122 +++++++++++++++++++++
.../kiconthemes/kiconthemes-5.88.0-r1.ebuild | 34 ++++++
2 files changed, 156 insertions(+)
diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch
new file mode 100644
index 000000000000..e8b48b468323
--- /dev/null
+++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch
@@ -0,0 +1,122 @@
+From 13181b03eac3c85f0649d5399d8c3037c388928c Mon Sep 17 00:00:00 2001
+From: Jan Blackquill <uhhadd@gmail.com>
+Date: Thu, 25 Nov 2021 14:51:06 -0500
+Subject: [PATCH] KIconLoader: prefer icons from current theme before falling
+ back to other themes
+
+BUG: 445804
+---
+ autotests/kiconloader_unittest.cpp | 25 ++++++++++++++++++++++
+ src/kiconloader.cpp | 34 ++++++------------------------
+ 2 files changed, 32 insertions(+), 27 deletions(-)
+
+diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
+index 813215d..c232111 100644
+--- a/autotests/kiconloader_unittest.cpp
++++ b/autotests/kiconloader_unittest.cpp
+@@ -112,6 +112,12 @@ private Q_SLOTS:
+ QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("breeze/22x22/mimetypes/unknown.png"))));
+ QVERIFY(QFile::copy(QStringLiteral(":/coloredsvgicon.svg"), testIconsDir.filePath(QStringLiteral("breeze/22x22/apps/coloredsvgicon.svg"))));
+
++ // prepare some icons for our actions test
++ // when querying breeze for 'one-two', we expect
++ // 'one' from breeze instead of oxygen's 'one-two'.
++ QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("oxygen/22x22/actions/one-two.png"))));
++ QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("breeze/22x22/actions/one.png"))));
++
+ QVERIFY(QFile::setPermissions(breezeThemeFile, QFileDevice::ReadOwner | QFileDevice::WriteOwner));
+ KConfig configFile(breezeThemeFile);
+ KConfigGroup iconThemeGroup = configFile.group("Icon Theme");
+@@ -332,6 +338,25 @@ private Q_SLOTS:
+ QVERIFY(QFile::exists(unknownPath));
+ }
+
++ void testCorrectFallback()
++ {
++ // we want to prefer icons from the same theme
++
++ // so if we have something like:
++ /*
++ oxygen:
++ one-two
++
++ breeze:
++ one
++ */
++ // and we ask for 'one-two', we expect to see 'one' from breeze instead
++ // of 'one-two' from oxygen.
++ QString path;
++ KIconLoader::global()->loadIcon(QStringLiteral("one-two"), KIconLoader::Desktop, 24, KIconLoader::DefaultState, QStringList(), &path);
++ QVERIFY(path.contains("breeze/22x22/actions"));
++ }
++
+ void testPathStore()
+ {
+ QString path;
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 4d4181d..8a644d4 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -1021,12 +1021,7 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
+ {
+ const_cast<KIconLoaderPrivate *>(this)->initIconThemes();
+
+- // Do two passes through themeNodes.
+- //
+- // The first pass looks for an exact match in each themeNode one after the other.
+- // If one is found and it is an app icon then return that icon.
+- //
+- // In the next pass (assuming the first pass failed), it looks for
++ // This looks for the exact match and its
+ // generic fallbacks in each themeNode one after the other.
+
+ // In theory we should only do this for mimetype icons, not for app icons,
+@@ -1036,22 +1031,17 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
+ // Once everyone uses that to look up mimetype icons, we can kill the fallback code
+ // from this method.
+
+- for (KIconThemeNode *themeNode : std::as_const(links)) {
+- const QString path = themeNode->theme->iconPathByName(name, size, KIconLoader::MatchBest, scale);
+- if (!path.isEmpty()) {
+- return path;
+- }
+- }
+-
+- if (name.endsWith(QLatin1String("-x-generic"))) {
+- return QString(); // no further fallback
+- }
+- bool genericFallback = false;
++ bool genericFallback = name.endsWith(QLatin1String("-x-generic"));;
+ QString path;
+ for (KIconThemeNode *themeNode : std::as_const(links)) {
+ QString currentName = name;
+
+ while (!currentName.isEmpty()) {
++ path = themeNode->theme->iconPathByName(currentName, size, KIconLoader::MatchBest, scale);
++ if (!path.isEmpty()) {
++ return path;
++ }
++
+ if (genericFallback) {
+ // we already tested the base name
+ break;
+@@ -1088,16 +1078,6 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
+ break;
+ }
+ }
+-
+- if (currentName.isEmpty()) {
+- break;
+- }
+-
+- // qCDebug(KICONTHEMES) << "Looking up" << currentName;
+- path = themeNode->theme->iconPathByName(currentName, size, KIconLoader::MatchBest, scale);
+- if (!path.isEmpty()) {
+- return path;
+- }
+ }
+ }
+
+--
+GitLab
+
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild
new file mode 100644
index 000000000000..037123e760a4
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RESTRICT="test" # bug 574770
+
+DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ =kde-frameworks/karchive-${PVCUT}*:5
+ =kde-frameworks/kconfig-${PVCUT}*:5
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5
+ =kde-frameworks/ki18n-${PVCUT}*:5
+ =kde-frameworks/kitemviews-${PVCUT}*:5
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-icon-preference.patch ) # KDE-bug 445804
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/files/, kde-frameworks/kiconthemes/
@ 2022-02-10 9:13 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-02-10 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 448ebc67b241e315aaf6b7f1f422a6993a204b94
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 08:20:43 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 09:10:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448ebc67
kde-frameworks/kiconthemes: drop 5.88.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kiconthemes/Manifest | 1 -
.../kiconthemes-5.88.0-fix-icon-preference.patch | 122 ---------------------
.../kiconthemes/kiconthemes-5.88.0-r1.ebuild | 34 ------
3 files changed, 157 deletions(-)
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index bd16752e21fd..bc176393a03b 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1 @@
-DIST kiconthemes-5.88.0.tar.xz 223284 BLAKE2B 374935539c45468dd60364701ad2ca9ba1b7bc5852692a4299d74efd99fe615913626e42525deeebc5ea27ae44aab7795ffbaefa2978f3a214c3a3359e1cc664 SHA512 56bb3da876cfe7bc4999730ae91c9e71001aff63c904c4bdeb5989b6465c981b848af36942a5a5979e08af0b654c9e403210b037cab7b085d14281ed769650c9
DIST kiconthemes-5.90.0.tar.xz 225884 BLAKE2B 9697b1cda2520807b6b21e9210a6e436cfa9cbba25ce3a05c339c94dacf1687700d8ed59c806e222e811df166856217b5080d311a44eedf375b252e048bb7d64 SHA512 91a281df7c0336b1358969d0c6ef2899679e1b0088d74f5ad5c02ddcc9d0e0bfc71ea6fe13eec6ba6668996128ef6d175b94ae46388327534a28f851eae99998
diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch
deleted file mode 100644
index e8b48b468323..000000000000
--- a/kde-frameworks/kiconthemes/files/kiconthemes-5.88.0-fix-icon-preference.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 13181b03eac3c85f0649d5399d8c3037c388928c Mon Sep 17 00:00:00 2001
-From: Jan Blackquill <uhhadd@gmail.com>
-Date: Thu, 25 Nov 2021 14:51:06 -0500
-Subject: [PATCH] KIconLoader: prefer icons from current theme before falling
- back to other themes
-
-BUG: 445804
----
- autotests/kiconloader_unittest.cpp | 25 ++++++++++++++++++++++
- src/kiconloader.cpp | 34 ++++++------------------------
- 2 files changed, 32 insertions(+), 27 deletions(-)
-
-diff --git a/autotests/kiconloader_unittest.cpp b/autotests/kiconloader_unittest.cpp
-index 813215d..c232111 100644
---- a/autotests/kiconloader_unittest.cpp
-+++ b/autotests/kiconloader_unittest.cpp
-@@ -112,6 +112,12 @@ private Q_SLOTS:
- QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("breeze/22x22/mimetypes/unknown.png"))));
- QVERIFY(QFile::copy(QStringLiteral(":/coloredsvgicon.svg"), testIconsDir.filePath(QStringLiteral("breeze/22x22/apps/coloredsvgicon.svg"))));
-
-+ // prepare some icons for our actions test
-+ // when querying breeze for 'one-two', we expect
-+ // 'one' from breeze instead of oxygen's 'one-two'.
-+ QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("oxygen/22x22/actions/one-two.png"))));
-+ QVERIFY(QFile::copy(QStringLiteral(":/test-22x22.png"), testIconsDir.filePath(QStringLiteral("breeze/22x22/actions/one.png"))));
-+
- QVERIFY(QFile::setPermissions(breezeThemeFile, QFileDevice::ReadOwner | QFileDevice::WriteOwner));
- KConfig configFile(breezeThemeFile);
- KConfigGroup iconThemeGroup = configFile.group("Icon Theme");
-@@ -332,6 +338,25 @@ private Q_SLOTS:
- QVERIFY(QFile::exists(unknownPath));
- }
-
-+ void testCorrectFallback()
-+ {
-+ // we want to prefer icons from the same theme
-+
-+ // so if we have something like:
-+ /*
-+ oxygen:
-+ one-two
-+
-+ breeze:
-+ one
-+ */
-+ // and we ask for 'one-two', we expect to see 'one' from breeze instead
-+ // of 'one-two' from oxygen.
-+ QString path;
-+ KIconLoader::global()->loadIcon(QStringLiteral("one-two"), KIconLoader::Desktop, 24, KIconLoader::DefaultState, QStringList(), &path);
-+ QVERIFY(path.contains("breeze/22x22/actions"));
-+ }
-+
- void testPathStore()
- {
- QString path;
-diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
-index 4d4181d..8a644d4 100644
---- a/src/kiconloader.cpp
-+++ b/src/kiconloader.cpp
-@@ -1021,12 +1021,7 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
- {
- const_cast<KIconLoaderPrivate *>(this)->initIconThemes();
-
-- // Do two passes through themeNodes.
-- //
-- // The first pass looks for an exact match in each themeNode one after the other.
-- // If one is found and it is an app icon then return that icon.
-- //
-- // In the next pass (assuming the first pass failed), it looks for
-+ // This looks for the exact match and its
- // generic fallbacks in each themeNode one after the other.
-
- // In theory we should only do this for mimetype icons, not for app icons,
-@@ -1036,22 +1031,17 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
- // Once everyone uses that to look up mimetype icons, we can kill the fallback code
- // from this method.
-
-- for (KIconThemeNode *themeNode : std::as_const(links)) {
-- const QString path = themeNode->theme->iconPathByName(name, size, KIconLoader::MatchBest, scale);
-- if (!path.isEmpty()) {
-- return path;
-- }
-- }
--
-- if (name.endsWith(QLatin1String("-x-generic"))) {
-- return QString(); // no further fallback
-- }
-- bool genericFallback = false;
-+ bool genericFallback = name.endsWith(QLatin1String("-x-generic"));;
- QString path;
- for (KIconThemeNode *themeNode : std::as_const(links)) {
- QString currentName = name;
-
- while (!currentName.isEmpty()) {
-+ path = themeNode->theme->iconPathByName(currentName, size, KIconLoader::MatchBest, scale);
-+ if (!path.isEmpty()) {
-+ return path;
-+ }
-+
- if (genericFallback) {
- // we already tested the base name
- break;
-@@ -1088,16 +1078,6 @@ QString KIconLoaderPrivate::findMatchingIcon(const QString &name, int size, qrea
- break;
- }
- }
--
-- if (currentName.isEmpty()) {
-- break;
-- }
--
-- // qCDebug(KICONTHEMES) << "Looking up" << currentName;
-- path = themeNode->theme->iconPathByName(currentName, size, KIconLoader::MatchBest, scale);
-- if (!path.isEmpty()) {
-- return path;
-- }
- }
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild
deleted file mode 100644
index 810f917fbbf5..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.88.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RESTRICT="test" # bug 574770
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- =kde-frameworks/karchive-${PVCUT}*:5
- =kde-frameworks/kconfig-${PVCUT}*:5
- =kde-frameworks/kconfigwidgets-${PVCUT}*:5
- =kde-frameworks/kcoreaddons-${PVCUT}*:5
- =kde-frameworks/ki18n-${PVCUT}*:5
- =kde-frameworks/kitemviews-${PVCUT}*:5
- =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-icon-preference.patch ) # KDE-bug 445804
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-10 9:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-04 13:23 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/files/, kde-frameworks/kiconthemes/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-12-08 15:08 Andreas Sturmlechner
2022-02-10 9:13 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox