Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=9c9973616bd32e22302ccb46d4c7bf0e3a9b2019
commit 9c9973616bd32e22302ccb46d4c7bf0e3a9b2019 Author: crazy <[email protected]> Date: Mon Mar 13 21:39:47 2017 +0100 plasma-framework-5.32.0-2-x86_64 * added backport patch from git * fixes broken focus on 5.32.0 diff --git a/source/kf5/plasma-framework/FrugalBuild b/source/kf5/plasma-framework/FrugalBuild index 5034d7e..2e78e65 100644 --- a/source/kf5/plasma-framework/FrugalBuild +++ b/source/kf5/plasma-framework/FrugalBuild @@ -3,15 +3,17 @@ pkgname=plasma-framework pkgver=5.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plasma library and runtime components based upon KF5 and Qt5." groups=('kf5') archs=("x86_64") _F_kde_project="frameworks" Finclude kf5 +source+=('fix-5.32.0-regression.patch') depends=("kactivities5>=$_F_kf5_full" "kdeclarative>=$_F_kf5_full" "kwayland>=$_F_kf5_full") makedepends+=("kdoctools>=$_F_kf5_full") -sha1sums=('20f170c4bc9108b3c1e596f7413104e6a431281c') +sha1sums=('20f170c4bc9108b3c1e596f7413104e6a431281c' \ + 'da375d06744f4d73fe87ad27e59d6c43882a7a03') conflicts=('kdebase-runtime-plasma' 'libplasma' 'libplasmaclock' \ 'plasma-scriptengine-python' 'plasma-scriptengine-ruby' 'plasma-scriptengine-webkit') diff --git a/source/kf5/plasma-framework/fix-5.32.0-regression.patch b/source/kf5/plasma-framework/fix-5.32.0-regression.patch new file mode 100644 index 0000000..c9af2e3 --- /dev/null +++ b/source/kf5/plasma-framework/fix-5.32.0-regression.patch @@ -0,0 +1,42 @@ +From 547a34d346695295ce05499ae355203414412993 Mon Sep 17 00:00:00 2001 +From: David Edmundson <[email protected]> +Date: Fri, 10 Mar 2017 09:49:47 +0000 +Subject: Handle applyPrefixes with an empty string + +Summary: +When setting an empty QStringList as prefix, it can lead to unexpected results, such as the prefix not changing. + +BUG: 377441 + +Reviewers: #plasma + +Subscribers: plasma-devel, #frameworks + +Tags: #plasma, #frameworks + +Differential Revision: https://phabricator.kde.org/D5000 +--- + src/declarativeimports/core/framesvgitem.cpp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp +index 81f9e63..8e6225f 100644 +--- a/src/declarativeimports/core/framesvgitem.cpp ++++ b/src/declarativeimports/core/framesvgitem.cpp +@@ -556,7 +556,13 @@ void FrameSvgItem::updateDevicePixelRatio() + + void FrameSvgItem::applyPrefixes() + { +- if (m_prefixes.isEmpty() || m_frameSvg->imagePath().isEmpty()) { ++ ++ if (m_frameSvg->imagePath().isEmpty()) { ++ return; ++ } ++ ++ if (m_prefixes.isEmpty()) { ++ m_frameSvg->setElementPrefix(QString()); + return; + } + +-- +cgit v0.11.2 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
