1 files changed, 95 insertions, 0 deletions
diff --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 000000000000..e861ce6c73f4
--- /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
+