diff --git a/0001-When-swapping-Wallpapers-save-the-config-to-file-not.patch b/0001-When-swapping-Wallpapers-save-the-config-to-file-not.patch new file mode 100644 index 0000000..1bd03ec --- /dev/null +++ b/0001-When-swapping-Wallpapers-save-the-config-to-file-not.patch @@ -0,0 +1,59 @@ +From a9f5ada73bf86a145e057eff188f45dfdf61917a Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Thu, 26 Jan 2017 16:17:51 +0000 +Subject: [PATCH] When swapping Wallpapers, save the config to file, not just + to propertymap + +Summary: +ContainmentConfigView has a special code path for wallpaper configs +where, if you change wallpaper type, it will create a temporary config +ConfigPropertyMap, then copy it over to the real config when the +containment actually changes. + +ConfigPropertyMap does not call valueChanged() on insertion (See +QQmlPropertyMap), and we only write the value into the actual +KConfigSkeleton on valueChange. + +BUG: 375532 + +Test Plan: +Start plasma with image wallpaper +Set to colour wallpaper and save colour +Hit apply + +Close plasma +Start plasma + +Before the correct colour wouldn't be loaded. Now it is. + +Reviewers: #plasma, mart + +Reviewed By: mart + +Subscribers: plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D4285 +--- + shell/containmentconfigview.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp +index 269ae2b3..4d107bec 100644 +--- a/shell/containmentconfigview.cpp ++++ b/shell/containmentconfigview.cpp +@@ -220,7 +220,9 @@ void ContainmentConfigView::applyWallpaper() + + if (m_currentWallpaperConfig && m_ownWallpaperConfig) { + for (const auto &key : m_ownWallpaperConfig->keys()) { +- m_currentWallpaperConfig->insert(key, m_ownWallpaperConfig->value(key)); ++ auto value = m_ownWallpaperConfig->value(key); ++ m_currentWallpaperConfig->insert(key, value); ++ m_currentWallpaperConfig->valueChanged(key, value); + } + } + +-- +2.11.0 + diff --git a/plasma-workspace-5.8.95.tar.xz b/plasma-workspace-5.8.95.tar.xz deleted file mode 100644 index 3c568dc..0000000 --- a/plasma-workspace-5.8.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c42f9e353f3a90e632452f38afb653e0c9c485974542347ff9d10b0c85d45a58 -size 6931196 diff --git a/plasma-workspace-5.9.0.tar.xz b/plasma-workspace-5.9.0.tar.xz new file mode 100644 index 0000000..c12dcd5 --- /dev/null +++ b/plasma-workspace-5.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8f210bf40c88208802b29ec1660efffe347a55b85e5f2e18ee9f475717ac2d3 +size 6934620 diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index fad7103..af82c73 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Thu Jan 26 19:59:03 CET 2017 - fabian@ritter-vogt.de + +- Update to 5.9.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.9.0.php +- Add upstream patch to fix kde#375532: + * 0001-When-swapping-Wallpapers-save-the-config-to-file-not.patch +- Changes since 5.8.95: + * [Icon Applet] Use KIO::statJob to work with remote URLs + * Fix group parents not appearing when disabling inline grouping. + * [Image Wallpaper] Provide fallback for thumbnail size of no "plasmoid" around + * only reset the model after componentComplete() + * [lookandfeel] Breeze window decoration + * Fix "Unpin" for tasks pinned to specific activities. + * applets/icon: Set i18n domain (patch by Victor) + * use Q_FOREACH in this branch + * Corona::screenGeometryChanged on qscreen resized + * add #include for old Qt versions + * Replace std::bind with lambda. + * try to put annotations before parameters definition + * fix dbus xml compilation + * guard against menu being deleted whilst updating + * Hide menu if the menu disappears off DBus + * Don't re-evaluate the model constantly whilst looping through windows + * Generate DBusMenu Interface for libdbusmenuqt + * pre-load the first layer of sub menus + * Signal which menu has updated in libdbusmenu-qt + * Don't hide applet when it needs configuring + * Don't load menu when switching window focus to the desktop + * Keep AppletMenu as small as possible + * Fix calling KWindowSystem::windowType without fetching the type + * Enable Edit Action in plasmoid mode + * Fix mapToGlobal + * Show "All Widgets" even when showSpecialFilters=false. + * [Icon Applet] Rename open() to run() to fix compilation on 32-bit + ------------------------------------------------------------------- Thu Jan 12 20:39:58 UTC 2017 - fabian@ritter-vogt.de diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 9ced6f5..0824340 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -20,17 +20,17 @@ %bcond_without lang Name: plasma5-workspace -Version: 5.8.95 +Version: 5.9.0 Release: 0 -# Full Plasma 5 version (e.g. 5.8.95) +# Full Plasma 5 version (e.g. 5.9.0) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} -# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.8.95 in KUF) +# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.0 in KUF) %{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: The KDE Plasma Workspace Components License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz +Source: plasma-workspace-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch @@ -39,6 +39,8 @@ Patch1: change-kioremote-severity.patch # PATCH-FIX-OPENSUSE 0001-Ignore-default-sddm-face-icons.patch boo#1001364 fabian@ritter-vogt.de -- Ignore default sddm face icons Patch2: 0001-Ignore-default-sddm-face-icons.patch # PATCHES 100-200 and above are from upstream 5.9 branch +# PATCH-FIX-UPSTREAM 0001-When-swapping-Wallpapers-save-the-config-to-file-not.patch kde@davidedmundson.co.uk -- When swapping Wallpapers, save the config to file +Patch100: 0001-When-swapping-Wallpapers-save-the-config-to-file-not.patch # PATCHES 201-300 and above are from upstream master/5.10 branch BuildRequires: breeze5-icons BuildRequires: fdupes @@ -209,6 +211,7 @@ workspace. Development files. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch100 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}