diff --git a/.gitignore b/.gitignore index 9035fa4..f4e3b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /kconfigwidgets-5.102.0.tar.xz /kconfigwidgets-5.103.0.tar.xz /kconfigwidgets-5.104.0.tar.xz +/kconfigwidgets-5.105.0.tar.xz diff --git a/kcolorschememanager-dont-override-color-scheme-set-by-platform-theme.patch b/kcolorschememanager-dont-override-color-scheme-set-by-platform-theme.patch deleted file mode 100644 index e27eba7..0000000 --- a/kcolorschememanager-dont-override-color-scheme-set-by-platform-theme.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2cd530626aeafd861c65b434af85d5153da618a2 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Thu, 9 Mar 2023 11:19:28 +0100 -Subject: [PATCH] KColorSchemeManager: don't override color scheme set by - platform theme - -This allows to have Qt platform theme setting the color scheme before -it gets set and overriden by KColorSchemeManager. This is useful for 3rd -party platform themes like QGnomePlatform, allowing them to set a color -scheme that would complement QPalette. Since many KDE apps rely on using -KColorScheme, it can happen that they will use a color from KColorScheme -that doesn't correspond to QPalette set through the platform theme and -end up being broken. - -BUG: 447029 ---- - src/kcolorschememanager.cpp | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/kcolorschememanager.cpp b/src/kcolorschememanager.cpp -index 4c7e3be0..0c845555 100644 ---- a/src/kcolorschememanager.cpp -+++ b/src/kcolorschememanager.cpp -@@ -109,8 +109,17 @@ KColorSchemeManager::KColorSchemeManager(QObject *parent) - QString schemePath; - - if (scheme.isEmpty() || scheme == QLatin1String("Default")) { -- schemePath = d->automaticColorSchemePath(); -- d->m_defaultSchemeSelected = true; -+ // Color scheme might be already set from a platform theme -+ // This is used for example by QGnomePlatform that can set color scheme -+ // matching GNOME settings. This avoids issues where QGnomePlatform sets -+ // QPalette for dark theme, but end up mixing it also with Breeze light -+ // that is going to be used as a fallback for apps using KColorScheme. -+ // BUG: 447029 -+ schemePath = qApp->property("KDE_COLOR_SCHEME_PATH").toString(); -+ if (schemePath.isEmpty()) { -+ schemePath = d->automaticColorSchemePath(); -+ d->m_defaultSchemeSelected = true; -+ } - } else { - schemePath = indexForScheme(scheme).data(KColorSchemeModel::PathRole).toString(); - d->m_defaultSchemeSelected = false; --- -GitLab - diff --git a/kf5-kconfigwidgets.spec b/kf5-kconfigwidgets.spec index ef46db8..6cc4555 100644 --- a/kf5-kconfigwidgets.spec +++ b/kf5-kconfigwidgets.spec @@ -1,8 +1,8 @@ %global framework kconfigwidgets Name: kf5-%{framework} -Version: 5.104.0 -Release: 2%{?dist} +Version: 5.105.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 addon for creating configuration dialogs License: GPLv2+ and LGPLv2+ and MIT @@ -12,8 +12,6 @@ URL: https://invent.kde.org/frameworks/%{framework} %global stable %stable_kf5 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz -# Can be dropped with KF5 5.105 (already merged there) -Patch0: kcolorschememanager-dont-override-color-scheme-set-by-platform-theme.patch BuildRequires: extra-cmake-modules >= %{majmin} BuildRequires: kf5-kauth-devel >= %{majmin} @@ -87,6 +85,9 @@ developing applications that use %{name}. %changelog +* Sun Apr 02 2023 Marc Deop i Argemí - 5.105.0-1 +- 5.105.0 + * Mon Mar 20 2023 Jan Grulich - 5.104.0-2 - KColorSchemeManager: don't override color scheme set by platform theme diff --git a/sources b/sources index 441a599..28fbabd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kconfigwidgets-5.104.0.tar.xz) = 12753a86c512c5ebec97b76d2d3dd9085f7ee60f3eab47d24a4fd237101a3a16c8708779ef4020a4aedebf6963a8036864b57492004023de091d186fe8a3685c +SHA512 (kconfigwidgets-5.105.0.tar.xz) = eb69c032485a2c8425ee189d4047ed167778bc32ed2cce696676e70d4216426c59cb1c1758113fe313e26d83ad4a4c0bc9c2b42b70cc8efa81aa8e4d2b093b7c