Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2016-05-31 12:12:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-19 12:13:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2016-05-31 12:12:06.000000000 +0200 @@ -1,0 +2,14 @@ +Sun May 29 21:53:13 UTC 2016 - [email protected] + +- Add Cleanup-and-fixup-KConfig-handling-for-componentchooser.patch + to fix setting the default browser (boo#931316) +- Add fix-opening-recent-docs.patch to fix opening recent documents + from the application menu on newer KF5 (boo#982146, kde#363337) + +------------------------------------------------------------------- +Tue May 24 05:18:41 UTC 2016 - [email protected] + +- Add 100-fix-compile-with-gcc6.diff from upstream Plasma/5.6 branch + * Fix compilation with GCC 6 (missing cmath include) + +------------------------------------------------------------------- New: ---- 100-fix-compile-with-gcc6.diff Cleanup-and-fixup-KConfig-handling-for-componentchooser.patch fix-opening-recent-docs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.3mOsff/_old 2016-05-31 12:12:07.000000000 +0200 +++ /var/tmp/diff_new_pack.3mOsff/_new 2016-05-31 12:12:07.000000000 +0200 @@ -27,7 +27,11 @@ Source: plasma-desktop-%{version}.tar.xz Source99: %{name}-rpmlintrc Patch0: 0001-Require-xorg-evdev-2.8.99.1.patch +# PATCH-FIX-UPSTREAM: 100-fix-compile-with-gcc6.diff - Fix compilation with GCC 6 +Patch1: 100-fix-compile-with-gcc6.diff # PATCHES 100-200 and above are from upstream 5.6 branch +Patch100: Cleanup-and-fixup-KConfig-handling-for-componentchooser.patch +Patch101: fix-opening-recent-docs.patch # PATCHES 201-300 and above are from upstream master/5.7 branch BuildRequires: boost-devel BuildRequires: extra-cmake-modules >= 1.8.0 @@ -173,7 +177,10 @@ %setup -q -n plasma-desktop-%{version} %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" %patch0 -Rp1 +%patch1 -p1 %endif +%patch100 -p1 +%patch101 -p1 # conflict with kactivitimanagerd lang (and unused) rm -rf po/*/kactivities5.po ++++++ 100-fix-compile-with-gcc6.diff ++++++ --- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp +++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp @@ -46,6 +46,7 @@ * Peter Osterlund ([email protected]) */ +#include <cmath> #include <QDebug> #include "synapticstouchpad.h" ++++++ Cleanup-and-fixup-KConfig-handling-for-componentchooser.patch ++++++ From: Hrvoje Senjan <[email protected]> Date: Tue, 17 May 2016 20:16:53 +0000 Subject: Cleanup and fixup KConfig handling for componentchooser X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=27ebf75bd44101976d8392eec4ff4d20f495fb69 --- Cleanup and fixup KConfig handling for componentchooser Fixup for reviews 123288 and 123281. REVIEW: 127918 --- --- a/kcms/componentchooser/componentchooserbrowser.cpp +++ b/kcms/componentchooser/componentchooserbrowser.cpp @@ -83,7 +83,7 @@ void CfgBrowser::save(KConfig *) { - KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig); + KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals")); KConfigGroup config(profile, QStringLiteral("General")); QString exec; if (radioExec->isChecked()) @@ -97,7 +97,7 @@ config.writePathEntry( QStringLiteral("BrowserApplication"), exec); // KConfig::Normal|KConfig::Global config.sync(); - Kdelibs4SharedConfig::syncConfigGroup(&config, QStringLiteral("kdeglobals")); + Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("General"), "kdeglobals"); KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged); --- a/kcms/componentchooser/componentchooserfilemanager.cpp +++ b/kcms/componentchooser/componentchooserfilemanager.cpp @@ -106,7 +106,7 @@ KConfigGroup defaultApp(profile, s_DefaultApplications); defaultApp.writeXdgListEntry(mime, QStringList(storageId)); - Kdelibs4SharedConfig::syncConfigGroup(&addedApps, QStringLiteral("mimeapps.list")); + Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("Added Associations"), QStringLiteral("mimeapps.list")); profile->sync(); --- a/kcms/componentchooser/componentchooserterminal.cpp +++ b/kcms/componentchooser/componentchooserterminal.cpp @@ -79,13 +79,13 @@ void CfgTerminalEmulator::save(KConfig *) { - KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig); + KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals")); KConfigGroup config(profile, QStringLiteral("General")); const QString terminal = terminalCB->isChecked() ? QStringLiteral("konsole") : terminalLE->text(); config.writePathEntry("TerminalApplication", terminal); // KConfig::Normal|KConfig::Global); config.sync(); - Kdelibs4SharedConfig::syncConfigGroup(&config, QStringLiteral("kdeglobals")); + Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("General"), "kdeglobals"); KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged); --- a/kcms/input/mouse.cpp +++ b/kcms/input/mouse.cpp @@ -441,10 +441,10 @@ settings->reverseScrollPolarity = generalTab->cbScrollPolarity->isChecked(); settings->apply(); - KConfig config( "kcminputrc", KConfig::SimpleConfig ); + KConfig config( "kcminputrc" ); settings->save(&config); - KConfig ac("kaccessrc", KConfig::SimpleConfig); + KConfig ac("kaccessrc"); KConfigGroup group = ac.group("Mouse"); @@ -728,26 +728,27 @@ void MouseSettings::save(KConfig *config) { - KConfigGroup group = config->group("Mouse"); - group.writeEntry("Acceleration",accelRate); - group.writeEntry("Threshold",thresholdMove); + KSharedConfig::Ptr kcminputProfile = KSharedConfig::openConfig("kcminputrc"); + KConfigGroup kcminputGroup(kcminputProfile, "Mouse"); + kcminputGroup.writeEntry("Acceleration",accelRate); + kcminputGroup.writeEntry("Threshold",thresholdMove); if (handed == RIGHT_HANDED) - group.writeEntry("MouseButtonMapping",QString("RightHanded")); + kcminputGroup.writeEntry("MouseButtonMapping",QString("RightHanded")); else - group.writeEntry("MouseButtonMapping",QString("LeftHanded")); - group.writeEntry( "ReverseScrollPolarity", reverseScrollPolarity ); - - Kdelibs4SharedConfig::syncConfigGroup(&group, "kinputrc"); - - KSharedConfig::Ptr profile = KSharedConfig::openConfig("kdeglobals", KConfig::SimpleConfig); - group = KConfigGroup(profile, "KDE"); + kcminputGroup.writeEntry("MouseButtonMapping",QString("LeftHanded")); + kcminputGroup.writeEntry( "ReverseScrollPolarity", reverseScrollPolarity ); + + Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("Mouse"), "kcminputrc"); + + KSharedConfig::Ptr profile = KSharedConfig::openConfig("kdeglobals"); + KConfigGroup group(profile, "KDE"); group.writeEntry("DoubleClickInterval", doubleClickInterval, KConfig::Persistent); group.writeEntry("StartDragTime", dragStartTime, KConfig::Persistent); group.writeEntry("StartDragDist", dragStartDist, KConfig::Persistent); group.writeEntry("WheelScrollLines", wheelScrollLines, KConfig::Persistent); group.writeEntry("SingleClick", singleClick, KConfig::Persistent); - Kdelibs4SharedConfig::syncConfigGroup(&group, "kdeglobals"); + Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("KDE"), "kdeglobals"); group.sync(); config->sync(); --- a/kcms/migrationlib/kdelibs4config.h +++ b/kcms/migrationlib/kdelibs4config.h @@ -25,18 +25,15 @@ class Kdelibs4SharedConfig { public: - static KSharedConfig::Ptr openConfig(const QString &fileName, KConfig::OpenFlags mode=KConfig::SimpleConfig) + static void syncConfigGroup(const QLatin1String &sourceGroup, const QString &fileName) { Kdelibs4Migration migration; QString configDirPath = migration.saveLocation("config"); - return KSharedConfig::openConfig(configDirPath + '/' + fileName); - } - - static void syncConfigGroup(KConfigGroup *sourceGroup, const QString &fileName) - { - KSharedConfigPtr kde4Config = openConfig(fileName); - KConfigGroup kde4ConfigGroup = kde4Config->group(sourceGroup->name()); - sourceGroup->copyTo(&kde4ConfigGroup); + KSharedConfigPtr kde4Config = KSharedConfig::openConfig(configDirPath + '/' + fileName); + KSharedConfigPtr simpleConfig = KSharedConfig::openConfig("kdeglobals", KConfig::SimpleConfig); + KConfigGroup simpleConfigGroup(simpleConfig, sourceGroup); + KConfigGroup kde4ConfigGroup = kde4Config->group(sourceGroup); + simpleConfigGroup.copyTo(&kde4ConfigGroup); kde4ConfigGroup.sync(); } ++++++ fix-opening-recent-docs.patch ++++++ From: Eike Hein <[email protected]> Date: Tue, 24 May 2016 09:50:15 +0000 Subject: Fix opening recent docs on newer KF5. X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=8a9772d8673a58583317b4906a9352d6bf44a8e2 --- Fix opening recent docs on newer KF5. The KActivities model can return scheme-less local paths, and execution didn't go through the code path already handling this. BUG:363337 --- --- a/applets/kicker/plugin/recentusagemodel.cpp +++ b/applets/kicker/plugin/recentusagemodel.cpp @@ -273,7 +273,7 @@ const QString &resource = resourceAt(row); if (!resource.startsWith(QLatin1String("applications:"))) { - new KRun(QUrl(resource), 0); + new KRun(docData(resource, Kicker::UrlRole).toUrl(), 0); return true; }
