From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- kde-frameworks/kiconthemes/Manifest | 9 +- .../files/kiconthemes-5.80.0-fix-svg-icons.patch | 22 +++++ ....0-revert-avoid-plugin-load-racecondition.patch | 68 ++++++++++++++++ ...0.0-revert-private-header-to-avoid-extern.patch | 95 ++++++++++++++++++++++ .../kiconthemes/kiconthemes-5.77.0.ebuild | 32 -------- .../kiconthemes/kiconthemes-5.80.0-r1.ebuild | 38 +++++++++ .../kiconthemes/kiconthemes-5.80.0.ebuild | 32 -------- .../kiconthemes/kiconthemes-5.81.0.ebuild | 32 ++++++++ 8 files changed, 261 insertions(+), 67 deletions(-) create mode 100644 kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-fix-svg-icons.patch create mode 100644 kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-avoid-plugin-load-racecondition.patch create mode 100644 kde-frameworks/kiconthemes/files/kiconthemes-5.80.0-revert-private-header-to-avoid-extern.patch delete mode 100644 kde-frameworks/kiconthemes/kiconthemes-5.77.0.ebuild create mode 100644 kde-frameworks/kiconthemes/kiconthemes-5.80.0-r1.ebuild delete mode 100644 kde-frameworks/kiconthemes/kiconthemes-5.80.0.ebuild create mode 100644 kde-frameworks/kiconthemes/kiconthemes-5.81.0.ebuild (limited to 'kde-frameworks/kiconthemes') diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest index 91e96fd0800b..93dd7d208c3a 100644 --- a/kde-frameworks/kiconthemes/Manifest +++ b/kde-frameworks/kiconthemes/Manifest @@ -1,5 +1,8 @@ -DIST kiconthemes-5.77.0.tar.xz 222300 BLAKE2B c84cd458680df4a34b073b28feb3b5aa39fbe6646954f92876e3bf5d2dd5f614dcc277ebd737626164b43189a230ff3f57a92739cc8c301d27325be457a7a5b6 SHA512 ed1069ea2edde3bd3f6a42059eab9f0d0cb734f3bc6a8989c9302ffe512e83100112a9e4c820164c1a53f8ba5489a0509010e5346601347f32fe384be16fc2c9 +AUX kiconthemes-5.80.0-fix-svg-icons.patch 584 BLAKE2B b210c3bed56c9321907b8fb0e9cc2e7c29e173bc7d6c6c2465904ac6ff62ecfb7921a527c88777fcaa24749f1f98f059e62792b03fd3fa545e6fbc123051d290 SHA512 f7505bbaf40683608f546089612cb5d85d97621e987bd8bca0a687b49c665fe8b06b06bc9045ec52e0dd429c824dca3a22690f27b2fa969c293ffb350b2a8575 +AUX kiconthemes-5.80.0-revert-avoid-plugin-load-racecondition.patch 2322 BLAKE2B 2d06d5bad30c0f8e868be92f5b481f1f5b7b254a0d555eea7565003fdf4687b541691cc001825b3e64c6957b24d2ae5e264c5f3d48de22394fd3dab488b229ee SHA512 250ee051d8f12b8bd0b794f39a7066be8519434d1d5c4a9e4eb0539c8249764ff506db7e9bd764e6e52ad2c54f2d91150186c5d67d9f55e65e9f3fbb81ef2df9 +AUX kiconthemes-5.80.0-revert-private-header-to-avoid-extern.patch 2788 BLAKE2B 10eee14ecaf42e0685f6bb129c62e490ee98ee634edfd97144e73e2e8feeceab8f61b440c8787d8984f4d8bc2209f0beb569b50cb4462c77e27de453afd040a4 SHA512 ce293f918d2fad49842e439864c32077a2f1331f801c40f584d20d6a1bc76b184ee247e9b74ed99070283e5c8177f26f36bea76aad030d08a49cd103c9407e4c DIST kiconthemes-5.80.0.tar.xz 222692 BLAKE2B 6728b4f32298ee256059fc52df0581dad434bca292c5cbdc50099a0b7d1671a9409722592cd55bcc2a1fef91412fce729a8dcf1b931db04f7ab0c10a3867b03a SHA512 bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8 -EBUILD kiconthemes-5.77.0.ebuild 799 BLAKE2B b2e5c66b05d7decdfc41b47a26bc1b672de6e0bda5f1d981149f652dd107a320d4f58c2f984737812ea6efba6828739f2adb1abf4004e139e9e961fa05357191 SHA512 f804b412a2395e0cdf66ad43196396ecfb142a9772ad343ba4f051f3312047c72898f3a634d37a1e4357ade0a7ef093994c816697042f0ef0f498744425dea8b -EBUILD kiconthemes-5.80.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498 +DIST kiconthemes-5.81.0.tar.xz 222696 BLAKE2B 4aaa378f737937427512f1e90e4ca3492403c5634009bc6b65c7d603b40d736d4a4fe7306bd36ade4aa1907d961d7aecb2ad8a335558343ef69f56f7224705a8 SHA512 bbf35951996104086639684ae013f634963e17b82df6061fb0c06b29304d46f85ee2df1fd223985ba9be785bc8872e29b1791ca40cb00c1c5eaf5ba0e290ee30 +EBUILD kiconthemes-5.80.0-r1.ebuild 994 BLAKE2B f4195411144541a43d9204b7c79b03b160fb901b9609d12956dafe7c43f5c71a746bb83bc4c6c2582b6cdfc244163d872afd36fa9bdd8b401250e4b9e571801f SHA512 7e206f03cd49b7e3a297f4dd323f60e6f3e9113d4e87f4a52b72362a8cd0456d696fea85f837dab1d9cdc51be215c861b3f4ae4bcfff58542fb8f7c10c28ca16 +EBUILD kiconthemes-5.81.0.ebuild 802 BLAKE2B 3d14d6495233562e7f6143a6ebbad297a5e9cffa63d88162e119335a050d2e4a612604aef40f058b1237150882581584061a7baee4a08297b2dc485de08890c3 SHA512 d335cfbc88316cdb24c0aef947e7be87a7f154f4b5382c632ab952873847c3f017657257623db047ba262a14088c386f35f2585ef561140a8ae82ca0edcb4498 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae 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 000000000000..adaef7a0f2b2 --- /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 +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 000000000000..4af27c7d7c11 --- /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 +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 + 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 +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 +@@ -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 +- +- 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.77.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.77.0.ebuild deleted file mode 100644 index 87e334e2d4b3..000000000000 --- a/kde-frameworks/kiconthemes/kiconthemes-5.77.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework for icon theming and configuration" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -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}" - -RESTRICT+=" test" # bug 574770 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 000000000000..c8ad6e18dd96 --- /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" +) diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.80.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.80.0.ebuild deleted file mode 100644 index c189858f25fa..000000000000 --- a/kde-frameworks/kiconthemes/kiconthemes-5.80.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# 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}" diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.81.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.81.0.ebuild new file mode 100644 index 000000000000..c189858f25fa --- /dev/null +++ b/kde-frameworks/kiconthemes/kiconthemes-5.81.0.ebuild @@ -0,0 +1,32 @@ +# 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}" -- cgit v1.2.3