Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kiconthemes for openSUSE:Factory checked in at 2021-04-06 17:28:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiconthemes (Old) and /work/SRC/openSUSE:Factory/.kiconthemes.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiconthemes" Tue Apr 6 17:28:50 2021 rev:94 rq:882362 version:5.80.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kiconthemes/kiconthemes.changes 2021-03-16 15:41:59.928806191 +0100 +++ /work/SRC/openSUSE:Factory/.kiconthemes.new.2401/kiconthemes.changes 2021-04-06 17:29:00.463071255 +0200 @@ -1,0 +2,12 @@ +Wed Mar 31 12:35:07 UTC 2021 - Hillwood Yang <[email protected]> + +- Add 3262669e.patch + Fix icons can not be shown on some applications (rh#1943807) + +------------------------------------------------------------------- +Thu Mar 25 07:45:21 UTC 2021 - Fabian Vogt <[email protected]> + +- Add patch to fix icon loading in some applications (kde#434451): + * 0001-ensure-qrc-QDir-searchPaths-work-for-icons.patch + +------------------------------------------------------------------- New: ---- 0001-ensure-qrc-QDir-searchPaths-work-for-icons.patch 3262669e.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiconthemes.spec ++++++ --- /var/tmp/diff_new_pack.xB8FeS/_old 2021-04-06 17:29:01.011071875 +0200 +++ /var/tmp/diff_new_pack.xB8FeS/_new 2021-04-06 17:29:01.015071879 +0200 @@ -36,6 +36,10 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch1: 0001-ensure-qrc-QDir-searchPaths-work-for-icons.patch +# PATCH-FIX-UPSTREAM +Patch2: 3262669e.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: cmake(KF5Archive) >= %{_kf5_bugfix_version} ++++++ 0001-ensure-qrc-QDir-searchPaths-work-for-icons.patch ++++++ >From 49bdb6310194cd899641b7d9cf8463d4fba6baea Mon Sep 17 00:00:00 2001 From: Christoph Cullmann <[email protected]> Date: Thu, 18 Mar 2021 10:18:17 +0100 Subject: [PATCH] ensure qrc + QDir::searchPaths work for icons before we had some optimization to check which paths are absolute, but that one is wrong, applications might rely on set search paths BUG: 434451 --- src/kiconloader.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp index 011a292..2411af1 100644 --- a/src/kiconloader.cpp +++ b/src/kiconloader.cpp @@ -92,19 +92,6 @@ color:%7;\ } } -/** - * Checks for relative paths quickly on UNIX-alikes, slowly on everything else. - */ -static bool pathIsRelative(const QString &path) -{ -#ifdef Q_OS_UNIX - // catch both /xxx/yyy and :/xxx/yyy for resources - return (!path.isEmpty() && path[0] != QLatin1Char('/') && path[0] != QLatin1Char(':')); -#else - return QDir::isRelativePath(path); -#endif -} - /** * Holds a QPixmap for this process, along with its associated path on disk. */ @@ -1214,7 +1201,8 @@ QString KIconLoader::iconPath(const QString &_name, int group_or_size, bool canR return QString(); } - if (_name.isEmpty() || !pathIsRelative(_name)) { + // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451 + if (_name.isEmpty() || !QDir::isRelativePath(_name)) { // we have either an absolute path or nothing to work with return _name; } @@ -1352,7 +1340,8 @@ QPixmap KIconLoader::loadScaledIcon(const QString &_name, name = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + name + QStringLiteral(".png"); } - bool absolutePath = !pathIsRelative(name); + // we need to honor resource :/ paths and QDir::searchPaths => use QDir::isRelativePath, see bug 434451 + bool absolutePath = !QDir::isRelativePath(name); if (!absolutePath) { name = d->removeIconExtension(name); } -- 2.25.1 ++++++ 3262669e.patch ++++++ >From 3262669e3abfa7171463e3bf34f7c60eacf6bc77 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann <[email protected]> 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
