pull in upstream kcm_fonts fix

epel9
Rex Dieter 5 years ago
parent e87a214b2a
commit 9d55906dd7

@ -0,0 +1,40 @@
From 0c4da0774e4388b6937b5aa98124b696debcb601 Mon Sep 17 00:00:00 2001
From: Benjamin Port <benjamin.port@enioka.com>
Date: Thu, 13 Feb 2020 21:14:43 +0100
Subject: [PATCH 11/15] [KCM Fonts] force need save to false during load to
avoid state to be true too early
Summary:
This will resolve a bug (apply never enabled). Bug occurs (at least) when kdeglobals contains QFont serialization without styleName (old style)
BUG: 416358
Reviewers: #plasma, broulik, ervin, crossi, meven, ngraham, davidedmundson
Subscribers: plasma-devel
Tags: #plasma
Differential Revision: https://phabricator.kde.org/D27384
---
kcms/fonts/fonts.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
index 32e1239ad..f771f6e51 100644
--- a/kcms/fonts/fonts.cpp
+++ b/kcms/fonts/fonts.cpp
@@ -572,8 +572,8 @@ void KFonts::load()
// previews
engine()->addImageProvider("preview", new PreviewImageProvider(m_settings->font()));
- // reload state after loading by emiting a settings signal
- emit m_settings->activeFontChanged();
+ // KCM expect save state to be false at this point (can be true because of setNearestExistingFonts
+ setNeedsSave(false);
}
void KFonts::save()
--
2.24.1

@ -4,7 +4,7 @@
Name: plasma-desktop Name: plasma-desktop
Summary: Plasma Desktop shell Summary: Plasma Desktop shell
Version: 5.18.0 Version: 5.18.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3) License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://cgit.kde.org/%{name}.git URL: https://cgit.kde.org/%{name}.git
@ -20,11 +20,13 @@ URL: https://cgit.kde.org/%{name}.git
%endif %endif
Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.tar.xz Source0: http://download.kde.org/%{stable}/plasma/%{verdir}/%{name}-%{version}.tar.xz
## upstream patches
Patch11: 0011-KCM-Fonts-force-need-save-to-false-during-load-to-av.patch
## downstream patches ## downstream patches
# default kickoff favorites: +konsole +apper # default kickoff favorites: +konsole +apper
Patch100: plasma-desktop-5.8-default_favorites.patch Patch100: plasma-desktop-5.8-default_favorites.patch
## upstreamable patches ## upstreamable patches
# filter qmk/plugins provides # filter qmk/plugins provides
@ -171,13 +173,14 @@ BuildArch: noarch
%prep %prep
%setup -q %setup -q
## downstream patches
%patch100 -p1
## upstream patches ## upstream patches
%patch11 -p1 -b .0011
## upstreamable patches ## upstreamable patches
## downstream patches
%patch100 -p1
# FIXME: relax plasma-breeze dep # FIXME: relax plasma-breeze dep
sed -i.breeze_ver \ sed -i.breeze_ver \
-e "s|find_package(Breeze \${PROJECT_VERSION} |find_package(Breeze %{majmin_ver} |" \ -e "s|find_package(Breeze \${PROJECT_VERSION} |find_package(Breeze %{majmin_ver} |" \
@ -322,6 +325,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
%changelog %changelog
* Mon Feb 17 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.18.0-2
- pull in upstream kcm_fonts fix
* Tue Feb 11 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.0-1 * Tue Feb 11 2020 Jan Grulich <jgrulich@redhat.com> - 5.18.0-1
- 5.18.0 - 5.18.0

Loading…
Cancel
Save