diff --git a/fix-sddm-multi-screen.patch b/fix-sddm-multi-screen.patch deleted file mode 100644 index d69122b..0000000 --- a/fix-sddm-multi-screen.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3c85e2e8899d1253430783a618d7584d985bd614 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 21 Feb 2023 16:03:51 +0100 -Subject: [PATCH] Use the QScreen of the QWindow as default output - -If the Window::setDesiredOutput API was not called for the QWindow, use -QWindow::screen(). This allows assigning QWindows to specific screens using -the plain Qt API. - -Passing nullptr to Window::setDesiredOutput explicitly results in nil as -desired output for the layer, which lets the compositor select a screen. ---- - src/interfaces/window.cpp | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/interfaces/window.cpp b/src/interfaces/window.cpp -index 477b74e..7aa39f4 100644 ---- a/src/interfaces/window.cpp -+++ b/src/interfaces/window.cpp -@@ -8,6 +8,7 @@ - #include - - #include -+#include - - using namespace LayerShellQt; - -@@ -26,7 +27,7 @@ public: - Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive; - Window::Layer layer = Window::LayerTop; - QMargins margins; -- QPointer desiredOutput; -+ std::optional> desiredOutput; - }; - - static QMap s_map; -@@ -103,7 +104,12 @@ Window::Layer Window::layer() const - - QScreen *Window::desiredOutput() const - { -- return d->desiredOutput; -+ // Don't use .value_or here to avoid a temporary QPointer -+ if (d->desiredOutput.has_value()) { -+ return d->desiredOutput.value(); -+ } -+ -+ return d->parentWindow->screen(); - } - - void Window::setDesiredOutput(QScreen *output) --- -GitLab - diff --git a/layer-shell-qt.spec b/layer-shell-qt.spec index 9057214..a89a742 100644 --- a/layer-shell-qt.spec +++ b/layer-shell-qt.spec @@ -1,6 +1,6 @@ Name: layer-shell-qt -Version: 5.27.1 -Release: 2%{?dist} +Version: 5.27.2 +Release: 1%{?dist} Summary: Library to easily use clients based on wlr-layer-shell License: LGPLv3+ @@ -14,8 +14,6 @@ URL: https://invent.kde.org/plasma/%{name} %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz -# Upstream PR: https://invent.kde.org/plasma/layer-shell-qt/-/merge_requests/26 -Patch0: fix-sddm-multi-screen.patch BuildRequires: extra-cmake-modules >= 5.82 @@ -71,6 +69,9 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %changelog +* Tue Feb 28 2023 Marc Deop i Argemí - 5.27.2-1 +- 5.27.2 + * Fri Feb 24 2023 Alessandro Astone - 5.27.1-2 - Backport fix for multi-screen sddm diff --git a/sources b/sources index ad9f758..90471ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (layer-shell-qt-5.27.1.tar.xz) = c8da1f2052a2b444ac267e84a4eed45beb9cbd754e9579f042c81ceeb0c0db1b963ac111951394dfbc2ff80f65751c4bf742bdf6cc15b3e0766fa5ee02578e63 +SHA512 (layer-shell-qt-5.27.2.tar.xz) = 5ce3f05b05c3666cd5e957535a4c01c5b92da51e9d2341f314a11b4c9f304cd52f36bfba7e68bfa3cd2d282d35c8a650f20b7ce99327ad68191a96752369ae25