From 5a6221b2496816c318af113c6dd279528d8c6ec9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:31:54 +0000 Subject: [PATCH 1/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- layer-shell-qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/layer-shell-qt.spec b/layer-shell-qt.spec index f279647..d880dc3 100644 --- a/layer-shell-qt.spec +++ b/layer-shell-qt.spec @@ -1,6 +1,6 @@ Name: layer-shell-qt Version: 5.26.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to easily use clients based on wlr-layer-shell License: LGPLv3+ @@ -68,6 +68,9 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.26.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 06 2023 Jan Grulich - 5.26.5-2 - Rebuild (qt5) From 5881d8740b733d21c69e65b75f9ae756e370b94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Fri, 20 Jan 2023 10:31:47 +0100 Subject: [PATCH 2/6] 5.26.90 --- layer-shell-qt.spec | 7 +++++-- sources | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/layer-shell-qt.spec b/layer-shell-qt.spec index d880dc3..5c10329 100644 --- a/layer-shell-qt.spec +++ b/layer-shell-qt.spec @@ -1,6 +1,6 @@ Name: layer-shell-qt -Version: 5.26.5 -Release: 3%{?dist} +Version: 5.26.90 +Release: 1%{?dist} Summary: Library to easily use clients based on wlr-layer-shell License: LGPLv3+ @@ -68,6 +68,9 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %changelog +* Thu Jan 19 2023 Marc Deop - 5.26.90-1 +- 5.26.90 + * Thu Jan 19 2023 Fedora Release Engineering - 5.26.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index cbea24a..9deb495 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (layer-shell-qt-5.26.4.tar.xz) = 27c7d1bdbe5ffc2c76c3ba257a3c07c964797cbedfdc0444e1c4e6eddafc9098a71bc17c9dd5c9041e4b8e76b926753b1a84dfd0f3601ca739a7efb94504ae09 -SHA512 (layer-shell-qt-5.26.5.tar.xz) = d81289c3a9dffb7212d466d1468e80e99703d599c2dee4fc1f8a9a5687892d77b8df6e09ee79592a4d2bfd183e3fabcf7257a5082071ea057a306e336e86e2ed +SHA512 (layer-shell-qt-5.26.90.tar.xz) = 963b84b10267764c650f56fa8ce7f094f6ee7552cb670a96960bdb68b7ef6abd48e6863b83e819d13f19764093c27a73ddea3b1b5559a5a7c498ed72672b4fa1 From 47ff05dfa84b475008dd02a342fbed1a37b74106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Thu, 9 Feb 2023 14:59:37 +0100 Subject: [PATCH 3/6] 5.27.0 --- layer-shell-qt.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/layer-shell-qt.spec b/layer-shell-qt.spec index 5c10329..3cabca8 100644 --- a/layer-shell-qt.spec +++ b/layer-shell-qt.spec @@ -1,5 +1,5 @@ Name: layer-shell-qt -Version: 5.26.90 +Version: 5.27.0 Release: 1%{?dist} Summary: Library to easily use clients based on wlr-layer-shell @@ -68,6 +68,9 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %changelog +* Thu Feb 09 2023 Marc Deop - 5.27.0-1 +- 5.27.0 + * Thu Jan 19 2023 Marc Deop - 5.26.90-1 - 5.26.90 diff --git a/sources b/sources index 9deb495..d985da5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (layer-shell-qt-5.26.90.tar.xz) = 963b84b10267764c650f56fa8ce7f094f6ee7552cb670a96960bdb68b7ef6abd48e6863b83e819d13f19764093c27a73ddea3b1b5559a5a7c498ed72672b4fa1 +SHA512 (layer-shell-qt-5.27.0.tar.xz) = e220eefcf5bfbf0a14678b10e740ad2c37ddc416fd5c2eb42b51f89e3a4eac07b8984f64def6443ccdcae3d125cdb404d87336cfc58a2cbe0481eb8ab4e2d5cf From 0a98946212b3af5097e2b3e3aa01d6e7aee1bc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 21 Feb 2023 15:30:40 +0100 Subject: [PATCH 4/6] 5.27.1 --- layer-shell-qt.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/layer-shell-qt.spec b/layer-shell-qt.spec index 3cabca8..f6b1806 100644 --- a/layer-shell-qt.spec +++ b/layer-shell-qt.spec @@ -1,5 +1,5 @@ Name: layer-shell-qt -Version: 5.27.0 +Version: 5.27.1 Release: 1%{?dist} Summary: Library to easily use clients based on wlr-layer-shell @@ -68,6 +68,9 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %changelog +* Tue Feb 21 2023 Marc Deop i Argemí - 5.27.1-1 +- 5.27.1 + * Thu Feb 09 2023 Marc Deop - 5.27.0-1 - 5.27.0 diff --git a/sources b/sources index d985da5..ad9f758 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (layer-shell-qt-5.27.0.tar.xz) = e220eefcf5bfbf0a14678b10e740ad2c37ddc416fd5c2eb42b51f89e3a4eac07b8984f64def6443ccdcae3d125cdb404d87336cfc58a2cbe0481eb8ab4e2d5cf +SHA512 (layer-shell-qt-5.27.1.tar.xz) = c8da1f2052a2b444ac267e84a4eed45beb9cbd754e9579f042c81ceeb0c0db1b963ac111951394dfbc2ff80f65751c4bf742bdf6cc15b3e0766fa5ee02578e63 From 887a64334c6bbdb82fd2d850fe15ad5aac5bce75 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 24 Feb 2023 22:25:15 +0100 Subject: [PATCH 5/6] Backport fix for multi-screen sddm --- fix-sddm-multi-screen.patch | 53 +++++++++++++++++++++++++++++++++++++ layer-shell-qt.spec | 10 +++++-- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 fix-sddm-multi-screen.patch diff --git a/fix-sddm-multi-screen.patch b/fix-sddm-multi-screen.patch new file mode 100644 index 0000000..d69122b --- /dev/null +++ b/fix-sddm-multi-screen.patch @@ -0,0 +1,53 @@ +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 f6b1806..9057214 100644 --- a/layer-shell-qt.spec +++ b/layer-shell-qt.spec @@ -1,6 +1,6 @@ Name: layer-shell-qt Version: 5.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to easily use clients based on wlr-layer-shell License: LGPLv3+ @@ -14,6 +14,9 @@ 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 BuildRequires: qt5-qtbase-devel @@ -43,7 +46,7 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %prep -%autosetup +%autosetup -p1 %build @@ -68,6 +71,9 @@ Requires: cmake(Qt5Gui) >= 5.15.0 %changelog +* Fri Feb 24 2023 Alessandro Astone - 5.27.1-2 +- Backport fix for multi-screen sddm + * Tue Feb 21 2023 Marc Deop i Argemí - 5.27.1-1 - 5.27.1 From 43224bbc7c5dceabf09373164e6e0b7582ecf7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 28 Feb 2023 15:29:48 +0100 Subject: [PATCH 6/6] feat: 5.27.2 --- fix-sddm-multi-screen.patch | 53 ------------------------------------- layer-shell-qt.spec | 9 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 fix-sddm-multi-screen.patch 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