Added patch to fix #457019

epel9
Yaroslav Sidlovsky 3 years ago
parent 5944a00e98
commit 6514987538

@ -0,0 +1,38 @@
From d6d47393bab32dc60b43e0eeac16c035000a0358 Mon Sep 17 00:00:00 2001
From: Eugene Popov <popov895@ukr.net>
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<QString>(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<QString>(selected.constBegin(), selected.constEnd());
});
m_findToken = token;
finder->start();
--
GitLab

@ -28,7 +28,7 @@
Name: plasma-workspace Name: plasma-workspace
Summary: Plasma workspace, applications and applets Summary: Plasma workspace, applications and applets
Version: 5.25.3.1 Version: 5.25.3.1
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
URL: https://invent.kde.org/plasma/%{name} URL: https://invent.kde.org/plasma/%{name}
@ -65,6 +65,9 @@ Source41: spice-vdagent.conf
## upstream Patches (master branch) ## upstream Patches (master branch)
# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1879 # https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1879
Patch50: disable-toplevel-fixed-positions-on-wayland.patch 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 ## upstreamable Patches
@ -773,6 +776,9 @@ fi
%changelog %changelog
* Sun Jul 24 2022 Yaroslav Sidlovsky <zawertun@gmail.com> - 5.25.3.1-5
- Added patch to fix #457019
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.25.3.1-4 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.25.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Loading…
Cancel
Save