From dacdab0f8819519fe77032a476670957472624a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:20:32 +0200 Subject: [PATCH 01/16] Rebuilt for ICU 73.2 --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index eb259ef..4e32f25 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.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -809,6 +809,9 @@ fi %changelog +* Tue Jul 11 2023 František Zatloukal - 5.27.6-2 +- Rebuilt for ICU 73.2 + * Sun Jun 25 2023 Marc Deop i Argemí - 5.27.6-1 - 5.27.6 From 25431f47193dcc967637d1f3115079db5b29f05b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:47:18 +0000 Subject: [PATCH 02/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 4e32f25..5caa457 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.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -809,6 +809,9 @@ fi %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 5.27.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 František Zatloukal - 5.27.6-2 - Rebuilt for ICU 73.2 From 3c9c25ad0de2144e6b64ca8df16da0c594bf0cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 1 Aug 2023 20:58:50 +0200 Subject: [PATCH 03/16] 5.27.7 --- plasma-workspace.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 5caa457..681e48b 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.6 -Release: 3%{?dist} +Version: 5.27.7 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -809,6 +809,9 @@ fi %changelog +* Tue Aug 01 2023 Marc Deop i Argemí - 5.27.7-1 +- 5.27.7 + * Fri Jul 21 2023 Fedora Release Engineering - 5.27.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 753ea60..a3413f3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.6.tar.xz) = 090c65ecb1664d5e55d52ff7a11e6402a2b9bb7a31c99fe3406c2c4111aada6102aaf3f5a110c6a13223e88ee164caf209d859fcb6823b638ca42bcbb683984d +SHA512 (plasma-workspace-5.27.7.tar.xz) = 7359d087cb94280ed0c191b0328b8aa2ec42460a6eb057a06bae0de3abcfa8e3cd7c374b47a4b1d08b56fc292892bac4c0f501527574e2c799c3d4c87591892f From 7de448f2a9e875ba1a7cee588f43323acd912689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 12 Aug 2023 13:47:44 +0200 Subject: [PATCH 04/16] feat: add upstream patch --- ...a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch | 37 +++++++++++++++++++ plasma-workspace.spec | 7 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch diff --git a/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch b/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch new file mode 100644 index 0000000..a6dc3ad --- /dev/null +++ b/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch @@ -0,0 +1,37 @@ +From fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c Mon Sep 17 00:00:00 2001 +From: Fushan Wen +Date: Fri, 4 Aug 2023 12:40:17 +0800 +Subject: [PATCH] shell: avoid potential crash when previous window is gone + before returning focus + +m_previousPlasmaWindow is bound to a window, and if a window is closed +before `restorePreviousWindow` is called, there will be a crash. Use +QPointer to track the window destruction. +--- + shell/shellcorona.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/shell/shellcorona.h b/shell/shellcorona.h +index a3aff351af..db218d16e2 100644 +--- a/shell/shellcorona.h ++++ b/shell/shellcorona.h +@@ -14,6 +14,7 @@ + + #include + #include ++#include + #include + #include + +@@ -301,7 +302,7 @@ private: + KWayland::Client::PlasmaShell *m_waylandPlasmaShell; + // For getting the active window on Wayland + KWayland::Client::PlasmaWindowManagement *m_waylandWindowManagement = nullptr; +- KWayland::Client::PlasmaWindow *m_previousPlasmaWindow = nullptr; ++ QPointer m_previousPlasmaWindow; + bool m_closingDown : 1; + bool m_screenReorderInProgress = false; + QString m_testModeLayout; +-- +GitLab + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 681e48b..d078c7f 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.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -63,6 +63,8 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## upstream Patches (master branch) +# https://invent.kde.org/plasma/plasma-workspace/-/commit/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c +Patch0: fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch ## upstreamable Patches @@ -809,6 +811,9 @@ fi %changelog +* Sat Aug 12 2023 Marc Deop i Argemí - 5.27.7-2 +- Add upstream patch + * Tue Aug 01 2023 Marc Deop i Argemí - 5.27.7-1 - 5.27.7 From c70c003d48ddda71810ea0264e0890557efb2dde Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Wed, 13 Sep 2023 14:12:29 +0930 Subject: [PATCH 05/16] Update to 5.27.8 --- ...a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch | 37 ------------------- plasma-workspace.spec | 11 +++--- sources | 2 +- 3 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch diff --git a/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch b/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch deleted file mode 100644 index a6dc3ad..0000000 --- a/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c Mon Sep 17 00:00:00 2001 -From: Fushan Wen -Date: Fri, 4 Aug 2023 12:40:17 +0800 -Subject: [PATCH] shell: avoid potential crash when previous window is gone - before returning focus - -m_previousPlasmaWindow is bound to a window, and if a window is closed -before `restorePreviousWindow` is called, there will be a crash. Use -QPointer to track the window destruction. ---- - shell/shellcorona.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/shell/shellcorona.h b/shell/shellcorona.h -index a3aff351af..db218d16e2 100644 ---- a/shell/shellcorona.h -+++ b/shell/shellcorona.h -@@ -14,6 +14,7 @@ - - #include - #include -+#include - #include - #include - -@@ -301,7 +302,7 @@ private: - KWayland::Client::PlasmaShell *m_waylandPlasmaShell; - // For getting the active window on Wayland - KWayland::Client::PlasmaWindowManagement *m_waylandWindowManagement = nullptr; -- KWayland::Client::PlasmaWindow *m_previousPlasmaWindow = nullptr; -+ QPointer m_previousPlasmaWindow; - bool m_closingDown : 1; - bool m_screenReorderInProgress = false; - QString m_testModeLayout; --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d078c7f..812f7ec 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.7 -Release: 2%{?dist} +Version: 5.27.8 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -62,10 +62,6 @@ Source20: breeze-fedora-0.2.tar.gz Source40: ssh-agent.conf Source41: spice-vdagent.conf -## upstream Patches (master branch) -# https://invent.kde.org/plasma/plasma-workspace/-/commit/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c -Patch0: fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch - ## upstreamable Patches ## downstream Patches @@ -811,6 +807,9 @@ fi %changelog +* Tue Sep 12 2023 justin.zobel@gmail.com - 5.27.8-1 +- 5.27.8 + * Sat Aug 12 2023 Marc Deop i Argemí - 5.27.7-2 - Add upstream patch diff --git a/sources b/sources index a3413f3..7972df0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.7.tar.xz) = 7359d087cb94280ed0c191b0328b8aa2ec42460a6eb057a06bae0de3abcfa8e3cd7c374b47a4b1d08b56fc292892bac4c0f501527574e2c799c3d4c87591892f +SHA512 (plasma-workspace-5.27.8.tar.xz) = d75da7d8cea3124f921813643ebda333376d3cc2ecbe2aaeee86e54a828e6a9767fa84b76991cfe282efdbf583abebee4a0bfe54a6b590c184ceb3d2995e9fcb From 448f59bcb879d41fdf3f4f410147a02d40a27f6a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 22 Sep 2023 10:35:57 -0400 Subject: [PATCH 06/16] Recommend orca for a11y and require xdg-desktop-portal-kde for wayland --- plasma-workspace.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 812f7ec..c4bf64f 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.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -255,6 +255,9 @@ Recommends: kde-inotify-survey # https://pagure.io/fedora-kde/SIG/issue/354 Recommends: kf5-audiocd-kio +# For a11y +Recommends: orca + # powerdevil has a versioned dep on libkworkspace5, so (may?) # need to avoid this dep when bootstrapping %if ! 0%{?bootstrap} @@ -455,8 +458,7 @@ Requires: xorg-x11-server-Xwayland Requires: qt5-qtwayland%{?_isa} # startplasmacompositor deps Requires: qt5-qttools -# start with soft dep -- rdieter -Recommends: xdg-desktop-portal-kde >= %{majmin_ver} +Requires: xdg-desktop-portal-kde >= %{majmin_ver} %description wayland %{summary}. @@ -807,6 +809,9 @@ fi %changelog +* Fri Sep 22 2023 Neal Gompa - 5.27.8-2 +- Recommend orca for a11y and require xdg-desktop-portal-kde for wayland + * Tue Sep 12 2023 justin.zobel@gmail.com - 5.27.8-1 - 5.27.8 From cc0386a7e29b44d02ca052cbcb0d30c56b29f020 Mon Sep 17 00:00:00 2001 From: Steve Cossette Date: Tue, 24 Oct 2023 16:41:33 -0400 Subject: [PATCH 07/16] 5.27.9 --- plasma-workspace.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index c4bf64f..f52aaff 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.8 -Release: 2%{?dist} +Version: 5.27.9 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -809,6 +809,9 @@ fi %changelog +* Tue Oct 24 2023 Steve Cossette - 5.27.9-1 +- 5.27.9 + * Fri Sep 22 2023 Neal Gompa - 5.27.8-2 - Recommend orca for a11y and require xdg-desktop-portal-kde for wayland diff --git a/sources b/sources index 7972df0..5413604 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.8.tar.xz) = d75da7d8cea3124f921813643ebda333376d3cc2ecbe2aaeee86e54a828e6a9767fa84b76991cfe282efdbf583abebee4a0bfe54a6b590c184ceb3d2995e9fcb +SHA512 (plasma-workspace-5.27.9.tar.xz) = 11eefc03fa4e327454d13d873a3c4fbdaa6fc9a1ad0033d16986d31bf313005bd47dff2948f97aab801837620f9631f5e96acca3348491ee95486bdfbbbe3cc2 From 247c37752123ea419f5a6066857d32d59096c55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 25 Oct 2023 22:17:41 +0200 Subject: [PATCH 08/16] feat: 5.27.9.1 --- plasma-workspace.spec | 60 +++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f52aaff..dd86811 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,21 +27,15 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.9 +Version: 5.27.9.1 Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global majmin_ver %(echo %{version} | cut -d. -f1,2).50 -%global stable unstable -%else -%global majmin_ver %(echo %{version} | cut -d. -f1,2) -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +# Temporary commenting out as there is a re-release +#Source0: http://download.kde.org/%{stable_kf5}/plasma/%{version}/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable_kf5}/plasma/5.27.9/%{name}-%{version}.tar.xz # filter qml/plugins provides %global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$ @@ -172,11 +166,11 @@ BuildRequires: kf5-kquickcharts-devel >= %{kf5_version_min} BuildRequires: kf5-kwayland-devel >= %{kf5_version_min} BuildRequires: wayland-devel >= 1.3.0 -BuildRequires: libkscreen-qt5-devel >= %{majmin_ver} -BuildRequires: libksysguard-devel >= %{majmin_ver} -BuildRequires: kscreenlocker-devel >= %{majmin_ver} -BuildRequires: kwin-devel >= %{majmin_ver} -BuildRequires: layer-shell-qt-devel >= %{majmin_ver} +BuildRequires: libkscreen-qt5-devel >= %{majmin_ver_kf5} +BuildRequires: libksysguard-devel >= %{majmin_ver_kf5} +BuildRequires: kscreenlocker-devel >= %{majmin_ver_kf5} +BuildRequires: kwin-devel >= %{majmin_ver_kf5} +BuildRequires: layer-shell-qt-devel >= %{majmin_ver_kf5} BuildRequires: PackageKit-Qt5-devel @@ -226,9 +220,9 @@ Requires: (policycoreutils if selinux-policy) # for libkdeinit5_* %{?kf5_kinit_requires} -Requires: kactivitymanagerd%{?_isa} >= %{majmin_ver} -Requires: khotkeys%{?_isa} >= %{majmin_ver} -Requires: ksystemstats%{?_isa} >= %{majmin_ver} +Requires: kactivitymanagerd%{?_isa} >= %{majmin_ver_kf5} +Requires: khotkeys%{?_isa} >= %{majmin_ver_kf5} +Requires: ksystemstats%{?_isa} >= %{majmin_ver_kf5} Requires: kf5-baloo >= %{kf5_version_min} Requires: kf5-kded >= %{kf5_version_min} Requires: kf5-kdoctools >= %{kf5_version_min} @@ -240,14 +234,14 @@ Requires: qt5-qtgraphicaleffects # The new volume control for PulseAudio %if 0%{?fedora} || 0%{?rhel} > 7 -Recommends: plasma-pa >= %{majmin_ver} +Recommends: plasma-pa >= %{majmin_ver_kf5} %endif # Without the platformtheme plugins we get broken fonts Requires: kf5-frameworkintegration # For krunner -Recommends: plasma-milou >= %{majmin_ver} +Recommends: plasma-milou >= %{majmin_ver_kf5} # https://pagure.io/fedora-kde/SIG/issue/303 Recommends: kde-inotify-survey @@ -262,7 +256,7 @@ Recommends: orca # need to avoid this dep when bootstrapping %if ! 0%{?bootstrap} # Power management -Requires: powerdevil >= %{majmin_ver} +Requires: powerdevil >= %{majmin_ver_kf5} %endif Requires: dbus @@ -288,10 +282,10 @@ Requires: plasma-lookandfeel-fedora = %{version}-%{release} Requires: systemd # Oxygen -Requires: oxygen-sounds >= %{majmin_ver} +Requires: oxygen-sounds >= %{majmin_ver_kf5} # PolicyKit authentication agent -Requires: polkit-kde >= %{majmin_ver} +Requires: polkit-kde >= %{majmin_ver_kf5} # onscreen keyboard Requires: maliit-keyboard @@ -311,7 +305,7 @@ Provides: plasmashell = %{version} # Note: We should require >= %%{version}, but that creates a circular dependency # at build time of plasma-desktop, because it provides the needed dependency, but # also needs plasma-workspace to build. So for now the dependency is unversioned. -Requires: plasmashell >= %{majmin_ver} +Requires: plasmashell >= %{majmin_ver_kf5} %endif # when -common, libkworkspace5 was split out @@ -433,7 +427,7 @@ BuildArch: noarch Summary: Plasma Wayland SDDM greeter configuration Provides: sddm-greeter-displayserver Conflicts: sddm-greeter-displayserver -Requires: kwin-wayland >= %{majmin_ver} +Requires: kwin-wayland >= %{majmin_ver_kf5} Requires: maliit-keyboard %if %{with sddm_wayland_default} Supplements: (sddm and plasma-workspace-wayland) @@ -452,13 +446,13 @@ to use KWin for the Wayland compositor for the greeter. %package wayland Summary: Wayland support for Plasma Requires: %{name} = %{version}-%{release} -Requires: kwin-wayland >= %{majmin_ver} -Requires: kwayland-integration%{?_isa} >= %{majmin_ver} +Requires: kwin-wayland >= %{majmin_ver_kf5} +Requires: kwayland-integration%{?_isa} >= %{majmin_ver_kf5} Requires: xorg-x11-server-Xwayland Requires: qt5-qtwayland%{?_isa} # startplasmacompositor deps Requires: qt5-qttools -Requires: xdg-desktop-portal-kde >= %{majmin_ver} +Requires: xdg-desktop-portal-kde >= %{majmin_ver_kf5} %description wayland %{summary}. @@ -471,7 +465,7 @@ Provides: %{name}-xorg%{?_isa} = %{version}-%{release} # Split of Xorg session into subpackage Obsoletes: %{name} < 5.19.5-2 Requires: %{name} = %{version}-%{release} -Requires: kwin-x11 >= %{majmin_ver} +Requires: kwin-x11 >= %{majmin_ver_kf5} Requires: xorg-x11-server-Xorg Requires: xsetroot %description x11 @@ -809,6 +803,10 @@ fi %changelog +* Wed Oct 25 2023 Marc Deop i Argemí - 5.27.9.1-1 +- 5.27.9.1 +- Replace old %%stable macro + * Tue Oct 24 2023 Steve Cossette - 5.27.9-1 - 5.27.9 @@ -1861,7 +1859,7 @@ fi - Plasma 5.5.3 * Thu Dec 31 2015 Rex Dieter - 5.5.2-2 -- use %%majmin_ver for most plasma-related deps +- use %%majmin_ver_kf5 for most plasma-related deps - tighten plugin deps using %%_isa - update URL @@ -1921,7 +1919,7 @@ fi - startkde: don't try to source things in a subshell, don't munge XDG_DATA_DIRS needlessly * Sun Oct 04 2015 Rex Dieter 5.4.2-3 -- consistently use %%{majmin_ver} macro for other plasma5-related deps +- consistently use %%{majmin_ver_kf5} macro for other plasma5-related deps * Sat Oct 03 2015 Rex Dieter - 5.4.2-2 - .spec cosmetics, use %%license From 439351e719f72755f6401f007a82ca5d9f0d9d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 25 Oct 2023 22:19:58 +0200 Subject: [PATCH 09/16] fix: upload sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 5413604..3fe2a7d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.9.tar.xz) = 11eefc03fa4e327454d13d873a3c4fbdaa6fc9a1ad0033d16986d31bf313005bd47dff2948f97aab801837620f9631f5e96acca3348491ee95486bdfbbbe3cc2 +SHA512 (plasma-workspace-5.27.9.1.tar.xz) = 6aa1e69bba9b293646d5d2c819ec8ab1ba8b82b3a050f7122cdfa8c3580bffe8a7fe1e6422bb0f6e87d716df609e5fd49f2e20ebbe7296e43663eeca6d897442 From 78a0c3dcb149d570800cf6a6d9acc4d9ce077a1b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Nov 2023 11:56:11 -0400 Subject: [PATCH 10/16] Mark plasma-workspace-x11 as deprecated --- plasma-workspace.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index dd86811..40ae461 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -468,6 +468,8 @@ Requires: %{name} = %{version}-%{release} Requires: kwin-x11 >= %{majmin_ver_kf5} Requires: xorg-x11-server-Xorg Requires: xsetroot +# Plasma X11 is deprecated and will be removed with Plasma 6.0 +Provides: deprecated() %description x11 %{summary}. From 08e3a6a25ebd9acac95b5c18d63432e7646a9f65 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Nov 2023 12:02:39 -0400 Subject: [PATCH 11/16] Bump release and add changelog entry --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 40ae461..e6a116d 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.9.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -805,6 +805,9 @@ fi %changelog +* Fri Nov 03 2023 Neal Gompa - 5.27.9.1-2 +- Mark plasma-workspace-x11 as deprecated + * Wed Oct 25 2023 Marc Deop i Argemí - 5.27.9.1-1 - 5.27.9.1 - Replace old %%stable macro From 91de6e2d92df53321efe7fb6978cb788e7a8c6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 25 Nov 2023 18:58:36 +0100 Subject: [PATCH 12/16] fix: backport upstream fix #2250757 --- ...4fc070e88614feb9c198f6ea910c91f3c5d5.patch | 47 +++++++++++++++++++ plasma-workspace.spec | 10 +++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch diff --git a/b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch b/b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch new file mode 100644 index 0000000..1728660 --- /dev/null +++ b/b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch @@ -0,0 +1,47 @@ +From b8544fc070e88614feb9c198f6ea910c91f3c5d5 Mon Sep 17 00:00:00 2001 +From: Ismael Asensio +Date: Mon, 6 Nov 2023 19:13:37 +0000 +Subject: [PATCH] kcms/nightcolor: Fix nightcolor with automatic location + +As it turns out that the UI never send the geo-location to the +backend so backend always fallbacks to (0, 0) lat and lon +coordinates unless manually changed by `qdbus` commad.. + +BUG: 469730 +FIXED-IN: 5.27.10 + + +(cherry picked from commit cb2b0e9c036d844d87fd104a3ae031b59243eaa5) +--- + kcms/nightcolor/package/contents/ui/main.qml | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml +index c7d237f13b..418c05d42f 100644 +--- a/kcms/nightcolor/package/contents/ui/main.qml ++++ b/kcms/nightcolor/package/contents/ui/main.qml +@@ -60,6 +60,21 @@ KCM.SimpleKCM { + } + } + ++ // Update backend when locator is changed ++ Connections { ++ target: locator ++ function onLatitudeChanged() { ++ if (root.doneLocating) { ++ kcm.nightColorSettings.latitudeAuto = locator.latitude ++ } ++ } ++ function onLongitudeChanged() { ++ if (root.doneLocating) { ++ kcm.nightColorSettings.longitudeAuto = locator.latitude ++ } ++ } ++ } ++ + header: ColumnLayout{ + Kirigami.InlineMessage { + id: errorMessage +-- +GitLab + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index e6a116d..30655a2 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.9.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -56,6 +56,11 @@ Source20: breeze-fedora-0.2.tar.gz Source40: ssh-agent.conf Source41: spice-vdagent.conf +# upstream patches +# https://invent.kde.org/plasma/plasma-workspace/-/commit/b8544fc070e88614feb9c198f6ea910c91f3c5d5 +# https://bugzilla.redhat.com/show_bug.cgi?id=2250757 +Patch1: b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch + ## upstreamable Patches ## downstream Patches @@ -805,6 +810,9 @@ fi %changelog +* Sat Nov 25 2023 Marc Deop i Argemí - 5.27.9.1-3 +- Add upstream patch #2250757 + * Fri Nov 03 2023 Neal Gompa - 5.27.9.1-2 - Mark plasma-workspace-x11 as deprecated From 2c6cba49957423d8297ff4321889fb9e19c952dd Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 29 Nov 2023 11:13:31 -0800 Subject: [PATCH 13/16] epel has desktop-backgrounds-compat --- plasma-workspace.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 30655a2..b688a5c 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -417,13 +417,8 @@ Recommends: qt5-qtvirtualkeyboard # org.kde.plasma.workspace.keyboardlayout Requires: %{name} = %{version}-%{release} # /usr/share/backgrounds/default.png -%if 0%{?fedora} BuildRequires: desktop-backgrounds-compat Requires: desktop-backgrounds-compat -%endif -%if 0%{?rhel} -Requires: system-logos -%endif BuildArch: noarch %description -n sddm-breeze %{summary}. From fc3ba2730ba324f3ef231b975c40b1495e912d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 17 Dec 2023 07:59:56 +0100 Subject: [PATCH 14/16] 5.27.10 --- ...4fc070e88614feb9c198f6ea910c91f3c5d5.patch | 47 ------------------- plasma-workspace.spec | 14 +++--- sources | 2 +- 3 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch diff --git a/b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch b/b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch deleted file mode 100644 index 1728660..0000000 --- a/b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b8544fc070e88614feb9c198f6ea910c91f3c5d5 Mon Sep 17 00:00:00 2001 -From: Ismael Asensio -Date: Mon, 6 Nov 2023 19:13:37 +0000 -Subject: [PATCH] kcms/nightcolor: Fix nightcolor with automatic location - -As it turns out that the UI never send the geo-location to the -backend so backend always fallbacks to (0, 0) lat and lon -coordinates unless manually changed by `qdbus` commad.. - -BUG: 469730 -FIXED-IN: 5.27.10 - - -(cherry picked from commit cb2b0e9c036d844d87fd104a3ae031b59243eaa5) ---- - kcms/nightcolor/package/contents/ui/main.qml | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/kcms/nightcolor/package/contents/ui/main.qml b/kcms/nightcolor/package/contents/ui/main.qml -index c7d237f13b..418c05d42f 100644 ---- a/kcms/nightcolor/package/contents/ui/main.qml -+++ b/kcms/nightcolor/package/contents/ui/main.qml -@@ -60,6 +60,21 @@ KCM.SimpleKCM { - } - } - -+ // Update backend when locator is changed -+ Connections { -+ target: locator -+ function onLatitudeChanged() { -+ if (root.doneLocating) { -+ kcm.nightColorSettings.latitudeAuto = locator.latitude -+ } -+ } -+ function onLongitudeChanged() { -+ if (root.doneLocating) { -+ kcm.nightColorSettings.longitudeAuto = locator.latitude -+ } -+ } -+ } -+ - header: ColumnLayout{ - Kirigami.InlineMessage { - id: errorMessage --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b688a5c..a1bcb0c 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,15 +27,13 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.9.1 -Release: 3%{?dist} +Version: 5.27.10 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} -# Temporary commenting out as there is a re-release -#Source0: http://download.kde.org/%{stable_kf5}/plasma/%{version}/%{name}-%{version}.tar.xz -Source0: http://download.kde.org/%{stable_kf5}/plasma/5.27.9/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable_kf5}/plasma/%{version}/%{name}-%{version}.tar.xz # filter qml/plugins provides %global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$ @@ -57,9 +55,6 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf # upstream patches -# https://invent.kde.org/plasma/plasma-workspace/-/commit/b8544fc070e88614feb9c198f6ea910c91f3c5d5 -# https://bugzilla.redhat.com/show_bug.cgi?id=2250757 -Patch1: b8544fc070e88614feb9c198f6ea910c91f3c5d5.patch ## upstreamable Patches @@ -805,6 +800,9 @@ fi %changelog +* Sat Dec 16 2023 Marc Deop i Argemí - 5.27.10-1 +- 5.27.10 + * Sat Nov 25 2023 Marc Deop i Argemí - 5.27.9.1-3 - Add upstream patch #2250757 diff --git a/sources b/sources index 3fe2a7d..567d388 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.9.1.tar.xz) = 6aa1e69bba9b293646d5d2c819ec8ab1ba8b82b3a050f7122cdfa8c3580bffe8a7fe1e6422bb0f6e87d716df609e5fd49f2e20ebbe7296e43663eeca6d897442 +SHA512 (plasma-workspace-5.27.10.tar.xz) = de56a884c05101672b5339cd64b345351f602b33b14daa666e18427251980f557dd65fe35f77c3a361507e3372b05e03b713123e2a7cad29c6bba2af2b43b5a7 From af97808341d82dd5fd95db5d04fa2120d05ea9d8 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 20 Feb 2024 14:32:22 -0800 Subject: [PATCH 15/16] Set wayland on by default for epel9 --- plasma-workspace.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b5e8b1a..6b69de8 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -5,14 +5,14 @@ %global kf5_version_min 5.98.0 # Control wayland by default -%if (0%{?rhel} && 0%{?rhel} <= 9) +%if (0%{?rhel} && 0%{?rhel} < 9) %bcond_with wayland_default %else %bcond_without wayland_default %endif # Control sddm wayland by default -%if (0%{?fedora} && 0%{?fedora} < 38) || (0%{?rhel} && 0%{?rhel} <= 9) +%if (0%{?fedora} && 0%{?fedora} < 38) || (0%{?rhel} && 0%{?rhel} < 9) %bcond_with sddm_wayland_default %else %bcond_without sddm_wayland_default @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.27.10 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -800,6 +800,9 @@ fi %changelog +* Tue Feb 20 2024 Troy Dawson - 5.27.10-1.1 +- Set wayland on by default for epel9 + * Sat Dec 16 2023 Marc Deop i Argemí - 5.27.10-1 - 5.27.10 From 578cf762cb6b8b2c6b08a6ebf28fe3749a6e2c95 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 10 Mar 2024 01:02:36 +0100 Subject: [PATCH 16/16] 5.27.11 --- plasma-workspace.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index a1bcb0c..9a35038 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.10 +Version: 5.27.11 Release: 1%{?dist} License: GPLv2+ @@ -800,6 +800,9 @@ fi %changelog +* Sat Mar 09 2024 Alessandro Astone - 5.27.11-1 +- 5.27.11 + * Sat Dec 16 2023 Marc Deop i Argemí - 5.27.10-1 - 5.27.10 diff --git a/sources b/sources index 567d388..f42164c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.27.10.tar.xz) = de56a884c05101672b5339cd64b345351f602b33b14daa666e18427251980f557dd65fe35f77c3a361507e3372b05e03b713123e2a7cad29c6bba2af2b43b5a7 +SHA512 (plasma-workspace-5.27.11.tar.xz) = d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443