diff --git a/.gitignore b/.gitignore index 1d80a9e..fed1890 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,12 @@ /kiconthemes-5.57.0.tar.xz /kiconthemes-5.58.0.tar.xz /kiconthemes-5.59.0.tar.xz +/kiconthemes-5.60.0.tar.xz +/kiconthemes-5.61.0.tar.xz +/kiconthemes-5.62.0.tar.xz +/kiconthemes-5.63.0.tar.xz +/kiconthemes-5.64.0.tar.xz +/kiconthemes-5.65.0.tar.xz +/kiconthemes-5.66.0.tar.xz +/kiconthemes-5.67.0.tar.xz +/kiconthemes-5.68.0.tar.xz diff --git a/kf5-kiconthemes.spec b/kf5-kiconthemes.spec index 073a21b..258b646 100644 --- a/kf5-kiconthemes.spec +++ b/kf5-kiconthemes.spec @@ -1,7 +1,7 @@ %global framework kiconthemes Name: kf5-%{framework} -Version: 5.59.0 +Version: 5.68.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module with icon themes @@ -19,6 +19,9 @@ 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} BuildRequires: kf5-kconfigwidgets-devel >= %{majmin} @@ -28,8 +31,10 @@ BuildRequires: kf5-ki18n-devel >= %{majmin} BuildRequires: kf5-kitemviews-devel >= %{majmin} BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} BuildRequires: kf5-rpm-macros + BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtsvg-devel +BuildRequires: cmake(Qt5UiPlugin) Requires: hicolor-icon-theme @@ -69,10 +74,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files -f %{name}.lang %doc README.md %license COPYING.LIB -%{_kf5_sysconfdir}/xdg/%{framework}.* +%{_kf5_datadir}/qlogging-categories5/%{framework}.* %{_kf5_bindir}/kiconfinder5 %{_kf5_libdir}/libKF5IconThemes.so.* %{_kf5_qtplugindir}/iconengines/KIconEnginePlugin.so +%{_kf5_qtplugindir}/designer/*5widgets.so %files devel %{_kf5_includedir}/kiconthemes_version.h @@ -83,6 +89,42 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Mar 20 2020 Rex Dieter - 5.68.0-1 +- 5.68.0 + +* Mon Feb 03 2020 Rex Dieter - 5.67.0-1 +- 5.67.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 5.66.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 07 2020 Rex Dieter - 5.66.0-1 +- 5.66.0 + +* Tue Dec 17 2019 Rex Dieter - 5.65.0-1 +- 5.65.0 + +* Fri Nov 08 2019 Rex Dieter - 5.64.0-1 +- 5.64.0 + +* Tue Oct 22 2019 Rex Dieter - 5.63.0-1 +- 5.63.0 + +* Mon Sep 16 2019 Rex Dieter - 5.62.0-1 +- 5.62.0 + +* Wed Aug 07 2019 Rex Dieter - 5.61.0-1 +- 5.61.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 5.60.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Rex Dieter - 5.60.0-2 +- silence log spam wrt "Invalid Context..." (#1708740) + +* Sat Jul 13 2019 Rex Dieter - 5.60.0-1 +- 5.60.0 + * Thu Jun 06 2019 Rex Dieter - 5.59.0-1 - 5.59.0 diff --git a/kiconthemes-5.60.0-context_logspam.patch b/kiconthemes-5.60.0-context_logspam.patch new file mode 100644 index 0000000..490312e --- /dev/null +++ b/kiconthemes-5.60.0-context_logspam.patch @@ -0,0 +1,12 @@ +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 8fa0e7b..147f292 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiconthemes-5.59.0.tar.xz) = 4fef2f0d6b6054d21ea6273864da75a8f33db386e91d1c8167081b22d0efe6d85796ccfb51328f336b5c261f2ed99a58649aea757899c7d13a0629361e5a69a9 +SHA512 (kiconthemes-5.68.0.tar.xz) = 9088164a379a49bdf86fb8558ad1c95555c18985012c9c03e95d6e043b983e871afa594d40cc0c6f13b9261a2a19b2a0355f4a6a75d85e49a1675ef5be34724b