From 9f41730afcd40195c8864f5f3d9eae3bfb88a01b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:22:41 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kwin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kwin.spec b/kwin.spec index 2c34344..ab86ff5 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.26.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -361,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.26.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jan 05 2023 Justin Zobel - 5.26.5-1 - Update to 5.26.5 From 1b6140bbaeb90e5f0717f2f83078577025330f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Fri, 20 Jan 2023 10:35:08 +0100 Subject: [PATCH 2/8] 5.26.90 --- kwin.spec | 12 ++++++++---- sources | 3 +-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kwin.spec b/kwin.spec index ab86ff5..348b952 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.26.5 -Release: 2%{?dist} +Version: 5.26.90 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -63,6 +63,7 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel BuildRequires: libxkbcommon-devel +BuildRequires: libxkbcommon-x11-devel # Uncomment for > 5.27.0 release as it's a new dependency #BuildRequires: libxkbcommon-x11-devel BuildRequires: libX11-devel @@ -314,17 +315,17 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %{_datadir}/kconf_update/kwin-5.23-remove-flip-switch.py %{_datadir}/kconf_update/kwin-5.23-remove-xrender-backend.py %{_datadir}/kconf_update/kwinrules-5.23-virtual-desktop-ids.py -%{_kf5_datadir}/kservices5/kwin %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/kpackage/kcms/kcm_* %{_kf5_datadir}/knotifications5/kwin.notifyrc %{_kf5_datadir}/config.kcfg/kwin.kcfg %{_kf5_datadir}/config.kcfg/kwindecorationsettings.kcfg %{_kf5_datadir}/config.kcfg/virtualdesktopssettings.kcfg -%{_kf5_datadir}/config.kcfg/kwin_colorcorrect.kcfg +%{_kf5_datadir}/config.kcfg/nightcolorsettings.kcfg %{_kf5_datadir}/kconf_update/kwinrules-5.19-placement.pl %{_kf5_datadir}/kconf_update/kwinrules.upd %{_kf5_datadir}/kconf_update/kwin-5.25-effect-pluginid-config-group.py +%{_kf5_datadir}/kconf_update/kwin-5.27-replace-cascaded-zerocornered.sh %{_datadir}/icons/hicolor/*/apps/kwin.* %{_datadir}/knsrcfiles/*.knsrc %{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop @@ -361,6 +362,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Thu Jan 19 2023 Marc Deop - 5.26.90-1 +- 5.26.90 + * Thu Jan 19 2023 Fedora Release Engineering - 5.26.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index d97a3d2..ee7d55b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (kwin-5.26.4.tar.xz) = 723ec98171b43aadb8b688d6c852ad4c45282b44f7f5706066464659ca5025b2611eb087067fddc1eed42e2c48e2bcdbe9a24319909aa15b818f40b19621a0b2 -SHA512 (kwin-5.26.5.tar.xz) = ef374b18fdedbb5322e0abba9f5dcd023391d96c7564c22e3a73a8fc030ef682f892f68fc618175da17527ec5fbd786e0efb452f5e52f29ffb1237eee912b5d8 +SHA512 (kwin-5.26.90.tar.xz) = d6e85dacfbef80d22e57337d9605359459e8018e39adf8069efcc5c45b5a08ece74309db61979b083a6c9a8f1466a4214b190bd85c748a7a7c67fa48cc20f2c6 From a3981a2f637c8611c906bc8d4cf027330a4befb3 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/8] 5.27.0 --- kwin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kwin.spec b/kwin.spec index 348b952..749af0b 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,7 +16,7 @@ %endif Name: kwin -Version: 5.26.90 +Version: 5.27.0 Release: 1%{?dist} Summary: KDE Window manager @@ -362,6 +362,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %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 ee7d55b..06a3df0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.26.90.tar.xz) = d6e85dacfbef80d22e57337d9605359459e8018e39adf8069efcc5c45b5a08ece74309db61979b083a6c9a8f1466a4214b190bd85c748a7a7c67fa48cc20f2c6 +SHA512 (kwin-5.27.0.tar.xz) = d4470add94eb4754938d5433c9f34c03a96756e1da17a9f7ec5cd40c040b62dd1a819849101a1b887986b2332562c1814db6dd5406c9c504a0074a1ba5514661 From c148d946fb2bb561ac0a07f435c0dd498c0c8056 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 20 Feb 2023 20:46:57 -0800 Subject: [PATCH 4/8] Allow VT switching even if global shortcuts are disabled --- kwin-5.27.0-allow-vt-switch.patch | 13 +++++++++++++ kwin.spec | 11 ++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 kwin-5.27.0-allow-vt-switch.patch diff --git a/kwin-5.27.0-allow-vt-switch.patch b/kwin-5.27.0-allow-vt-switch.patch new file mode 100644 index 0000000..121354b --- /dev/null +++ b/kwin-5.27.0-allow-vt-switch.patch @@ -0,0 +1,13 @@ +--- kwin-5.27.0/src/input.cpp 2023-02-09 04:15:33.000000000 -0800 ++++ kwin-5.27.0/src/input.cpp.new 2023-02-20 20:40:33.920599151 -0800 +@@ -2822,8 +2822,8 @@ + void InputRedirection::setupInputFilters() + { + const bool hasGlobalShortcutSupport = waylandServer()->hasGlobalShortcutSupport(); +- if ((kwinApp()->session()->capabilities() & Session::Capability::SwitchTerminal) +- && hasGlobalShortcutSupport) { ++ if (kwinApp()->session()->capabilities() & Session::Capability::SwitchTerminal) ++ { + installInputEventFilter(new VirtualTerminalFilter); + } + installInputEventSpy(new HideCursorSpy); diff --git a/kwin.spec b/kwin.spec index 749af0b..91edde4 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.27.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -35,6 +35,12 @@ URL: https://userbase.kde.org/KWin %global stable stable %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +# Allow VT switching even with global shortcuts disabled: +# https://bugzilla.redhat.com/show_bug.cgi?id=2171332#c3 +# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/2650#note_625844 +# not submitted upstream yet as we may go with something else once +# folks get a chance to look at it +Patch0: kwin-5.27.0-allow-vt-switch.patch ## upstream patches @@ -362,6 +368,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Mon Feb 20 2023 Adam Williamson - 5.27.0-2 +- Allow VT switching even if global shortcuts are disabled + * Thu Feb 09 2023 Marc Deop - 5.27.0-1 - 5.27.0 From e0e89100faf061daa3215bfb89e5e7d1fb0a843b 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 5/8] 5.27.1 --- kwin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kwin.spec b/kwin.spec index 91edde4..e18a0f4 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.27.0 -Release: 2%{?dist} +Version: 5.27.1 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -368,6 +368,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue Feb 21 2023 Marc Deop i Argemí - 5.27.1-1 +- 5.27.1 + * Mon Feb 20 2023 Adam Williamson - 5.27.0-2 - Allow VT switching even if global shortcuts are disabled diff --git a/sources b/sources index 06a3df0..3030ac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.0.tar.xz) = d4470add94eb4754938d5433c9f34c03a96756e1da17a9f7ec5cd40c040b62dd1a819849101a1b887986b2332562c1814db6dd5406c9c504a0074a1ba5514661 +SHA512 (kwin-5.27.1.tar.xz) = 8993416d207807ae954974e9d76de183701b2a7d3661f0248dc689c7079d8c3538ca3cb400aeb6707fdecd0e021b4846dbddac674e75226ce0265b51f987a127 From a1c2c7ff366244733aeddf68098e48792e7fd25b Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Wed, 22 Feb 2023 21:50:32 +0100 Subject: [PATCH 6/8] feat: add patch to fix BZ#2168034 --- guard-against-non-existing-workspace.patch | 36 ++++++++++++++++++++++ kwin.spec | 8 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 guard-against-non-existing-workspace.patch diff --git a/guard-against-non-existing-workspace.patch b/guard-against-non-existing-workspace.patch new file mode 100644 index 0000000..b618296 --- /dev/null +++ b/guard-against-non-existing-workspace.patch @@ -0,0 +1,36 @@ +From da26deaa5c843ef303ef9f1b9f0cd3d341c5c5f5 Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii +Date: Wed, 22 Feb 2023 21:35:26 +0200 +Subject: [PATCH] backends/libinput: Fix crash upon receiving motion absolute + events + +The input events can be processed when the workspace is not available, +e.g. during startup or shutdown, so add a corresponding guard. + +As a long term plan, we need to decouple Workspace from low-level input +backend parts, but it will be a too invasive change for now. + +BUG: 449317 +BUG: 465456 +--- + src/backends/libinput/connection.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/backends/libinput/connection.cpp b/src/backends/libinput/connection.cpp +index f99771d9b1..db1a19b687 100644 +--- a/src/backends/libinput/connection.cpp ++++ b/src/backends/libinput/connection.cpp +@@ -373,7 +373,9 @@ void Connection::processEvents() + } + case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: { + PointerEvent *pe = static_cast(event.get()); +- Q_EMIT pe->device()->pointerMotionAbsolute(pe->absolutePos(workspace()->geometry().size()), pe->time(), pe->device()); ++ if (workspace()) { ++ Q_EMIT pe->device()->pointerMotionAbsolute(pe->absolutePos(workspace()->geometry().size()), pe->time(), pe->device()); ++ } + break; + } + case LIBINPUT_EVENT_TOUCH_DOWN: { +-- +GitLab + diff --git a/kwin.spec b/kwin.spec index e18a0f4..3a3d5b3 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -43,6 +43,9 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. Patch0: kwin-5.27.0-allow-vt-switch.patch ## upstream patches +# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2168034 +# Upstream PR: https://invent.kde.org/plasma/kwin/-/merge_requests/3667?view=parallel +Patch1: guard-against-non-existing-workspace.patch ## proposed patches @@ -368,6 +371,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Wed Feb 22 2023 Marc Deop i Argemí - 5.27.1-2 +- Add patch to fix BZ#2168034 + * Tue Feb 21 2023 Marc Deop i Argemí - 5.27.1-1 - 5.27.1 From ccea67579c12f31e133305327faeff2ad2783461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 26 Feb 2023 09:32:53 +0100 Subject: [PATCH 7/8] fix: add missing buildrequires --- kwin.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kwin.spec b/kwin.spec index 3a3d5b3..5bc610b 100644 --- a/kwin.spec +++ b/kwin.spec @@ -17,7 +17,7 @@ Name: kwin Version: 5.27.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -55,6 +55,7 @@ BuildRequires: kf5-rpm-macros BuildRequires: systemd-rpm-macros # Qt +BuildRequires: qaccessibilityclient-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-static # KWinQpaPlugin (and others?) @@ -73,8 +74,6 @@ BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-x11-devel -# Uncomment for > 5.27.0 release as it's a new dependency -#BuildRequires: libxkbcommon-x11-devel BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libxcb-devel @@ -371,6 +370,10 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Sun Feb 26 2023 Marc Deop i Argemí - 5.27.1-3 +- Add missing BuildRequires +- Clean up commented code + * Wed Feb 22 2023 Marc Deop i Argemí - 5.27.1-2 - Add patch to fix BZ#2168034 From 06cea4cf868e7926757fc588f6768be4b17b24ac 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 8/8] feat: 5.27.2 --- guard-against-non-existing-workspace.patch | 36 ---------------------- kwin-5.27.0-allow-vt-switch.patch | 13 -------- kwin.spec | 16 +++------- sources | 2 +- 4 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 guard-against-non-existing-workspace.patch delete mode 100644 kwin-5.27.0-allow-vt-switch.patch diff --git a/guard-against-non-existing-workspace.patch b/guard-against-non-existing-workspace.patch deleted file mode 100644 index b618296..0000000 --- a/guard-against-non-existing-workspace.patch +++ /dev/null @@ -1,36 +0,0 @@ -From da26deaa5c843ef303ef9f1b9f0cd3d341c5c5f5 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii -Date: Wed, 22 Feb 2023 21:35:26 +0200 -Subject: [PATCH] backends/libinput: Fix crash upon receiving motion absolute - events - -The input events can be processed when the workspace is not available, -e.g. during startup or shutdown, so add a corresponding guard. - -As a long term plan, we need to decouple Workspace from low-level input -backend parts, but it will be a too invasive change for now. - -BUG: 449317 -BUG: 465456 ---- - src/backends/libinput/connection.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/backends/libinput/connection.cpp b/src/backends/libinput/connection.cpp -index f99771d9b1..db1a19b687 100644 ---- a/src/backends/libinput/connection.cpp -+++ b/src/backends/libinput/connection.cpp -@@ -373,7 +373,9 @@ void Connection::processEvents() - } - case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE: { - PointerEvent *pe = static_cast(event.get()); -- Q_EMIT pe->device()->pointerMotionAbsolute(pe->absolutePos(workspace()->geometry().size()), pe->time(), pe->device()); -+ if (workspace()) { -+ Q_EMIT pe->device()->pointerMotionAbsolute(pe->absolutePos(workspace()->geometry().size()), pe->time(), pe->device()); -+ } - break; - } - case LIBINPUT_EVENT_TOUCH_DOWN: { --- -GitLab - diff --git a/kwin-5.27.0-allow-vt-switch.patch b/kwin-5.27.0-allow-vt-switch.patch deleted file mode 100644 index 121354b..0000000 --- a/kwin-5.27.0-allow-vt-switch.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kwin-5.27.0/src/input.cpp 2023-02-09 04:15:33.000000000 -0800 -+++ kwin-5.27.0/src/input.cpp.new 2023-02-20 20:40:33.920599151 -0800 -@@ -2822,8 +2822,8 @@ - void InputRedirection::setupInputFilters() - { - const bool hasGlobalShortcutSupport = waylandServer()->hasGlobalShortcutSupport(); -- if ((kwinApp()->session()->capabilities() & Session::Capability::SwitchTerminal) -- && hasGlobalShortcutSupport) { -+ if (kwinApp()->session()->capabilities() & Session::Capability::SwitchTerminal) -+ { - installInputEventFilter(new VirtualTerminalFilter); - } - installInputEventSpy(new HideCursorSpy); diff --git a/kwin.spec b/kwin.spec index 5bc610b..4974345 100644 --- a/kwin.spec +++ b/kwin.spec @@ -16,8 +16,8 @@ %endif Name: kwin -Version: 5.27.1 -Release: 3%{?dist} +Version: 5.27.2 +Release: 1%{?dist} Summary: KDE Window manager # all sources are effectively GPLv2+, except for: @@ -35,17 +35,8 @@ URL: https://userbase.kde.org/KWin %global stable stable %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz -# Allow VT switching even with global shortcuts disabled: -# https://bugzilla.redhat.com/show_bug.cgi?id=2171332#c3 -# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/2650#note_625844 -# not submitted upstream yet as we may go with something else once -# folks get a chance to look at it -Patch0: kwin-5.27.0-allow-vt-switch.patch ## upstream patches -# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2168034 -# Upstream PR: https://invent.kde.org/plasma/kwin/-/merge_requests/3667?view=parallel -Patch1: guard-against-non-existing-workspace.patch ## proposed patches @@ -370,6 +361,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Tue Feb 28 2023 Marc Deop i Argemí - 5.27.2-1 +- 5.27.2 + * Sun Feb 26 2023 Marc Deop i Argemí - 5.27.1-3 - Add missing BuildRequires - Clean up commented code diff --git a/sources b/sources index 3030ac8..2333337 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwin-5.27.1.tar.xz) = 8993416d207807ae954974e9d76de183701b2a7d3661f0248dc689c7079d8c3538ca3cb400aeb6707fdecd0e021b4846dbddac674e75226ce0265b51f987a127 +SHA512 (kwin-5.27.2.tar.xz) = 08dfedecfc99f95bc042ebc0f625549c5b82db568a6cfae289d5580c8465b8aca61fd91c5413f92a4a51a6ac35a373edac0ee4c40a8701c6b1b8f815066c5319