From 487a4c31f477c178962a3c301f75c70dd1e824a3 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Feb 18 2020 14:20:27 +0000 Subject: 5.18.1 --- diff --git a/.gitignore b/.gitignore index 4375ace..5991b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /plasma-desktop-5.17.5.tar.xz /plasma-desktop-5.17.90.tar.xz /plasma-desktop-5.18.0.tar.xz +/plasma-desktop-5.18.1.tar.xz diff --git a/0011-KCM-Fonts-force-need-save-to-false-during-load-to-av.patch b/0011-KCM-Fonts-force-need-save-to-false-during-load-to-av.patch deleted file mode 100644 index 5ac7649..0000000 --- a/0011-KCM-Fonts-force-need-save-to-false-during-load-to-av.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0c4da0774e4388b6937b5aa98124b696debcb601 Mon Sep 17 00:00:00 2001 -From: Benjamin Port -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 - diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 9437cea..54d37cc 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,8 +3,8 @@ Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.18.0 -Release: 2%{?dist} +Version: 5.18.1 +Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://cgit.kde.org/%{name}.git @@ -21,7 +21,6 @@ URL: https://cgit.kde.org/%{name}.git 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 # default kickoff favorites: +konsole +apper @@ -174,7 +173,6 @@ BuildArch: noarch %setup -q ## upstream patches -%patch11 -p1 -b .0011 ## upstreamable patches @@ -325,6 +323,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k %changelog +* Tue Feb 18 2020 Jan Grulich - 5.18.1-1 +- 5.18.1 + * Mon Feb 17 2020 Rex Dieter - 5.18.0-2 - pull in upstream kcm_fonts fix diff --git a/sources b/sources index aed9f82..d43b286 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-desktop-5.18.0.tar.xz) = 863516751f4f37193ad5a96713fa9c7eb8d346e3bbe33dc43dcb83fa18955456dc875ddc3e2db990e7f3a017e394a69790e3dc21e13e8fc0c5d6841591c8fb4e +SHA512 (plasma-desktop-5.18.1.tar.xz) = d0c3057f48dd5ce0d7d4a5a5931f58b879325a426107356fd618c9eea5fc3837ebef2635ac930c11d3061e3adf5c40deefdff8a38e7ca2e09f594acc02b5cc77