Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2015-02-16 15:05:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2015-01-29 13:17:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2015-02-16 17:43:09.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 9 11:43:27 UTC 2015 - [email protected] + +- Added kde343583.patch, in order to resolve kde#343583 and workaround + kde#340691 + +------------------------------------------------------------------- New: ---- kde343583.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.MqAwTD/_old 2015-02-16 17:43:10.000000000 +0100 +++ /var/tmp/diff_new_pack.MqAwTD/_new 2015-02-16 17:43:10.000000000 +0100 @@ -25,6 +25,8 @@ Url: http://www.kde.org/ Source: plasma-desktop-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM kde343583.patch -- https://bugs.kde.org/show_bug.cgi?id=343583#c11 +Patch0: kde343583.patch BuildRequires: attica-qt5-devel BuildRequires: baloo5-devel >= %{version} BuildRequires: boost-devel @@ -103,6 +105,7 @@ %lang_package %prep %setup -q -n plasma-desktop-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ kde343583.patch ++++++ From: Matthew Dawson <[email protected]> Date: Mon, 09 Feb 2015 15:39:22 +0000 Subject: When setting colour scheme information for KDE4, don't read from KF5 kdeglobals X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=523497fde1828acfb70a242959b6ee7af1b0dde4 --- When setting colour scheme information for KDE4, don't read from KF5 kdeglobals When krdb sets the colour scheme for KDE4 applications, it should not use the KF5 global or system configuration, as it won't be in the correct format. Instead, setup KConfig instances to only read the file given. This also works around bug 340691 in KConfig, which fixes bug 343583. Note this change should be left regardless of when KConfig is fixed, as KF5 settings remain unneeded in KDE4 configuration files. BUG: 343583 FIXED-IN: 5.2.1 --- --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp @@ -634,7 +634,7 @@ return; } - KConfig kde4config(configFilePath); + KConfig kde4config(configFilePath, KConfig::SimpleConfig); KConfigGroup kde4generalGroup(&kde4config, "General"); kde4generalGroup.writeEntry("ColorScheme", colorSchemeName); @@ -677,7 +677,7 @@ kde4IconGroup.sync(); //copy all the groups in the color scheme in kdeglobals - KSharedConfigPtr kde4ColorConfig = KSharedConfig::openConfig(src); + KSharedConfigPtr kde4ColorConfig = KSharedConfig::openConfig(src, KConfig::SimpleConfig); foreach (const QString &grp, kde4ColorConfig->groupList()) { KConfigGroup cg(kde4ColorConfig, grp); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
