Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24a80a348341d9ec6cf4a6a46e0773b5d1d1b76e
commit 24a80a348341d9ec6cf4a6a46e0773b5d1d1b76e Author: crazy <[email protected]> Date: Sat Apr 23 21:50:50 2016 +0200 plasma-framework-5.21.0-2-x86_64 * backport fix from git * for the full changelog see : https://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=d884119f5a4a618eb30baaf5cd0ef058269b27f3&hp=08312b2e340e10d640131c0186e81a0b9f0f2505 diff --git a/source/kf5/plasma-framework/FrugalBuild b/source/kf5/plasma-framework/FrugalBuild index 2a293dd..d59a6c0 100644 --- a/source/kf5/plasma-framework/FrugalBuild +++ b/source/kf5/plasma-framework/FrugalBuild @@ -1,17 +1,17 @@ # Compiling Time: 0.44 SBU # Maintainer: Melko <[email protected]> - pkgname=plasma-framework -pkgrel=1 +pkgrel=2 pkgdesc="Plasma library and runtime components based upon KF5 and Qt5." groups=('kf5') archs=('i686' 'x86_64') _F_kde_project="frameworks" Finclude kf5 +source+=(fix-theme.patch) depends=("kactivities5>=$_F_kde_ver" "kdeclarative>=$_F_kde_ver") - -sha1sums=('3ce885ef701f2b3e031be17152770cb94aafda24') +sha1sums=('3ce885ef701f2b3e031be17152770cb94aafda24' \ + 'e586b537fecf4f21e51c1e3ee256d790685f0216') conflicts=('kdebase-runtime-plasma' 'libplasma' 'libplasmaclock' \ 'plasma-scriptengine-python' 'plasma-scriptengine-ruby' 'plasma-scriptengine-webkit') diff --git a/source/kf5/plasma-framework/fix-theme.patch b/source/kf5/plasma-framework/fix-theme.patch new file mode 100644 index 0000000..431583e --- /dev/null +++ b/source/kf5/plasma-framework/fix-theme.patch @@ -0,0 +1,38 @@ +From: Wolfgang Bauer <[email protected]> +Date: Fri, 22 Apr 2016 17:23:35 +0000 +Subject: Always write the theme name to plasmarc, also if the default theme is chosen +X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=d884119f5a4a618eb30baaf5cd0ef058269b27f3 +--- +Always write the theme name to plasmarc, also if the default theme is chosen + +Currently, the "name" key is deleted from plasmarc when you select the +default theme (breeze) in the desktop theme KCM. +This leads to unexpected behaviour: If you set e.g. oxygen as look&feel, +and then set breeze as desktop theme, Plasma actually uses Air (the +default desktop theme in the oxygen l&f) on next login instead of +breeze. In other words, it is impossible to configure breeze as desktop +theme when using a different look&feel as breeze. + +This fixes the problem by removing the check whether the default theme +is selected and always writes the "name" config key to plasmarc. + +REVIEW: 127698 +--- + + +--- a/src/plasma/private/theme_p.cpp ++++ b/src/plasma/private/theme_p.cpp +@@ -846,11 +846,7 @@ + if (realTheme && isDefault && writeSettings) { + // we're the default theme, let's save our state + KConfigGroup &cg = config(); +- if (ThemePrivate::defaultTheme == themeName) { +- cg.deleteEntry("name"); +- } else { +- cg.writeEntry("name", themeName); +- } ++ cg.writeEntry("name", themeName); + cg.sync(); + } + + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
