rpms
/
kf5-kiconthemes
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5.81.0

Browse Source
epel8
Rex Dieter 4 years ago
parent ac6ae50dba
commit 037b4737d2
5 changed files with 7 additions and 192 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -27,3 +27,4 @@
/kiconthemes-5.78.0.tar.xz
/kiconthemes-5.79.0.tar.xz
/kiconthemes-5.80.0.tar.xz
/kiconthemes-5.81.0.tar.xz

11
kf5-kiconthemes.spec
Unescape View File

@ -1,8 +1,8 @@
%global framework kiconthemes
Name: kf5-%{framework}
Version: 5.80.0
Release: 3%{?dist}
Version: 5.81.0
Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 integration module with icon themes
License: LGPLv2+ and GPLv2+
@ -18,10 +18,6 @@ URL: https://api.kde.org/frameworks/kiconthemes/
Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
## upstream patches
# Bug 1943807 - Kolourpaint shows toolbar only as text (not symbols)
# https://invent.kde.org/frameworks/kiconthemes/-/merge_requests/28
Patch0: kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch
Patch1: kiconthemes-dont-register-our-engine-per-default.patch
## upstreamable patches
@ -89,6 +85,9 @@ developing applications that use %{name}.
%changelog
* Tue Apr 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.81.0-1
- 5.81.0
* Tue Mar 30 2021 Jan Grulich <jgrulich@redhat.com> - 5.80.0-3
- Fix issue where some applications might not start properly (e.g. MediaWriter)

22
kiconthemes-dont-register-our-engine-per-default.patch
Unescape View File

@ -1,22 +0,0 @@
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

163
kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch
Unescape View File

@ -1,163 +0,0 @@
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 1/2] 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
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 2/2] 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

2
sources
Unescape View File

@ -1 +1 @@
SHA512 (kiconthemes-5.80.0.tar.xz) = bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8
SHA512 (kiconthemes-5.81.0.tar.xz) = bbf35951996104086639684ae013f634963e17b82df6061fb0c06b29304d46f85ee2df1fd223985ba9be785bc8872e29b1791ca40cb00c1c5eaf5ba0e290ee30

Write Preview
Loading…
Cancel
Save