From 929c02f8c5a1957b783d7b30de85c0b501a4eec6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 Apr 2020 13:34:18 -0500 Subject: [PATCH 01/24] 5.69.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fed1890..09782e5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /kiconthemes-5.66.0.tar.xz /kiconthemes-5.67.0.tar.xz /kiconthemes-5.68.0.tar.xz +/kiconthemes-5.69.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 258b646..65b8834 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.68.0 +Version: 5.69.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -89,6 +89,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Apr 21 2020 Rex Dieter - 5.69.0-1 +- 5.69.0 + * Fri Mar 20 2020 Rex Dieter - 5.68.0-1 - 5.68.0 diff --git a/sources b/sources index 147f292..016be0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.68.0.tar.xz) = 9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b +SHA512 (kiconthemes-5.69.0.tar.xz) = 312536760cac2169fac73c610c63586003fea306a357227971550babab963616f3fba85bb8dd66ca5a1a432a7cc438b66a3f0e61a33dfd4eecd081e7b5f22dcb From 9ffb2eb16bdc02e7f423b1c78113e63da9d58c20 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 May 2020 16:57:14 -0500 Subject: [PATCH 02/24] 5.70.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 09782e5..f8130b7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /kiconthemes-5.67.0.tar.xz /kiconthemes-5.68.0.tar.xz /kiconthemes-5.69.0.tar.xz +/kiconthemes-5.70.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 65b8834..3b6f4f9 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.69.0 +Version: 5.70.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -89,6 +89,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 04 2020 Rex Dieter - 5.70.0-1 +- 5.70.0 + * Tue Apr 21 2020 Rex Dieter - 5.69.0-1 - 5.69.0 diff --git a/sources b/sources index 016be0f..454d471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.69.0.tar.xz) = 312536760cac2169fac73c610c63586003fea306a357227971550babab963616f3fba85bb8dd66ca5a1a432a7cc438b66a3f0e61a33dfd4eecd081e7b5f22dcb +SHA512 (kiconthemes-5.70.0.tar.xz) = 8138f4667ea25f11c32ebc221abe4ea5c5d308e531edffaab977390c92632286a0a8d28eede337279aa84de4833aeff93a1321bbbea85e0f2096c56466250e62 From 8aac9c60b95a6b89fcca2b9f13486e2d5d7a7240 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 16 Jun 2020 09:35:12 -0500 Subject: [PATCH 03/24] 5.71.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f8130b7..63efc51 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /kiconthemes-5.68.0.tar.xz /kiconthemes-5.69.0.tar.xz /kiconthemes-5.70.0.tar.xz +/kiconthemes-5.71.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 3b6f4f9..d965d63 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.70.0 +Version: 5.71.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -89,6 +89,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Jun 16 2020 Rex Dieter - 5.71.0-1 +- 5.71.0 + * Mon May 04 2020 Rex Dieter - 5.70.0-1 - 5.70.0 diff --git a/sources b/sources index 454d471..2c5fa44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.70.0.tar.xz) = 8138f4667ea25f11c32ebc221abe4ea5c5d308e531edffaab977390c92632286a0a8d28eede337279aa84de4833aeff93a1321bbbea85e0f2096c56466250e62 +SHA512 (kiconthemes-5.71.0.tar.xz) = 6a12a23540fc6813089142dca03303ddb284b1fa109b2e52f85ceec5c055455d9d914231eac8a125a14322345e00e10fe48a750f5833c0c0fa195c5e74abe85b From f9e2691c5401ca25ccee1fd646e1f0514d03bb70 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Jul 2020 12:22:01 -0500 Subject: [PATCH 04/24] 5.72.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 63efc51..2d3d8e4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /kiconthemes-5.69.0.tar.xz /kiconthemes-5.70.0.tar.xz /kiconthemes-5.71.0.tar.xz +/kiconthemes-5.72.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index d965d63..85fe286 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.71.0 +Version: 5.72.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -89,6 +89,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Jul 07 2020 Rex Dieter - 5.72.0-1 +- 5.72.0 + * Tue Jun 16 2020 Rex Dieter - 5.71.0-1 - 5.71.0 diff --git a/sources b/sources index 2c5fa44..544ea06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.71.0.tar.xz) = 6a12a23540fc6813089142dca03303ddb284b1fa109b2e52f85ceec5c055455d9d914231eac8a125a14322345e00e10fe48a750f5833c0c0fa195c5e74abe85b +SHA512 (kiconthemes-5.72.0.tar.xz) = 55184ee31084ae56d47a1f618b2484c2994c2d022cd19e7eae75850f4affb25b7e90c4510c3e3d1a6bb81c5b4fd60e780819ade7947ab62f4c778606cc342acc From 56c54a4a7544722ac5ff22632bfe5d8f80331fab Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sat, 18 Jul 2020 09:56:24 +0200 Subject: [PATCH 05/24] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- kf5-kiconthemes.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 85fe286..8b74f2e 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build %global framework kiconthemes Name: kf5-%{framework} @@ -55,16 +56,12 @@ developing applications that use %{name}. %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. -popd - -%make_build -C %{_target_platform} +%{cmake_kf5} +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install %find_lang %{name} --all-name From b11884416f1864dac5764bdf62cd766a6e5ea669 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 03:10:41 +0000 Subject: [PATCH 06/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-kiconthemes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 8b74f2e..3b4fe9c 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Version: 5.72.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -86,6 +86,9 @@ developing applications that use %{name}. %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.72.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 07 2020 Rex Dieter - 5.72.0-1 - 5.72.0 From ef1fd68f2d3079a81a75d314c68aa9da036eeb01 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Aug 2020 11:44:37 -0500 Subject: [PATCH 07/24] 5.73.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3d8e4..d4635ef 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /kiconthemes-5.70.0.tar.xz /kiconthemes-5.71.0.tar.xz /kiconthemes-5.72.0.tar.xz +/kiconthemes-5.73.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 3b4fe9c..b142ecc 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,8 +2,8 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.72.0 -Release: 2%{?dist} +Version: 5.73.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -86,6 +86,9 @@ developing applications that use %{name}. %changelog +* Mon Aug 03 2020 Rex Dieter - 5.73.0-1 +- 5.73.0 + * Tue Jul 28 2020 Fedora Release Engineering - 5.72.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 544ea06..3da6574 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.72.0.tar.xz) = 55184ee31084ae56d47a1f618b2484c2994c2d022cd19e7eae75850f4affb25b7e90c4510c3e3d1a6bb81c5b4fd60e780819ade7947ab62f4c778606cc342acc +SHA512 (kiconthemes-5.73.0.tar.xz) = 9f9454f2c94b87ebb3d13d3b36e2626c52deb4cf23ea5d4e2e768e97dd206a66aa0692833d82aa999e566bb88d477d87bffd3f162194d76b504aa3645f6da1b0 From 09852d7e3eb80bc11f29bbd1f3b34a6ff4316f2d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 18 Sep 2020 11:02:52 +0200 Subject: [PATCH 08/24] 5.74.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4635ef..c4c5bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /kiconthemes-5.71.0.tar.xz /kiconthemes-5.72.0.tar.xz /kiconthemes-5.73.0.tar.xz +/kiconthemes-5.74.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index b142ecc..3535c48 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.73.0 +Version: 5.74.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -86,6 +86,9 @@ developing applications that use %{name}. %changelog +* Fri Sep 18 2020 Jan Grulich - 5.74.0-1 +- 5.74.0 + * Mon Aug 03 2020 Rex Dieter - 5.73.0-1 - 5.73.0 diff --git a/sources b/sources index 3da6574..c080168 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.73.0.tar.xz) = 9f9454f2c94b87ebb3d13d3b36e2626c52deb4cf23ea5d4e2e768e97dd206a66aa0692833d82aa999e566bb88d477d87bffd3f162194d76b504aa3645f6da1b0 +SHA512 (kiconthemes-5.74.0.tar.xz) = 1d34c98b2ec7c59f6960aacc222a9478212c5224eee883c4c6082dbfcba312d4fbedf164b11b5fc07d6f19a1bac65a593ed91ca65c38f998274f02c5b4ed2cfb From b62afa14507a5da54681ea14f33b8f963f473665 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 18 Sep 2020 13:43:37 +0200 Subject: [PATCH 09/24] Fix installation of license files --- kf5-kiconthemes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 3535c48..5ac1d4e 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -70,7 +70,7 @@ developing applications that use %{name}. %files -f %{name}.lang %doc README.md -%license COPYING.LIB +%license LICENSES/*.txt %{_kf5_datadir}/qlogging-categories5/%{framework}.* %{_kf5_bindir}/kiconfinder5 %{_kf5_libdir}/libKF5IconThemes.so.* From 7e3c9fa7a08cc2df8b2630942137ab18876a0e32 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 14 Oct 2020 14:31:48 -0500 Subject: [PATCH 10/24] 5.75.0 drop old patch, moved to categoried logging now (yay) --- .gitignore | 1 + kf5-kiconthemes.spec | 10 ++++++---- kiconthemes-5.60.0-context_logspam.patch | 12 ------------ sources | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 kiconthemes-5.60.0-context_logspam.patch diff --git a/.gitignore b/.gitignore index c4c5bbd..b0b5942 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /kiconthemes-5.72.0.tar.xz /kiconthemes-5.73.0.tar.xz /kiconthemes-5.74.0.tar.xz +/kiconthemes-5.75.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 5ac1d4e..43548de 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,8 +1,7 @@ -%undefine __cmake_in_source_build %global framework kiconthemes Name: kf5-%{framework} -Version: 5.74.0 +Version: 5.75.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -21,7 +20,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{v ## upstream patches ## upstreamable patches -Patch100: kiconthemes-5.60.0-context_logspam.patch BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-karchive-devel >= %{majmin} @@ -56,7 +54,8 @@ developing applications that use %{name}. %build -%{cmake_kf5} +%cmake_kf5 + %cmake_build @@ -86,6 +85,9 @@ developing applications that use %{name}. %changelog +* Wed Oct 14 09:56:05 CDT 2020 Rex Dieter - 5.75.0-1 +- 5.75.0 + * Fri Sep 18 2020 Jan Grulich - 5.74.0-1 - 5.74.0 diff --git a/kiconthemes-5.60.0-context_logspam.patch b/kiconthemes-5.60.0-context_logspam.patch deleted file mode 100644 index 490312e..0000000 --- a/kiconthemes-5.60.0-context_logspam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kiconthemes-5.60.0/src/kicontheme.cpp.logspam kiconthemes-5.60.0/src/kicontheme.cpp ---- kiconthemes-5.60.0/src/kicontheme.cpp.logspam 2019-07-07 13:34:23.000000000 -0500 -+++ kiconthemes-5.60.0/src/kicontheme.cpp 2019-07-18 08:25:14.857727321 -0500 -@@ -764,7 +764,7 @@ KIconThemeDir::KIconThemeDir(const QStri - } else if (tmp.isEmpty()) { - // do nothing. key not required - } else { -- qWarning() << "Invalid Context=" << tmp << "line for icon theme: " << constructFileName(QString()); -+ qDebug() << "Invalid Context=" << tmp << "line for icon theme: " << constructFileName(QString()); - return; - } - tmp = config.readEntry(QStringLiteral("Type"), QStringLiteral("Threshold")); diff --git a/sources b/sources index c080168..7f2f823 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.74.0.tar.xz) = 1d34c98b2ec7c59f6960aacc222a9478212c5224eee883c4c6082dbfcba312d4fbedf164b11b5fc07d6f19a1bac65a593ed91ca65c38f998274f02c5b4ed2cfb +SHA512 (kiconthemes-5.75.0.tar.xz) = 85518b0d7e3548a7912b9268952a49d3099530c0c9003249c7f291d1bab65eaeb6faab705fd4b6d351f9da31c401032136118eb83c33bda7293e1a720ee1ab00 From aa1569922b1c8de52ac1c746e6b7143456c2da05 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Nov 2020 09:03:50 -0600 Subject: [PATCH 11/24] 5.76.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b0b5942..88759aa 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /kiconthemes-5.73.0.tar.xz /kiconthemes-5.74.0.tar.xz /kiconthemes-5.75.0.tar.xz +/kiconthemes-5.76.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 43548de..ea8a456 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.75.0 +Version: 5.76.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Thu Nov 19 09:03:44 CST 2020 Rex Dieter - 5.76.0-1 +- 5.76.0 + * Wed Oct 14 09:56:05 CDT 2020 Rex Dieter - 5.75.0-1 - 5.75.0 diff --git a/sources b/sources index 7f2f823..704b581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.75.0.tar.xz) = 85518b0d7e3548a7912b9268952a49d3099530c0c9003249c7f291d1bab65eaeb6faab705fd4b6d351f9da31c401032136118eb83c33bda7293e1a720ee1ab00 +SHA512 (kiconthemes-5.76.0.tar.xz) = 1895d0ff63d1dd2a20b118b18b5944532a6896ea0f9ecf4c4a3eb527cbdffd4fdef02c6fc3dad54402ae007775618e775a7ce71b83950c49e066e1c01be09014 From ba12784d424d10585c963dcde38977180c9ba0ff Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 13 Dec 2020 14:14:16 -0600 Subject: [PATCH 12/24] 5.77.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 88759aa..bba0e63 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /kiconthemes-5.74.0.tar.xz /kiconthemes-5.75.0.tar.xz /kiconthemes-5.76.0.tar.xz +/kiconthemes-5.77.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index ea8a456..c7c8a5d 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.76.0 +Version: 5.77.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Sun Dec 13 14:14:13 CST 2020 Rex Dieter - 5.77.0-1 +- 5.77.0 + * Thu Nov 19 09:03:44 CST 2020 Rex Dieter - 5.76.0-1 - 5.76.0 diff --git a/sources b/sources index 704b581..8ec76b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.76.0.tar.xz) = 1895d0ff63d1dd2a20b118b18b5944532a6896ea0f9ecf4c4a3eb527cbdffd4fdef02c6fc3dad54402ae007775618e775a7ce71b83950c49e066e1c01be09014 +SHA512 (kiconthemes-5.77.0.tar.xz) = ed1069ea2edde3bd3f6a42059eab9f0d0cb734f3bc6a8989c9302ffe512e83100112a9e4c820164c1a53f8ba5489a0509010e5346601347f32fe384be16fc2c9 From 3acd07167ec4f34a539859d9fc3c1e9c07ca904f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Jan 2021 08:47:49 -0600 Subject: [PATCH 13/24] 5.78.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bba0e63..d731db8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /kiconthemes-5.75.0.tar.xz /kiconthemes-5.76.0.tar.xz /kiconthemes-5.77.0.tar.xz +/kiconthemes-5.78.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index c7c8a5d..5abe197 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.77.0 +Version: 5.78.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Mon Jan 4 08:47:42 CST 2021 Rex Dieter - 5.78.0-1 +- 5.78.0 + * Sun Dec 13 14:14:13 CST 2020 Rex Dieter - 5.77.0-1 - 5.77.0 diff --git a/sources b/sources index 8ec76b3..a965d0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.77.0.tar.xz) = ed1069ea2edde3bd3f6a42059eab9f0d0cb734f3bc6a8989c9302ffe512e83100112a9e4c820164c1a53f8ba5489a0509010e5346601347f32fe384be16fc2c9 +SHA512 (kiconthemes-5.78.0.tar.xz) = 87d8fcab07b84bff8fb74773dfbb761d37c0f21d4677741c695991f35017e7533886ef380515bcc0fd43cdf38d393897707150ced05dd5cc13d3be393aebd4eb From dd9a0e21d270eb1a154160543cddef9560c9b7f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:38:05 +0000 Subject: [PATCH 14/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-kiconthemes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 5abe197..d4cc4e6 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.78.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 4 08:47:42 CST 2021 Rex Dieter - 5.78.0-1 - 5.78.0 From c8013f775836d088554735271c212e69d37bd968 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Feb 2021 09:54:43 -0600 Subject: [PATCH 15/24] 5.79.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d731db8..148f289 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /kiconthemes-5.76.0.tar.xz /kiconthemes-5.77.0.tar.xz /kiconthemes-5.78.0.tar.xz +/kiconthemes-5.79.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index d4cc4e6..ea11eb8 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,8 +1,8 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.78.0 -Release: 2%{?dist} +Version: 5.79.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Sat Feb 06 2021 Rex Dieter - 5.79.0-1 +- 5.79.0 + * Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index a965d0a..e65fd6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.78.0.tar.xz) = 87d8fcab07b84bff8fb74773dfbb761d37c0f21d4677741c695991f35017e7533886ef380515bcc0fd43cdf38d393897707150ced05dd5cc13d3be393aebd4eb +SHA512 (kiconthemes-5.79.0.tar.xz) = 2c37daa3195efc661a02ee16fba3c549f7238e0f6a38fee4875fd1fa7334d433554c06f233872989e6c9ec3fafd3f3c7e86f12f6c01132849333fc46d22f70ba From 39a1b3df49660bb7a0cfa6abd5eba37e9e3a6d62 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Feb 2021 15:16:42 -0600 Subject: [PATCH 16/24] respin --- kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index ea11eb8..7388765 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.79.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Sat Feb 06 2021 Rex Dieter - 5.79.0-2 +- respin + * Sat Feb 06 2021 Rex Dieter - 5.79.0-1 - 5.79.0 diff --git a/sources b/sources index e65fd6a..80c40f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.79.0.tar.xz) = 2c37daa3195efc661a02ee16fba3c549f7238e0f6a38fee4875fd1fa7334d433554c06f233872989e6c9ec3fafd3f3c7e86f12f6c01132849333fc46d22f70ba +SHA512 (kiconthemes-5.79.0.tar.xz) = f2b3520aa580cac8f1908616ea7633232454bf67b2449c43cd90230dfb1b806ca6c450e2e863f11cde03d38bdbe03e0cb438bd8745c571537436be3edc524fc9 From 3c10fe6ce74f2318db23669904c8f0bf0973b43b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 9 Mar 2021 08:41:28 -0600 Subject: [PATCH 17/24] 5.80.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 148f289..86564ea 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /kiconthemes-5.77.0.tar.xz /kiconthemes-5.78.0.tar.xz /kiconthemes-5.79.0.tar.xz +/kiconthemes-5.80.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 7388765..21cd16c 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,8 +1,8 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.79.0 -Release: 2%{?dist} +Version: 5.80.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Tue Mar 09 2021 Rex Dieter - 5.80.0-1 +- 5.80.0 + * Sat Feb 06 2021 Rex Dieter - 5.79.0-2 - respin diff --git a/sources b/sources index 80c40f4..cc8821c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.79.0.tar.xz) = f2b3520aa580cac8f1908616ea7633232454bf67b2449c43cd90230dfb1b806ca6c450e2e863f11cde03d38bdbe03e0cb438bd8745c571537436be3edc524fc9 +SHA512 (kiconthemes-5.80.0.tar.xz) = bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8 From 74e19ae25f329afb804b68f920d63c0c5b8d2f51 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 30 Mar 2021 09:24:53 +0200 Subject: [PATCH 18/24] Fix missing icons in Qt applications on GNOME --- kf5-kiconthemes.spec | 8 +- ...e-header-to-avoid-extern-in-cpp-file.patch | 163 ++++++++++++++++++ 2 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 21cd16c..81a7faa 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.80.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -18,6 +18,9 @@ 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 ## upstreamable patches @@ -85,6 +88,9 @@ developing applications that use %{name}. %changelog +* Mon Mar 29 2021 Jan Grulich - 5.80.0-2 +- Fix missing icons in Qt applications on GNOME + * Tue Mar 09 2021 Rex Dieter - 5.80.0-1 - 5.80.0 diff --git a/kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch b/kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch new file mode 100644 index 0000000..9a983ce --- /dev/null +++ b/kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch @@ -0,0 +1,163 @@ +From 5a5d7b57fee23d934d90989133f870404557ff6f Mon Sep 17 00:00:00 2001 +From: Christoph Cullmann +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 +@@ -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 + + +From e4fb7dda788e5dc44ada56f089053453f3ff0c1c Mon Sep 17 00:00:00 2001 +From: Christoph Cullmann +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 From ac6ae50dba5fa0ec196b8d8c245723303eb8cf3d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 30 Mar 2021 12:29:09 +0200 Subject: [PATCH 19/24] Fix issue where some applications might not start properly --- kf5-kiconthemes.spec | 6 ++++- ...dont-register-our-engine-per-default.patch | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 kiconthemes-dont-register-our-engine-per-default.patch diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 81a7faa..5ec6769 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.80.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -21,6 +21,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{v # 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 @@ -88,6 +89,9 @@ developing applications that use %{name}. %changelog +* Tue Mar 30 2021 Jan Grulich - 5.80.0-3 +- Fix issue where some applications might not start properly (e.g. MediaWriter) + * Mon Mar 29 2021 Jan Grulich - 5.80.0-2 - Fix missing icons in Qt applications on GNOME diff --git a/kiconthemes-dont-register-our-engine-per-default.patch b/kiconthemes-dont-register-our-engine-per-default.patch new file mode 100644 index 0000000..1f4b014 --- /dev/null +++ b/kiconthemes-dont-register-our-engine-per-default.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 + From 037b4737d290ec7a520145c73311172118666911 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 6 Apr 2021 09:17:04 -0500 Subject: [PATCH 20/24] 5.81.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 11 +- ...dont-register-our-engine-per-default.patch | 22 --- ...e-header-to-avoid-extern-in-cpp-file.patch | 163 ------------------ sources | 2 +- 5 files changed, 7 insertions(+), 192 deletions(-) delete mode 100644 kiconthemes-dont-register-our-engine-per-default.patch delete mode 100644 kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch diff --git a/.gitignore b/.gitignore index 86564ea..e24a6b4 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 5ec6769..1cb62ca 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -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 - 5.81.0-1 +- 5.81.0 + * Tue Mar 30 2021 Jan Grulich - 5.80.0-3 - Fix issue where some applications might not start properly (e.g. MediaWriter) diff --git a/kiconthemes-dont-register-our-engine-per-default.patch b/kiconthemes-dont-register-our-engine-per-default.patch deleted file mode 100644 index 1f4b014..0000000 --- a/kiconthemes-dont-register-our-engine-per-default.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch b/kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch deleted file mode 100644 index 9a983ce..0000000 --- a/kiconthemes-revert-add-private-header-to-avoid-extern-in-cpp-file.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 5a5d7b57fee23d934d90989133f870404557ff6f Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -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 -@@ -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 - - -From e4fb7dda788e5dc44ada56f089053453f3ff0c1c Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -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 diff --git a/sources b/sources index cc8821c..27bd68a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.80.0.tar.xz) = bf5adcd46b695038b66ef9374603e9e88090f31259971fc92c97f367e2055d96fe8c4a5c486954b372c369eb17a31858fde426e1cb373535e48138692f1b0ee8 +SHA512 (kiconthemes-5.81.0.tar.xz) = bbf35951996104086639684ae013f634963e17b82df6061fb0c06b29304d46f85ee2df1fd223985ba9be785bc8872e29b1791ca40cb00c1c5eaf5ba0e290ee30 From 324ef9429bbe74b47dc8956686692019014a4520 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 May 2021 08:40:34 -0500 Subject: [PATCH 21/24] 5.82.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e24a6b4..93b2836 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /kiconthemes-5.79.0.tar.xz /kiconthemes-5.80.0.tar.xz /kiconthemes-5.81.0.tar.xz +/kiconthemes-5.82.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 1cb62ca..2f785c5 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.81.0 +Version: 5.82.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Mon May 03 2021 Rex Dieter - 5.82.0-1 +- 5.82.0 + * Tue Apr 06 2021 Rex Dieter - 5.81.0-1 - 5.81.0 diff --git a/sources b/sources index 27bd68a..d0ef943 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.81.0.tar.xz) = bbf35951996104086639684ae013f634963e17b82df6061fb0c06b29304d46f85ee2df1fd223985ba9be785bc8872e29b1791ca40cb00c1c5eaf5ba0e290ee30 +SHA512 (kiconthemes-5.82.0.tar.xz) = b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb From 67051fbfd68f002f0e20cbc9184b6a03dc304be7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 8 Jun 2021 16:02:17 -0500 Subject: [PATCH 22/24] 5.83.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 93b2836..ceed4ef 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /kiconthemes-5.80.0.tar.xz /kiconthemes-5.81.0.tar.xz /kiconthemes-5.82.0.tar.xz +/kiconthemes-5.83.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 2f785c5..4735166 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.82.0 +Version: 5.83.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Tue Jun 08 2021 Rex Dieter - 5.83.0-1 +- 5.83.0 + * Mon May 03 2021 Rex Dieter - 5.82.0-1 - 5.82.0 diff --git a/sources b/sources index d0ef943..bf49579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.82.0.tar.xz) = b323d9ef88e6659977a3a8d1a61b8bcb72c299ee16fbc42f4ac2c02f50dd03c211e9d79aff71e26ffce4a0a1d496533a5ea1d0aa07c30664f5dc78af9b105abb +SHA512 (kiconthemes-5.83.0.tar.xz) = e91ed626fd1cd122208e0356ce2dcedc486e033afd5fdadcb534dda37a325babd87d67b9d12a6d6ee692b90656c3caf699a5b89df814ddf03f02d565ab52d3f4 From 2759375aada4e396c7e70f55529c501816d824e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:52:08 +0000 Subject: [PATCH 23/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-kiconthemes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 4735166..0a1fede 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.83.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.83.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 08 2021 Rex Dieter - 5.83.0-1 - 5.83.0 From 441364685a8a7b6fa40304d4428e0b00251de187 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 12 Aug 2021 11:07:47 -0500 Subject: [PATCH 24/24] 5.85.0 --- .gitignore | 1 + kf5-kiconthemes.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ceed4ef..1c5528f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /kiconthemes-5.81.0.tar.xz /kiconthemes-5.82.0.tar.xz /kiconthemes-5.83.0.tar.xz +/kiconthemes-5.85.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 0a1fede..cd9f8a5 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,8 +1,8 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.83.0 -Release: 2%{?dist} +Version: 5.85.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes License: LGPLv2+ and GPLv2+ @@ -85,6 +85,9 @@ developing applications that use %{name}. %changelog +* Thu Aug 12 2021 Rex Dieter - 5.85.0-1 +- 5.85.0 + * Thu Jul 22 2021 Fedora Release Engineering - 5.83.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index bf49579..64048d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.83.0.tar.xz) = e91ed626fd1cd122208e0356ce2dcedc486e033afd5fdadcb534dda37a325babd87d67b9d12a6d6ee692b90656c3caf699a5b89df814ddf03f02d565ab52d3f4 +SHA512 (kiconthemes-5.85.0.tar.xz) = 87e041835401273627c596338f94a0507f3184fb3e0a004ad4ba0c878fc2ef9ceac5bd4a9318d8c8e852e1ab26944368ca6b27a3efcd4269643d8e0cd0d60953