From 651498753881aa4548ebdf0c365c6803122e4c04 Mon Sep 17 00:00:00 2001 From: Yaroslav Sidlovsky Date: Sun, 24 Jul 2022 19:11:46 +0300 Subject: [PATCH] Added patch to fix #457019 --- ...e-to-remove-manually-added-wallpaper.patch | 38 +++++++++++++++++++ plasma-workspace.spec | 8 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch diff --git a/plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch b/plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch new file mode 100644 index 0000000..7b92eda --- /dev/null +++ b/plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch @@ -0,0 +1,38 @@ +From d6d47393bab32dc60b43e0eeac16c035000a0358 Mon Sep 17 00:00:00 2001 +From: Eugene Popov +Date: Sun, 24 Jul 2022 00:18:44 +0000 +Subject: [PATCH] [FIX] Unable to remove manually added wallpaper + +It's not necessary to assign m_removableWallpapers asynchronously, because the value assigned to it doesn't depend on the result of that asynch function. + +!!! This MR is for the Plasma/5.25 branch only and it SHOULD NOT be cherry-picket into the master branch. + +BUG: 457019 +--- + wallpapers/image/plugin/backgroundlistmodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wallpapers/image/plugin/backgroundlistmodel.cpp b/wallpapers/image/plugin/backgroundlistmodel.cpp +index 8c5630712..0b12470a5 100644 +--- a/wallpapers/image/plugin/backgroundlistmodel.cpp ++++ b/wallpapers/image/plugin/backgroundlistmodel.cpp +@@ -107,6 +107,8 @@ void BackgroundListModel::reload(const QStringList &selected) + return; + } + ++ m_removableWallpapers = QSet(selected.constBegin(), selected.constEnd()); ++ + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("wallpapers/"), QStandardPaths::LocateDirectory); + + BackgroundFinder *finder = new BackgroundFinder(m_wallpaper.data(), dirs); +@@ -117,7 +119,6 @@ void BackgroundListModel::reload(const QStringList &selected) + } + + processPaths(selected + wallpapersFound); +- m_removableWallpapers = QSet(selected.constBegin(), selected.constEnd()); + }); + m_findToken = token; + finder->start(); +-- +GitLab + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 50b9360..2edb9e4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -65,6 +65,9 @@ Source41: spice-vdagent.conf ## upstream Patches (master branch) # https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1879 Patch50: disable-toplevel-fixed-positions-on-wayland.patch +# Fix for 457019: Can't remove manually added wallpaper +# (https://bugs.kde.org/show_bug.cgi?id=457019) +Patch60: plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch ## upstreamable Patches @@ -773,6 +776,9 @@ fi %changelog +* Sun Jul 24 2022 Yaroslav Sidlovsky - 5.25.3.1-5 +- Added patch to fix #457019 + * Fri Jul 22 2022 Fedora Release Engineering - 5.25.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild