From b16b0b621de335497a9982c9e9cc3dff7e9d8087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Mon, 13 Mar 2023 11:58:56 +0100 Subject: [PATCH 1/9] feat: sddm-breeze to require kde-settings-sddm --- plasma-workspace.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index e2ba5cf..96e9fbf 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.27.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -392,6 +392,7 @@ Requires: %{name}-geolocation = %{version}-%{release} %package -n sddm-breeze Summary: SDDM breeze theme +Requires: kde-settings-sddm # upgrade path, when sddm-breeze was split out Obsoletes: plasma-workspace < 5.3.2-8 Requires: kf5-plasma >= %{kf5_version_min} @@ -791,6 +792,9 @@ fi %changelog +* Mon Mar 13 2023 Marc Deop i Argemí - 5.27.2-2 +- Add Requires: kde-settings-sddm to sddm-breeze subpackage + * Tue Feb 28 2023 Marc Deop i Argemí - 5.27.2-1 - 5.27.2 From ee2d27cdcc674507dc5380a44c696f87c972490b Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 13 Mar 2023 18:43:12 -0700 Subject: [PATCH 2/9] Rebuild with no changes for F38 Bodhi purposes --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 96e9fbf..5d84ec3 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.27.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -792,6 +792,9 @@ fi %changelog +* Mon Mar 13 2023 Adam Williamson - 5.27.2-3 +- Rebuild with no changes for F38 Bodhi purposes + * Mon Mar 13 2023 Marc Deop i Argemí - 5.27.2-2 - Add Requires: kde-settings-sddm to sddm-breeze subpackage From 484a6bde1b8e3088d76efe0317350bfb9af749d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 14 Mar 2023 16:23:50 +0100 Subject: [PATCH 3/9] 5.27.3 --- plasma-workspace.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 5d84ec3..50e2d3b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.2 -Release: 3%{?dist} +Version: 5.27.3 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -792,6 +792,9 @@ fi %changelog +* Tue Mar 14 2023 Marc Deop i Argemí - 5.27.3-1 +- 5.27.3 + * Mon Mar 13 2023 Adam Williamson - 5.27.2-3 - Rebuild with no changes for F38 Bodhi purposes diff --git a/sources b/sources index 78c31cc..e66d913 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.2.tar.xz) = b7b6862b31f56c2c7405560ce365a54a28d88873c049c0dc972efad4f81ef2b647d8f691da5ee05b252a9daeee3e86c3b2a50aaa7c6acd6e36a9488f3b7a7d4c +SHA512 (plasma-workspace-5.27.3.tar.xz) = 132db99ff1a81778be928c87f59557cac40547f7ffc92f1738ea1fb575db150590a43838a3a2871e001a7e2975ce91399febfb948e444d2bd42e8a55700af96f From 53d6a39c5dd38a6c9639291479eb5370f14fb8c6 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 22 Mar 2023 14:37:10 -0700 Subject: [PATCH 4/9] Backport MR #2767 to fix slow startup issue (#2179998) --- 2767.patch | 51 +++++++++++++++++++++++++++++++++++++++++++ plasma-workspace.spec | 9 +++++++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 2767.patch diff --git a/2767.patch b/2767.patch new file mode 100644 index 0000000..5192650 --- /dev/null +++ b/2767.patch @@ -0,0 +1,51 @@ +From 8cbc16f0925c75b569c39184a68595c54278e75a Mon Sep 17 00:00:00 2001 +From: ivan tkachenko +Date: Wed, 22 Mar 2023 22:30:44 +0600 +Subject: [PATCH] sddm-theme: Populate keyboard layouts menu only on first show + +Doing it synchronously can be very slow; seemingly scaling with the +number of items in the model. + +https://bugzilla.redhat.com/show_bug.cgi?id=2179998 +--- + lookandfeel/sddm-theme/KeyboardButton.qml | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/lookandfeel/sddm-theme/KeyboardButton.qml b/lookandfeel/sddm-theme/KeyboardButton.qml +index df8767dda4..ca2458b6d2 100644 +--- a/lookandfeel/sddm-theme/KeyboardButton.qml ++++ b/lookandfeel/sddm-theme/KeyboardButton.qml +@@ -17,7 +17,7 @@ PlasmaComponents.ToolButton { + onCurrentIndexChanged: keyboard.currentLayout = currentIndex + + text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].longName) +- visible: menu.count > 1 ++ visible: keyboard.layouts.length > 1 + + checkable: true + checked: menu.opened +@@ -36,13 +36,17 @@ PlasmaComponents.ToolButton { + PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup + PlasmaCore.ColorScope.inherit: false + +- Instantiator { +- id: instantiator +- model: { ++ onAboutToShow: { ++ if (instantiator.model === null) { + let layouts = keyboard.layouts; + layouts.sort((a, b) => a.longName.localeCompare(b.longName)); +- return layouts; ++ instantiator.model = layouts; + } ++ } ++ ++ Instantiator { ++ id: instantiator ++ model: null + onObjectAdded: menu.insertItem(index, object) + onObjectRemoved: menu.removeItem(object) + delegate: PlasmaComponents.MenuItem { +-- +GitLab + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 50e2d3b..50594d0 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.27.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -63,6 +63,10 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## upstream Patches (master branch) +# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/2767 +# https://bugzilla.redhat.com/show_bug.cgi?id=2179998 +# Fix delay on startup caused by populating keyboard layout list +Patch0: 2767.patch ## upstreamable Patches @@ -792,6 +796,9 @@ fi %changelog +* Wed Mar 22 2023 Adam Williamson - 5.27.3-2 +- Backport MR #2767 to fix slow startup issue (#2179998) + * Tue Mar 14 2023 Marc Deop i Argemí - 5.27.3-1 - 5.27.3 From e396cdded14bf18672be343f3fdc80e4386cc18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Mon, 27 Mar 2023 21:23:01 +0200 Subject: [PATCH 5/9] fix: add patch to hide virtual keyboard indicator on SDDM --- hide-virtual-keyboard-indicator-on-sddm.patch | 12 ++++++++++++ plasma-workspace.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 hide-virtual-keyboard-indicator-on-sddm.patch diff --git a/hide-virtual-keyboard-indicator-on-sddm.patch b/hide-virtual-keyboard-indicator-on-sddm.patch new file mode 100644 index 0000000..7db14a3 --- /dev/null +++ b/hide-virtual-keyboard-indicator-on-sddm.patch @@ -0,0 +1,12 @@ +diff -bur plasma-workspace-5.27.3.old/lookandfeel/sddm-theme/Main.qml plasma-workspace-5.27.3/lookandfeel/sddm-theme/Main.qml +--- plasma-workspace-5.27.3.old/lookandfeel/sddm-theme/Main.qml 2023-03-14 15:12:21.000000000 +0100 ++++ plasma-workspace-5.27.3/lookandfeel/sddm-theme/Main.qml 2023-03-27 20:20:10.759761866 +0200 +@@ -555,7 +555,7 @@ + userListComponent.mainPasswordBox.forceActiveFocus(); + inputPanel.showHide() + } +- visible: inputPanel.status === Loader.Ready ++ visible: false + } + + KeyboardButton { diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 50594d0..a86af08 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.27.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -80,6 +80,9 @@ Patch105: plasma-workspace-5.21.90-folderview_layout.patch Patch106: plasma-workspace-5.25.90-enable-open-terminal-action.patch # default to enable the lock/logout actions Patch107: plasma-workspace-5.25.90-enable-lock-logout-action.patch +# Hide virtual keyboard indicator on sddm. +# Do not remove this as it breaks Fedora's QA policy +Patch108: hide-virtual-keyboard-indicator-on-sddm.patch # udev BuildRequires: zlib-devel @@ -796,6 +799,9 @@ fi %changelog +* Mon Mar 27 2023 Marc Deop i Argemí - 5.27.3-3 +- Add patch to hide the virtual keyboard indicator from sddm + * Wed Mar 22 2023 Adam Williamson - 5.27.3-2 - Backport MR #2767 to fix slow startup issue (#2179998) From ed71c1d2e3e2ff5fd03512c88fd1bbe36495e959 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 3 Apr 2023 19:19:36 -0400 Subject: [PATCH 6/9] Add Obsoletes sddm-x11 for sddm-wayland transition in F38+ --- plasma-workspace.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index a86af08..b0e6101 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.27.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -431,6 +431,11 @@ Requires: kwin-wayland >= %{majmin_ver} Requires: maliit-keyboard %if %{with sddm_wayland_default} Supplements: (sddm and plasma-workspace-wayland) +%if ! (0%{?fedora} && 0%{?fedora} < 38) +# Replace sddm-x11 with sddm-wayland-plasma +## N.B.: If sddm gets updated in F36/F37, this will need to be bumped +Obsoletes: sddm-x11 <= 0.19.0^git20230320.e07e805-2 +%endif %endif BuildArch: noarch @@ -799,6 +804,9 @@ fi %changelog +* Mon Apr 03 2023 Neal Gompa - 5.27.3-4 +- Add Obsoletes sddm-x11 for sddm-wayland transition in F38+ + * Mon Mar 27 2023 Marc Deop i Argemí - 5.27.3-3 - Add patch to hide the virtual keyboard indicator from sddm From 3dea487823f199eafb3df77df446edb8ae47e58e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 3 Apr 2023 19:22:22 -0400 Subject: [PATCH 7/9] Fix sddm-x11 obsoletes for F38+ --- plasma-workspace.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b0e6101..783259b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -434,7 +434,7 @@ Supplements: (sddm and plasma-workspace-wayland) %if ! (0%{?fedora} && 0%{?fedora} < 38) # Replace sddm-x11 with sddm-wayland-plasma ## N.B.: If sddm gets updated in F36/F37, this will need to be bumped -Obsoletes: sddm-x11 <= 0.19.0^git20230320.e07e805-2 +Obsoletes: sddm-x11 < 0.19.0^git20230320.e07e805-3 %endif %endif BuildArch: noarch From d434906d0d8f4276a56bed73e5a01156c037ea9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 4 Apr 2023 15:02:39 +0200 Subject: [PATCH 8/9] 5.27.4 --- 2767.patch | 51 ------------------------------------------- plasma-workspace.spec | 11 +++++----- sources | 2 +- 3 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 2767.patch diff --git a/2767.patch b/2767.patch deleted file mode 100644 index 5192650..0000000 --- a/2767.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8cbc16f0925c75b569c39184a68595c54278e75a Mon Sep 17 00:00:00 2001 -From: ivan tkachenko -Date: Wed, 22 Mar 2023 22:30:44 +0600 -Subject: [PATCH] sddm-theme: Populate keyboard layouts menu only on first show - -Doing it synchronously can be very slow; seemingly scaling with the -number of items in the model. - -https://bugzilla.redhat.com/show_bug.cgi?id=2179998 ---- - lookandfeel/sddm-theme/KeyboardButton.qml | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/lookandfeel/sddm-theme/KeyboardButton.qml b/lookandfeel/sddm-theme/KeyboardButton.qml -index df8767dda4..ca2458b6d2 100644 ---- a/lookandfeel/sddm-theme/KeyboardButton.qml -+++ b/lookandfeel/sddm-theme/KeyboardButton.qml -@@ -17,7 +17,7 @@ PlasmaComponents.ToolButton { - onCurrentIndexChanged: keyboard.currentLayout = currentIndex - - text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].longName) -- visible: menu.count > 1 -+ visible: keyboard.layouts.length > 1 - - checkable: true - checked: menu.opened -@@ -36,13 +36,17 @@ PlasmaComponents.ToolButton { - PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup - PlasmaCore.ColorScope.inherit: false - -- Instantiator { -- id: instantiator -- model: { -+ onAboutToShow: { -+ if (instantiator.model === null) { - let layouts = keyboard.layouts; - layouts.sort((a, b) => a.longName.localeCompare(b.longName)); -- return layouts; -+ instantiator.model = layouts; - } -+ } -+ -+ Instantiator { -+ id: instantiator -+ model: null - onObjectAdded: menu.insertItem(index, object) - onObjectRemoved: menu.removeItem(object) - delegate: PlasmaComponents.MenuItem { --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 783259b..e9b2123 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.3 -Release: 4%{?dist} +Version: 5.27.4 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -63,10 +63,6 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## upstream Patches (master branch) -# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/2767 -# https://bugzilla.redhat.com/show_bug.cgi?id=2179998 -# Fix delay on startup caused by populating keyboard layout list -Patch0: 2767.patch ## upstreamable Patches @@ -804,6 +800,9 @@ fi %changelog +* Tue Apr 04 2023 Marc Deop i Argemí - 5.27.4-1 +- 5.27.4 + * Mon Apr 03 2023 Neal Gompa - 5.27.3-4 - Add Obsoletes sddm-x11 for sddm-wayland transition in F38+ diff --git a/sources b/sources index e66d913..70be14b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.3.tar.xz) = 132db99ff1a81778be928c87f59557cac40547f7ffc92f1738ea1fb575db150590a43838a3a2871e001a7e2975ce91399febfb948e444d2bd42e8a55700af96f +SHA512 (plasma-workspace-5.27.4.tar.xz) = d9ac07bfd2c43a920ae0a4ca7ec39aff457535cdc655c2b77881e2d9c1ecbfabc225e854ae36369ce4315a14a483318fa77bb6e62cfe43b711f8551266d19e0b From d7256d8210cd7c14fe245f25891fd40b31012517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 4 Apr 2023 17:55:15 +0200 Subject: [PATCH 9/9] 5.27.4.1 --- plasma-workspace.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index e9b2123..85c1e94 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.4 +Version: 5.27.4.1 Release: 1%{?dist} License: GPLv2+ @@ -800,6 +800,9 @@ fi %changelog +* Tue Apr 04 2023 Marc Deop i Argemí - 5.27.4.1-1 +- 5.27.4.1 + * Tue Apr 04 2023 Marc Deop i Argemí - 5.27.4-1 - 5.27.4 diff --git a/sources b/sources index 70be14b..20003b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.4.tar.xz) = d9ac07bfd2c43a920ae0a4ca7ec39aff457535cdc655c2b77881e2d9c1ecbfabc225e854ae36369ce4315a14a483318fa77bb6e62cfe43b711f8551266d19e0b +SHA512 (plasma-workspace-5.27.4.1.tar.xz) = f79acb3129d7119937ecec227ebab1b50becc084b1563c1e72aa624502e8f337bd9c825d018d8080bcfcacab3cb53667005e92aa24d0cad9f25a298b1db19ae0