From 31972355477d2afe4bc177662560bcd95134b959 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 May 2022 22:40:19 +0900 Subject: [PATCH 01/36] Rebuild for new gpsd --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 6a44a46..bd01ac6 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.24.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -796,6 +796,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Fri May 06 2022 Mamoru TASAKA - 5.24.5-2 +- Rebuild for new gpsd + * Tue May 03 2022 Marc Deop - 5.24.5-1 - 5.24.5 From 51773dfd5ff4214daae0e64f18785eb6a3d24d37 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 25 Mar 2022 19:40:13 +0000 Subject: [PATCH 02/36] enable selinuxuser_execmod The selinux policies will soon be disabling selinuxuser_execmod. Plasma uses execmod in several places, thus we need to ensure that it is on. Signed-off-by: Troy Dawson --- plasma-workspace.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index bd01ac6..d1c4621 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -211,6 +211,8 @@ Requires: %{name}-geolocation = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: libkworkspace5%{?_isa} = %{version}-%{release} +# for selinux settings +Requires: policycoreutils # for libkdeinit5_* %{?kf5_kinit_requires} @@ -571,6 +573,8 @@ cat *.lang | sort | uniq -u > %{name}.lang %check desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,plasmashell,systemmonitor}.desktop +%post +setsebool -P selinuxuser_execmod 1 %files common %license LICENSES From 8446a76bd07ae334e35613f9789dd721de9b7738 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 28 Mar 2022 13:59:36 -0700 Subject: [PATCH 03/36] Only set selinuxuser_execmod if selinux-policy installed --- plasma-workspace.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d1c4621..9badf8d 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -212,7 +212,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: libkworkspace5%{?_isa} = %{version}-%{release} # for selinux settings -Requires: policycoreutils +Requires: (policycoreutils if selinux-policy) # for libkdeinit5_* %{?kf5_kinit_requires} @@ -574,7 +574,9 @@ cat *.lang | sort | uniq -u > %{name}.lang desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,plasmashell,systemmonitor}.desktop %post -setsebool -P selinuxuser_execmod 1 +if [ -s /usr/sbin/setsebool ] ; then + setsebool -P selinuxuser_execmod 1 ||: +fi %files common %license LICENSES From f18a1eb0fcbf68d595d5a9c3e40df475d11a8b7b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 17 May 2022 13:06:15 +0200 Subject: [PATCH 04/36] Rebuild (qt5) --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 9badf8d..4ff3e2b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.24.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ fi %changelog +* Tue May 17 2022 Jan Grulich - 5.24.5-3 +- Rebuild (qt5) + * Fri May 06 2022 Mamoru TASAKA - 5.24.5-2 - Rebuild for new gpsd From 6acbc2b38fcb1ac03b6e276ca260acdcd5464eb1 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Sat, 21 May 2022 20:33:11 +0200 Subject: [PATCH 05/36] 5.24.90 --- .gitignore | 1 + ...4.0-set-fedora-default-look-and-feel.patch | 20 ++++---- plasma-workspace-konsole-in-contextmenu.patch | 51 +++++++++---------- plasma-workspace.spec | 13 +++-- sources | 2 +- 5 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index f63a7ca..c2abf65 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /plasma-workspace-5.24.3.tar.xz /plasma-workspace-5.24.4.tar.xz /plasma-workspace-5.24.5.tar.xz +/plasma-workspace-5.24.90.tar.xz diff --git a/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch b/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch index 415683b..03828ca 100644 --- a/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch +++ b/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch @@ -1,7 +1,6 @@ -diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp -index d50b3e96f..556877af6 100644 ---- a/shell/packageplugins/lookandfeel/lookandfeel.cpp -+++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp +diff -Nurr plasma-workspace-5.24.90/shell/packageplugins/lookandfeel/lookandfeel.cpp plasma-workspace-5.24.90-new/shell/packageplugins/lookandfeel/lookandfeel.cpp +--- plasma-workspace-5.24.90/shell/packageplugins/lookandfeel/lookandfeel.cpp 2022-05-19 12:38:19.000000000 +0200 ++++ plasma-workspace-5.24.90-new/shell/packageplugins/lookandfeel/lookandfeel.cpp 2022-05-21 17:44:56.201054375 +0200 @@ -10,7 +10,7 @@ #include #include @@ -11,16 +10,15 @@ index d50b3e96f..556877af6 100644 void LookAndFeelPackage::initPackage(KPackage::Package *package) { -diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index bd848dda0..43978a712 100644 ---- a/startkde/startplasma.cpp -+++ b/startkde/startplasma.cpp -@@ -365,7 +365,7 @@ void setupPlasmaEnvironment() - qputenv("XDG_CONFIG_DIRS", extraConfigDir + ":" + currentConfigDirs); +diff -Nurr plasma-workspace-5.24.90/startkde/startplasma.cpp plasma-workspace-5.24.90-new/startkde/startplasma.cpp +--- plasma-workspace-5.24.90/startkde/startplasma.cpp 2022-05-19 12:38:19.000000000 +0200 ++++ plasma-workspace-5.24.90-new/startkde/startplasma.cpp 2022-05-21 17:44:53.033054894 +0200 +@@ -350,7 +350,7 @@ + qputenv("XDG_CONFIG_DIRS", QFile::encodeName(extraConfigDir) + ':' + currentConfigDirs); const KConfig globals; - const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("org.kde.breeze.desktop")); + const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("@DEFAULT_LOOKANDFEEL@")); - QFile activeLnf(QString::fromUtf8(extraConfigDir + "/package")); + QFile activeLnf(extraConfigDir + QLatin1String("/package")); activeLnf.open(QIODevice::ReadOnly); if (activeLnf.readLine() != currentLnf.toUtf8()) { diff --git a/plasma-workspace-konsole-in-contextmenu.patch b/plasma-workspace-konsole-in-contextmenu.patch index e70e58d..e878c7e 100644 --- a/plasma-workspace-konsole-in-contextmenu.patch +++ b/plasma-workspace-konsole-in-contextmenu.patch @@ -1,8 +1,7 @@ -diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/CMakeLists.txt.konsole-in-contextmenu plasma-workspace-5.23.90/containmentactions/contextmenu/CMakeLists.txt -diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp ---- plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsole-in-contextmenu 2022-01-13 07:19:17.000000000 -0600 -+++ plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp 2022-01-19 16:09:26.778355795 -0600 -@@ -16,6 +16,7 @@ +diff -Nurr plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.cpp plasma-workspace-5.24.90/containmentactions/contextmenu/menu.cpp +--- plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.cpp 2022-05-21 16:42:05.980661922 +0200 ++++ plasma-workspace-5.24.90/containmentactions/contextmenu/menu.cpp 2022-05-21 16:47:43.503606798 +0200 +@@ -17,6 +17,7 @@ #include #include #include @@ -11,14 +10,14 @@ diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsol #include @@ -29,6 +30,7 @@ + ContextMenu::ContextMenu(QObject *parent, const QVariantList &args) : Plasma::ContainmentActions(parent, args) - , m_runCommandAction(nullptr) + , m_runKonsoleAction(nullptr) - , m_lockScreenAction(nullptr) - , m_logoutAction(nullptr) - , m_configureDisplaysAction(nullptr) -@@ -68,6 +70,7 @@ void ContextMenu::restore(const KConfigG + , m_session(new SessionManagement(this)) + { + } +@@ -61,6 +63,7 @@ << QStringLiteral("configure shortcuts") << QStringLiteral("_sep1") << QStringLiteral("_context") @@ -26,27 +25,27 @@ diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsol << QStringLiteral("_run_command") << QStringLiteral("add widgets") << QStringLiteral("_add panel") -@@ -102,6 +105,10 @@ void ContextMenu::restore(const KConfigG +@@ -97,6 +100,10 @@ m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner.desktop"), QStringLiteral("_launch")).value(0)); connect(m_runCommandAction, &QAction::triggered, this, &ContextMenu::runCommand); -+ m_runKonsoleAction = new QAction(i18n("Konsole"), this); -+ m_runKonsoleAction->setIcon(QIcon::fromTheme("utilities-terminal")); -+ connect(m_runKonsoleAction, &QAction::triggered, this, &ContextMenu::runKonsole); ++ m_runKonsoleAction = new QAction(i18n("Konsole"), this); ++ m_runKonsoleAction->setIcon(QIcon::fromTheme("utilities-terminal")); ++ connect(m_runKonsoleAction, &QAction::triggered, this, &ContextMenu::runKonsole); + m_lockScreenAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Lock Screen"), this); m_lockScreenAction->setIcon(QIcon::fromTheme(QStringLiteral("system-lock-screen"))); m_lockScreenAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("ksmserver"), QStringLiteral("Lock Session")).value(0)); -@@ -184,6 +191,8 @@ QAction *ContextMenu::action(const QStri +@@ -179,6 +186,8 @@ if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) { return m_runCommandAction; } + } else if (name == QLatin1String("_run_konsole")) { -+ return m_runKonsoleAction; ++ return m_runKonsoleAction; } else if (name == QLatin1String("_lock_screen")) { if (KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) { return m_lockScreenAction; -@@ -211,6 +220,13 @@ QAction *ContextMenu::action(const QStri +@@ -212,6 +221,13 @@ return nullptr; } @@ -60,10 +59,10 @@ diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.cpp.konsol void ContextMenu::runCommand() { if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) { -diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h.konsole-in-contextmenu plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h ---- plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h.konsole-in-contextmenu 2022-01-19 16:07:20.060556636 -0600 -+++ plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h 2022-01-19 16:08:43.055454606 -0600 -@@ -29,11 +29,13 @@ public: +diff -Nurr plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.h plasma-workspace-5.24.90/containmentactions/contextmenu/menu.h +--- plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.h 2022-05-21 16:42:05.980661922 +0200 ++++ plasma-workspace-5.24.90/containmentactions/contextmenu/menu.h 2022-05-21 16:48:39.122597718 +0200 +@@ -29,11 +29,13 @@ public Q_SLOTS: void runCommand(); @@ -72,8 +71,8 @@ diff -up plasma-workspace-5.23.90/containmentactions/contextmenu/menu.h.konsole- void configureDisplays(); private: - QAction *m_runCommandAction; -+ QAction *m_runKonsoleAction; - QAction *m_lockScreenAction; - QAction *m_logoutAction; - QAction *m_configureDisplaysAction; + QAction *m_runCommandAction = nullptr; ++ QAction *m_runKonsoleAction = nullptr; + QAction *m_lockScreenAction = nullptr; + QAction *m_logoutAction = nullptr; + QAction *m_configureDisplaysAction = nullptr; diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 4ff3e2b..3ea19f5 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -2,7 +2,7 @@ # repo or arch where there's no package that would provide plasmashell #global bootstrap 1 -%global kf5_version_min 5.82.0 +%global kf5_version_min 5.91.0 # Control wayland by default %if (0%{?rhel} && 0%{?rhel} < 9) @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.5 -Release: 3%{?dist} +Version: 5.24.90 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -163,7 +163,7 @@ BuildRequires: kf5-kwallet-devel >= %{kf5_version_min} BuildRequires: kf5-kxmlrpcclient-devel >= %{kf5_version_min} BuildRequires: kf5-networkmanager-qt-devel >= %{kf5_version_min} BuildRequires: kf5-plasma-devel >= %{kf5_version_min} -Requires: kf5-plasma%{?_isa} >= %{_kf5_version} +Requires: kf5-plasma%{?_isa} >= %{kf5_version_min} BuildRequires: kf5-threadweaver-devel >= %{kf5_version_min} BuildRequires: kf5-kded-devel >= %{kf5_version_min} BuildRequires: kf5-kirigami2-devel >= %{kf5_version_min} @@ -387,7 +387,7 @@ Requires: %{name}-geolocation = %{version}-%{release} Summary: SDDM breeze theme # upgrade path, when sddm-breeze was split out Obsoletes: plasma-workspace < 5.3.2-8 -Requires: kf5-plasma >= %{_kf5_version} +Requires: kf5-plasma >= %{kf5_version_min} # Background.qml:import QtQuick Requires: qt5-qtquickcontrols # on-screen keyboard @@ -802,6 +802,9 @@ fi %changelog +* Fri May 20 2022 Marc Deop - 5.24.90-1 +- 5.24.90 + * Tue May 17 2022 Jan Grulich - 5.24.5-3 - Rebuild (qt5) diff --git a/sources b/sources index 57f0811..75c3c3e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 -SHA512 (plasma-workspace-5.24.5.tar.xz) = ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 +SHA512 (plasma-workspace-5.24.90.tar.xz) = 5ec2c91b5e9a1c4e0634245a53f9c38aeeaaa2bc80d8e1ed259d9b7f5d342da007562574f281aee694b74d14b6c0e8a2da5d508b1cd570faadf106d0c6958fce From 07ac539b7a4f6c3f271748ef8993c23f5ca4351f Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Thu, 9 Jun 2022 17:45:30 +0200 Subject: [PATCH 06/36] 5.25.0 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c2abf65..0ea8965 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /plasma-workspace-5.24.4.tar.xz /plasma-workspace-5.24.5.tar.xz /plasma-workspace-5.24.90.tar.xz +/plasma-workspace-5.25.0.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 3ea19f5..4d11b3c 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.90 +Version: 5.25.0 Release: 1%{?dist} License: GPLv2+ @@ -272,7 +272,7 @@ Requires: desktop-backgrounds-compat Requires: systemd # Oxygen -Requires: oxygen-sound-theme >= %{majmin_ver} +Requires: oxygen-sounds >= %{majmin_ver} # PolicyKit authentication agent Requires: polkit-kde >= %{majmin_ver} @@ -802,6 +802,9 @@ fi %changelog +* Thu Jun 09 2022 Marc Deop - 5.25.0-1 +- 5.25.0 + * Fri May 20 2022 Marc Deop - 5.24.90-1 - 5.24.90 diff --git a/sources b/sources index 75c3c3e..789ab92 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 -SHA512 (plasma-workspace-5.24.90.tar.xz) = 5ec2c91b5e9a1c4e0634245a53f9c38aeeaaa2bc80d8e1ed259d9b7f5d342da007562574f281aee694b74d14b6c0e8a2da5d508b1cd570faadf106d0c6958fce +SHA512 (plasma-workspace-5.25.0.tar.xz) = 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8 From 9a4b22c9185ede4c5e84e43162c6ca6e402907cd Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 14 Jun 2022 09:27:39 -0400 Subject: [PATCH 07/36] Fix setup for default look and feel - Remove broken mechanism for setting default look and feel - Always ship Fedora look and feel theme - Drop unneeded sddm theme snapshot and patches --- ...4.0-set-fedora-default-look-and-feel.patch | 24 --- plasma-workspace-PR1508-sddm-theme-pc3.patch | 173 ------------------ ...PR1510-sddm-theme-fix-weird-behavior.patch | 28 --- plasma-workspace.spec | 44 +---- sources | 1 - sources.keep | 1 - 6 files changed, 7 insertions(+), 264 deletions(-) delete mode 100644 plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch delete mode 100644 plasma-workspace-PR1508-sddm-theme-pc3.patch delete mode 100644 plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch diff --git a/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch b/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch deleted file mode 100644 index 03828ca..0000000 --- a/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nurr plasma-workspace-5.24.90/shell/packageplugins/lookandfeel/lookandfeel.cpp plasma-workspace-5.24.90-new/shell/packageplugins/lookandfeel/lookandfeel.cpp ---- plasma-workspace-5.24.90/shell/packageplugins/lookandfeel/lookandfeel.cpp 2022-05-19 12:38:19.000000000 +0200 -+++ plasma-workspace-5.24.90-new/shell/packageplugins/lookandfeel/lookandfeel.cpp 2022-05-21 17:44:56.201054375 +0200 -@@ -10,7 +10,7 @@ - #include - #include - --#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop" -+#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@" - - void LookAndFeelPackage::initPackage(KPackage::Package *package) - { -diff -Nurr plasma-workspace-5.24.90/startkde/startplasma.cpp plasma-workspace-5.24.90-new/startkde/startplasma.cpp ---- plasma-workspace-5.24.90/startkde/startplasma.cpp 2022-05-19 12:38:19.000000000 +0200 -+++ plasma-workspace-5.24.90-new/startkde/startplasma.cpp 2022-05-21 17:44:53.033054894 +0200 -@@ -350,7 +350,7 @@ - qputenv("XDG_CONFIG_DIRS", QFile::encodeName(extraConfigDir) + ':' + currentConfigDirs); - - const KConfig globals; -- const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("org.kde.breeze.desktop")); -+ const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("@DEFAULT_LOOKANDFEEL@")); - QFile activeLnf(extraConfigDir + QLatin1String("/package")); - activeLnf.open(QIODevice::ReadOnly); - if (activeLnf.readLine() != currentLnf.toUtf8()) { diff --git a/plasma-workspace-PR1508-sddm-theme-pc3.patch b/plasma-workspace-PR1508-sddm-theme-pc3.patch deleted file mode 100644 index 22ef7f9..0000000 --- a/plasma-workspace-PR1508-sddm-theme-pc3.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 119195493cf2492ddc35fbbc4d97266ceee16ad1 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Sat, 5 Mar 2022 19:48:56 +0100 -Subject: [PATCH] Port SDDM theme to PlasmaComponents 3.0 - -Uses a combobox instead of a menu + button ---- - sddm-theme/BreezeMenuStyle.qml | 25 ------------------ - sddm-theme/KeyboardButton.qml | 47 ++++++++++++---------------------- - sddm-theme/Main.qml | 1 - - sddm-theme/SessionButton.qml | 37 +++++++------------------- - 4 files changed, 26 insertions(+), 84 deletions(-) - delete mode 100644 sddm-theme/BreezeMenuStyle.qml - -diff --git a/sddm-theme/BreezeMenuStyle.qml b/sddm-theme/BreezeMenuStyle.qml -deleted file mode 100644 -index e4a91d4d6..000000000 ---- a/sddm-theme/BreezeMenuStyle.qml -+++ /dev/null -@@ -1,25 +0,0 @@ --import QtQuick 2.15 --// Don't bump them any further, these are the latest. --import QtQuick.Controls 1.6 as QQC --import QtQuick.Controls.Styles 1.4 as QQCS -- --import org.kde.plasma.core 2.0 as PlasmaCore -- --QQCS.MenuStyle { -- frame: Rectangle { -- color: PlasmaCore.ColorScope.backgroundColor -- border.color: Qt.tint(PlasmaCore.ColorScope.textColor, Qt.rgba(color.r, color.g, color.b, 0.7)) -- border.width: 1 -- } -- itemDelegate.label: QQC.Label { -- height: contentHeight * 1.2 -- verticalAlignment: Text.AlignVCenter -- color: styleData.selected ? PlasmaCore.ColorScope.highlightedTextColor : PlasmaCore.ColorScope.textColor -- font.pointSize: config.fontSize -- text: styleData.text -- } -- itemDelegate.background: Rectangle { -- visible: styleData.selected -- color: PlasmaCore.ColorScope.highlightColor -- } --} -diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml -index 6ebf0d5bb..a95884d04 100644 ---- a/sddm-theme/KeyboardButton.qml -+++ b/sddm-theme/KeyboardButton.qml -@@ -1,38 +1,25 @@ --import QtQuick 2.15 --import QtQuick.Controls 1.6 as QQC // Don't bump it any further, this is the latest. -+/* -+ SPDX-FileCopyrightText: 2016 David Edmundson - --import org.kde.plasma.core 2.0 as PlasmaCore --import org.kde.plasma.components 2.0 as PlasmaComponents // Because PC3 ToolButton can't take a menu -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ - --PlasmaComponents.ToolButton { -- id: keyboardButton -+import QtQuick 2.15 - -- property int currentIndex: -1 -+import org.kde.plasma.core 2.0 as PlasmaCore -+import org.kde.plasma.components 3.0 as PlasmaComponents - -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) -- implicitWidth: minimumWidth -+PlasmaComponents.ComboBox { -+ id: root - -- visible: menu.items.length > 1 -+ PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup -+ PlasmaCore.ColorScope.inherit: false - -- Component.onCompleted: { -- currentIndex = Qt.binding(() => keyboard.currentLayout); -- } -+ currentIndex: keyboard.currentLayout -+ onCurrentIndexChanged: keyboard.currentLayout = currentIndex - -- menu: QQC.Menu { -- id: keyboardMenu -- style: BreezeMenuStyle {} -- Instantiator { -- id: instantiator -- model: keyboard.layouts -- onObjectAdded: keyboardMenu.insertItem(index, object) -- onObjectRemoved: keyboardMenu.removeItem(object) -- delegate: QQC.MenuItem { -- text: modelData.longName -- property string shortName: modelData.shortName -- onTriggered: { -- keyboard.currentLayout = model.index -- } -- } -- } -- } -+ visible: count > 1 -+ textRole: "longName" -+ model: keyboard.layouts -+ displayText: currentText.length === 0 ? "" : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", currentText) - } -diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml -index 0d6b66e77..690c132e3 100644 ---- a/sddm-theme/Main.qml -+++ b/sddm-theme/Main.qml -@@ -6,7 +6,6 @@ - - import QtQuick 2.15 - import QtQuick.Layouts 1.15 --import QtQuick.Controls 1.6 // Don't bump it any further, this is the latest. - import QtQuick.Controls 2.15 as QQC2 - import QtGraphicalEffects 1.15 - -diff --git a/sddm-theme/SessionButton.qml b/sddm-theme/SessionButton.qml -index 6934abda7..ed6ef96c2 100644 ---- a/sddm-theme/SessionButton.qml -+++ b/sddm-theme/SessionButton.qml -@@ -5,39 +5,20 @@ - */ - - import QtQuick 2.15 --import QtQuick.Controls 1.6 as QQC // Don't bump it any further, this is the latest. - - import org.kde.plasma.core 2.0 as PlasmaCore --import org.kde.plasma.components 2.0 as PlasmaComponents // Because PC3 ToolButton can't take a menu -+import org.kde.plasma.components 3.0 as PlasmaComponents - --PlasmaComponents.ToolButton { -+PlasmaComponents.ComboBox { - id: root -- property int currentIndex: -1 - -- implicitWidth: minimumWidth -+ PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup -+ PlasmaCore.ColorScope.inherit: false - -- visible: menu.items.length > 1 -+ currentIndex: sessionModel.lastIndex - -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text || "") -- -- Component.onCompleted: { -- currentIndex = sessionModel.lastIndex -- } -- -- menu: QQC.Menu { -- id: menu -- style: BreezeMenuStyle {} -- Instantiator { -- id: instantiator -- model: sessionModel -- onObjectAdded: menu.insertItem(index, object) -- onObjectRemoved: menu.removeItem( object ) -- delegate: QQC.MenuItem { -- text: model.name -- onTriggered: { -- root.currentIndex = model.index -- } -- } -- } -- } -+ visible: count > 1 -+ model: sessionModel -+ textRole: "name" -+ displayText: currentText.length === 0 ? "" : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", currentText) - } --- -GitLab - diff --git a/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch b/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch deleted file mode 100644 index 4a02762..0000000 --- a/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b1b5877de0231f77f98475daabdb89a57351e4a2 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Sun, 6 Mar 2022 03:05:14 +0100 -Subject: [PATCH] sddm/lockscreen: Fix weird behaviour - -Only make space for the virtual keyboard when it's visible. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2058468 ---- - lookandfeel/contents/components/VirtualKeyboard_wayland.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml b/lookandfeel/contents/components/VirtualKeyboard_wayland.qml -index 42895e2d9..b472fd529 100644 ---- a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml -+++ b/lookandfeel/contents/components/VirtualKeyboard_wayland.qml -@@ -10,7 +10,7 @@ import org.kde.plasma.workspace.keyboardlayout 1.0 as Keyboards - - Item { - id: inputPanel -- readonly property bool active: Qt.inputMethod.visible -+ readonly property bool active: Keyboards.KWinVirtualKeyboard.visible - property bool activated: false - visible: Qt.inputMethod.visible - --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 4d11b3c..68a4351 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -52,10 +52,6 @@ Source10: kde Source11: startkderc Source15: fedora.desktop -# backported breeze sddm from plasma 5.24.80~pre -# lets us apply patches to fix the sddm theme -Source19: sddm-theme-5.24.80~pre.tar.gz - # breeze fedora sddm theme components # includes f25-based preview (better than breeze or nothing at least) Source20: breeze-fedora-0.2.tar.gz @@ -72,7 +68,6 @@ Source41: spice-vdagent.conf ## downstream Patches Patch100: plasma-workspace-konsole-in-contextmenu.patch -Patch101: plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html # and example, @@ -261,13 +256,7 @@ Requires: iceauth xrdb xprop Requires: kde-settings-plasma # Default look-and-feel theme -%if 0%{?fedora} -%global default_lookandfeel org.fedoraproject.fedora.desktop Requires: plasma-lookandfeel-fedora = %{version}-%{release} -%endif -%if ! 0%{?default_lookandfeel:1} -Requires: desktop-backgrounds-compat -%endif Requires: systemd @@ -468,23 +457,8 @@ BuildArch: noarch %prep -%setup -q -a 19 -a 20 - -## upstream patches - -## upstreamable patches - -## downstream patches -%patch100 -p1 -b .konsole-in-contextmenu -# XXX: This is horribly broken and needs fixes upstream -- ngompa -%if 0%{?default_lookandfeel:1} -%patch101 -p1 -b .set-fedora-default-look-and-feel -sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \ - shell/packageplugins/lookandfeel/lookandfeel.cpp startkde/startplasma.cpp -%endif -%patch105 -p1 +%autosetup -a 20 -p1 -%if 0%{?fedora} # Populate initial lookandfeel package cp -a lookandfeel lookandfeel.fedora # Overwrite settings to configure twilight mode @@ -493,7 +467,6 @@ install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop cat >> CMakeLists.txt <= 34 # Set Fedora distro vendor logo sed -i -e 's|^showlogo=.*$|showlogo=shown|g' %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf sed -i -e 's|^logo=.*$|logo=%{_datadir}/pixmaps/fedora_whitelogo.svg|g' %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf -%endif # move sddm configuration snippet to the right place mkdir -p %{buildroot}%{_prefix}/lib/sddm mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm -%if 0%{?fedora} > 30 ## customize plasma-lookandfeel-fedora defaults # from [Wallpaper] Image=Next to Image=Fedora sed -i -e 's|^Image=.*$|Image=Fedora|g' \ %{buildroot}%{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/defaults -%endif # Make kcheckpass work install -m644 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde @@ -795,13 +762,16 @@ fi %{_datadir}/xsessions/plasmax11.desktop %endif -%if 0%{?fedora} %files -n plasma-lookandfeel-fedora %{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/ -%endif %changelog +* Tue Jun 14 2022 Neal Gompa - 5.25.0-2 +- Remove broken mechanism for setting default look and feel +- Always ship Fedora look and feel theme +- Drop unneeded sddm theme snapshot and patches + * Thu Jun 09 2022 Marc Deop - 5.25.0-1 - 5.25.0 diff --git a/sources b/sources index 789ab92..18ae78c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 SHA512 (plasma-workspace-5.25.0.tar.xz) = 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8 diff --git a/sources.keep b/sources.keep index 20f7e0e..58c0216 100644 --- a/sources.keep +++ b/sources.keep @@ -1,2 +1 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 From e9569743bdc481969fc79ec0b1e9b8ba2642a1e4 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 21 Jun 2022 20:55:33 +0200 Subject: [PATCH 08/36] 5.25.1 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0ea8965..d71daaa 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /plasma-workspace-5.24.5.tar.xz /plasma-workspace-5.24.90.tar.xz /plasma-workspace-5.25.0.tar.xz +/plasma-workspace-5.25.1.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 68a4351..f9d5c8e 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.0 -Release: 2%{?dist} +Version: 5.25.1 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -767,6 +767,9 @@ fi %changelog +* Tue Jun 21 2022 Marc Deop - 5.25.1-1 +- 5.25.1 + * Tue Jun 14 2022 Neal Gompa - 5.25.0-2 - Remove broken mechanism for setting default look and feel - Always ship Fedora look and feel theme diff --git a/sources b/sources index 18ae78c..5672e18 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.0.tar.xz) = 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8 +SHA512 (plasma-workspace-5.25.1.tar.xz) = e11fd39df8fe6120f29d485729c8b2f9f37f0b37cd91afeae762973e01bf65043374ac0f94d2224266e044f81825839dc33a82fd599cc64e9ae61c6c705c40a6 From 1054a930eb0d5679fd5ead528ebce1d0f3c91683 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 28 Jun 2022 20:43:56 +0200 Subject: [PATCH 09/36] 5.25.2 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d71daaa..9e833be 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /plasma-workspace-5.24.90.tar.xz /plasma-workspace-5.25.0.tar.xz /plasma-workspace-5.25.1.tar.xz +/plasma-workspace-5.25.2.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f9d5c8e..7be36b2 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.1 +Version: 5.25.2 Release: 1%{?dist} License: GPLv2+ @@ -767,6 +767,9 @@ fi %changelog +* Tue Jun 28 2022 Marc Deop - 5.25.2-1 +- 5.25.2 + * Tue Jun 21 2022 Marc Deop - 5.25.1-1 - 5.25.1 diff --git a/sources b/sources index 5672e18..bdaaad1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.1.tar.xz) = e11fd39df8fe6120f29d485729c8b2f9f37f0b37cd91afeae762973e01bf65043374ac0f94d2224266e044f81825839dc33a82fd599cc64e9ae61c6c705c40a6 +SHA512 (plasma-workspace-5.25.2.tar.xz) = 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105 From 1f177808b45027f789892a69b7ace20cbbc97c78 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 12 Jul 2022 13:26:54 +0200 Subject: [PATCH 10/36] 5.25.3 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9e833be..eae3238 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ /plasma-workspace-5.25.0.tar.xz /plasma-workspace-5.25.1.tar.xz /plasma-workspace-5.25.2.tar.xz +/plasma-workspace-5.25.3.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 7be36b2..60bb796 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.2 +Version: 5.25.3 Release: 1%{?dist} License: GPLv2+ @@ -767,6 +767,9 @@ fi %changelog +* Tue Jul 12 2022 Marc Deop - 5.25.3-1 +- 5.25.3 + * Tue Jun 28 2022 Marc Deop - 5.25.2-1 - 5.25.2 diff --git a/sources b/sources index bdaaad1..6986171 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.2.tar.xz) = 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105 +SHA512 (plasma-workspace-5.25.3.tar.xz) = 735bfc233230f1444bfa7406b8a21b4da67e97130c4ac1465663e55b8f2726d9b12eb91d763b53053d82c82be6c5e59a020675a6b8a59eab578f3d1d36ef2f58 From 5a98a944ae1424862b6cf2a7efd9ddd57de0b821 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 12 Jul 2022 23:16:47 +0200 Subject: [PATCH 11/36] 5.25.3.1 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eae3238..3051fda 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ /plasma-workspace-5.25.1.tar.xz /plasma-workspace-5.25.2.tar.xz /plasma-workspace-5.25.3.tar.xz +/plasma-workspace-5.25.3.1.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 60bb796..f1dbb32 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.3 +Version: 5.25.3.1 Release: 1%{?dist} License: GPLv2+ @@ -767,6 +767,9 @@ fi %changelog +* Tue Jul 12 2022 Marc Deop - 5.25.3.1-1 +- 5.25.3.1 + * Tue Jul 12 2022 Marc Deop - 5.25.3-1 - 5.25.3 diff --git a/sources b/sources index 6986171..9a37ddd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.3.tar.xz) = 735bfc233230f1444bfa7406b8a21b4da67e97130c4ac1465663e55b8f2726d9b12eb91d763b53053d82c82be6c5e59a020675a6b8a59eab578f3d1d36ef2f58 +SHA512 (plasma-workspace-5.25.3.1.tar.xz) = 8bfef223174a21e9b485cebfaf738281ab42955f2bf7bf6b0d53f836d01fc7f31af8522f40fd21f1cb683345d227ee1a8f19531fcc8028a3740212a2dccfc831 From 4b303d643b1fe8ce940e5bcd5fdc3f4ab920db4d Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 12 Jul 2022 23:28:19 +0200 Subject: [PATCH 12/36] fix: resolve plasma-breeze-devel version dependency --- plasma-workspace.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f1dbb32..ac9535c 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -182,7 +182,11 @@ BuildRequires: qt5-qtbase-static BuildRequires: kuserfeedback-devel BuildRequires: plasma-wayland-protocols-devel -BuildRequires: plasma-breeze-devel >= %{version} +# Commented out and hardcoded on the next line exclusively due to a re-spin +# with an extra .1 in the version +# Revert when possible (possibly on the next plasma-workspace release) +#BuildRequires: plasma-breeze-devel >= %{version} +BuildRequires: plasma-breeze-devel >= 5.25.3 BuildRequires: chrpath BuildRequires: desktop-file-utils From af7d7497b5f443cf294a92b322f3bc8e4b7fde62 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 15:03:24 +0200 Subject: [PATCH 13/36] Rebuild (qt5) --- plasma-workspace.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index ac9535c..896362e 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -118,7 +118,7 @@ BuildRequires: kf5-prison-devel BuildRequires: qt5-qtbase-devel >= 5.15 BuildRequires: qt5-qtbase-private-devel -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} + BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qtdeclarative-devel @@ -771,6 +771,9 @@ fi %changelog +* Thu Jul 14 2022 Jan Grulich - 5.25.3.1-2 +- Rebuild (qt5) + * Tue Jul 12 2022 Marc Deop - 5.25.3.1-1 - 5.25.3.1 From 229e09386f7fa682832aad1eb22509f3178617a1 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 20 Jul 2022 09:54:36 +0200 Subject: [PATCH 14/36] Disable toplevel fixed positions on Wayland --- ...-toplevel-fixed-positions-on-wayland.patch | 69 +++++++++++++++++++ plasma-workspace.spec | 7 +- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 disable-toplevel-fixed-positions-on-wayland.patch diff --git a/disable-toplevel-fixed-positions-on-wayland.patch b/disable-toplevel-fixed-positions-on-wayland.patch new file mode 100644 index 0000000..9de628e --- /dev/null +++ b/disable-toplevel-fixed-positions-on-wayland.patch @@ -0,0 +1,69 @@ +From 1be046edd455969b74417ded6871d25eba8a1112 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Mon, 27 Jun 2022 17:12:09 +0200 +Subject: [PATCH] Disable toplevel fixed positions on Wayland + +Given that the wayland protocol does not have window positions a recent +change to Qt development branch avoids having a mismatch of positions +and tells client code the window is at the topleft of the screen. This +fixes multiple bugs. + +Unfortuantely this breaks a few usages within plasma where a +side-channel sends that absolute positional information over a bespoke +protocol. Currently we proxy this all through QWindow geometry where the +new Qt behaviour will throw is askew. + +Whilst our longterm plans are to find future options away from the +plasmashell protocol we may as well have our Qt6 +build work given the patch is trivial and harmless. + +It also allows for potential backporting if our software is +already secured against issues. +--- + krunner/main.cpp | 2 ++ + shell/main.cpp | 3 +++ + 2 files changed, 5 insertions(+) + +diff --git a/krunner/main.cpp b/krunner/main.cpp +index a05402a01..f19382cad 100644 +--- a/krunner/main.cpp ++++ b/krunner/main.cpp +@@ -34,6 +34,7 @@ int main(int argc, char **argv) + QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); + } + ++ qputenv("QT_WAYLAND_DISABLE_FIXED_POSITIONS", {}); + const bool qpaVariable = qEnvironmentVariableIsSet("QT_QPA_PLATFORM"); + KWorkSpace::detectPlatform(argc, argv); + QQuickWindow::setDefaultAlphaBuffer(true); +@@ -42,6 +43,7 @@ int main(int argc, char **argv) + // don't leak the env variable to processes we start + qunsetenv("QT_QPA_PLATFORM"); + } ++ qunsetenv("QT_WAYLAND_DISABLE_FIXED_POSITIONS"); + KLocalizedString::setApplicationDomain("krunner"); + + // TODO: Make it a QGuiApplication once we don't depend on KDELibs4Support +diff --git a/shell/main.cpp b/shell/main.cpp +index 26e4ecede..147483df4 100644 +--- a/shell/main.cpp ++++ b/shell/main.cpp +@@ -79,6 +79,7 @@ int main(int argc, char *argv[]) + + oldCategoryFilter = QLoggingCategory::installFilter(filterConnectionSyntaxWarning); + ++ qputenv("QT_WAYLAND_DISABLE_FIXED_POSITIONS", {}); + const bool qpaVariable = qEnvironmentVariableIsSet("QT_QPA_PLATFORM"); + KWorkSpace::detectPlatform(argc, argv); + QApplication app(argc, argv); +@@ -86,6 +87,8 @@ int main(int argc, char *argv[]) + // don't leak the env variable to processes we start + qunsetenv("QT_QPA_PLATFORM"); + } ++ qunsetenv("QT_WAYLAND_DISABLE_FIXED_POSITIONS"); ++ + KLocalizedString::setApplicationDomain("plasmashell"); + + // The executable's path is added to the library/plugin paths. +-- +GitLab diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 896362e..c0418e4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 2%{?dist} +Release: 3%{?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/-/merge_requests/1879 +Patch50: disable-toplevel-fixed-positions-on-wayland.patch ## upstreamable Patches @@ -771,6 +773,9 @@ fi %changelog +* Wed Jul 20 2022 Jan Grulich - 5.25.3.1-3 +- Disable toplevel fixed positions on Wayland + * Thu Jul 14 2022 Jan Grulich - 5.25.3.1-2 - Rebuild (qt5) From 5944a00e98daa605f4991d0b60c828c6e010c3a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:58:51 +0000 Subject: [PATCH 15/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 c0418e4..50b9360 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -773,6 +773,9 @@ fi %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 5.25.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 20 2022 Jan Grulich - 5.25.3.1-3 - Disable toplevel fixed positions on Wayland From 651498753881aa4548ebdf0c365c6803122e4c04 Mon Sep 17 00:00:00 2001 From: Yaroslav Sidlovsky Date: Sun, 24 Jul 2022 19:11:46 +0300 Subject: [PATCH 16/36] Added patch to fix #457019 --- ...e-to-remove-manually-added-wallpaper.patch | 38 +++++++++++++++++++ plasma-workspace.spec | 8 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch diff --git a/plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch b/plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch new file mode 100644 index 0000000..7b92eda --- /dev/null +++ b/plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch @@ -0,0 +1,38 @@ +From d6d47393bab32dc60b43e0eeac16c035000a0358 Mon Sep 17 00:00:00 2001 +From: Eugene Popov +Date: Sun, 24 Jul 2022 00:18:44 +0000 +Subject: [PATCH] [FIX] Unable to remove manually added wallpaper + +It's not necessary to assign m_removableWallpapers asynchronously, because the value assigned to it doesn't depend on the result of that asynch function. + +!!! This MR is for the Plasma/5.25 branch only and it SHOULD NOT be cherry-picket into the master branch. + +BUG: 457019 +--- + wallpapers/image/plugin/backgroundlistmodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wallpapers/image/plugin/backgroundlistmodel.cpp b/wallpapers/image/plugin/backgroundlistmodel.cpp +index 8c5630712..0b12470a5 100644 +--- a/wallpapers/image/plugin/backgroundlistmodel.cpp ++++ b/wallpapers/image/plugin/backgroundlistmodel.cpp +@@ -107,6 +107,8 @@ void BackgroundListModel::reload(const QStringList &selected) + return; + } + ++ m_removableWallpapers = QSet(selected.constBegin(), selected.constEnd()); ++ + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("wallpapers/"), QStandardPaths::LocateDirectory); + + BackgroundFinder *finder = new BackgroundFinder(m_wallpaper.data(), dirs); +@@ -117,7 +119,6 @@ void BackgroundListModel::reload(const QStringList &selected) + } + + processPaths(selected + wallpapersFound); +- m_removableWallpapers = QSet(selected.constBegin(), selected.constEnd()); + }); + m_findToken = token; + finder->start(); +-- +GitLab + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 50b9360..2edb9e4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -65,6 +65,9 @@ Source41: spice-vdagent.conf ## upstream Patches (master branch) # https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1879 Patch50: disable-toplevel-fixed-positions-on-wayland.patch +# Fix for 457019: Can't remove manually added wallpaper +# (https://bugs.kde.org/show_bug.cgi?id=457019) +Patch60: plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch ## upstreamable Patches @@ -773,6 +776,9 @@ fi %changelog +* Sun Jul 24 2022 Yaroslav Sidlovsky - 5.25.3.1-5 +- Added patch to fix #457019 + * Fri Jul 22 2022 Fedora Release Engineering - 5.25.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From ea17bd91860d6ecd857aeffa6a293cb73a33e98e Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 25 Jul 2022 10:49:47 +0200 Subject: [PATCH 17/36] Rebuild (qt5) --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 2edb9e4..cac6415 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -776,6 +776,9 @@ fi %changelog +* Mon Jul 25 2022 Jan Grulich - 5.25.3.1-6 +- Rebuild (qt5) + * Sun Jul 24 2022 Yaroslav Sidlovsky - 5.25.3.1-5 - Added patch to fix #457019 From 38853ee1655b8e53ccc9e5d62571f9a9ca84214a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 27 Jul 2022 09:34:55 -0700 Subject: [PATCH 18/36] Add BuildRequires libicu-devel Adding libicu-devel enables this code https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1725 --- plasma-workspace.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index cac6415..37d6664 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -120,6 +120,7 @@ BuildRequires: libqalculate-devel %global kf5_pim 1 BuildRequires: kf5-kholidays-devel BuildRequires: kf5-prison-devel +BuildRequires: libicu-devel BuildRequires: qt5-qtbase-devel >= 5.15 BuildRequires: qt5-qtbase-private-devel @@ -776,6 +777,10 @@ fi %changelog +* Wed Jul 27 2022 Troy Dawson - 5.25.3.1-7 +- Add BuildRequires libicu-devel - enables this code + https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1725 + * Mon Jul 25 2022 Jan Grulich - 5.25.3.1-6 - Rebuild (qt5) From 03465c4326bd181ae029baae6f01db975aabc93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 1 Aug 2022 15:08:19 +0200 Subject: [PATCH 19/36] Rebuilt for ICU 71.1 --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 37d6664..a04d831 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.3.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -777,6 +777,9 @@ fi %changelog +* Mon Aug 01 2022 Frantisek Zatloukal - 5.25.3.1-8 +- Rebuilt for ICU 71.1 + * Wed Jul 27 2022 Troy Dawson - 5.25.3.1-7 - Add BuildRequires libicu-devel - enables this code https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1725 From a35e4c380a1d61cc3b6a8910812f07653ca6a5e2 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Wed, 3 Aug 2022 19:24:44 +0930 Subject: [PATCH 20/36] Update to 5.25.4 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3051fda..b9d37ad 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /plasma-workspace-5.25.2.tar.xz /plasma-workspace-5.25.3.tar.xz /plasma-workspace-5.25.3.1.tar.xz +/plasma-workspace-5.25.4.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index a04d831..f0b98aa 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.3.1 -Release: 8%{?dist} +Version: 5.25.4 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -777,6 +777,9 @@ fi %changelog +* Wed Aug 03 2022 Justin Zobel - 5.25.4-1 +- Update to 5.25.4 + * Mon Aug 01 2022 Frantisek Zatloukal - 5.25.3.1-8 - Rebuilt for ICU 71.1 diff --git a/sources b/sources index 9a37ddd..17084fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (plasma-workspace-5.25.3.1.tar.xz) = 8bfef223174a21e9b485cebfaf738281ab42955f2bf7bf6b0d53f836d01fc7f31af8522f40fd21f1cb683345d227ee1a8f19531fcc8028a3740212a2dccfc831 +SHA512 (plasma-workspace-5.25.4.tar.xz) = 4f06eedcae47d3c03e0d604a95242d13284bf64891d1c982884a482583ff81ba60202b60e63cc46c3f7e35b98e2910bf69e451fe1aedb64af387add8bcaf4e87 From e7e816c03c79366d0657962eeb967ec84b887c95 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Wed, 3 Aug 2022 21:56:03 +0930 Subject: [PATCH 21/36] Remove old patch as per https://pagure.io/fedora-kde/SIG/issue/230#comment-809272 and removing old version from sources file --- plasma-workspace.spec | 2 -- sources | 1 - 2 files changed, 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f0b98aa..d13506f 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -63,8 +63,6 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## upstream Patches (master branch) -# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1879 -Patch50: disable-toplevel-fixed-positions-on-wayland.patch # Fix for 457019: Can't remove manually added wallpaper # (https://bugs.kde.org/show_bug.cgi?id=457019) Patch60: plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch diff --git a/sources b/sources index 17084fd..2259b01 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.3.1.tar.xz) = 8bfef223174a21e9b485cebfaf738281ab42955f2bf7bf6b0d53f836d01fc7f31af8522f40fd21f1cb683345d227ee1a8f19531fcc8028a3740212a2dccfc831 SHA512 (plasma-workspace-5.25.4.tar.xz) = 4f06eedcae47d3c03e0d604a95242d13284bf64891d1c982884a482583ff81ba60202b60e63cc46c3f7e35b98e2910bf69e451fe1aedb64af387add8bcaf4e87 From a0c94d5b23c19486d7baf4519a696245d52c89ad Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 4 Aug 2022 09:31:43 +0930 Subject: [PATCH 22/36] Remove deprecated patch --- plasma-workspace.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d13506f..747c273 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -63,9 +63,6 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## upstream Patches (master branch) -# Fix for 457019: Can't remove manually added wallpaper -# (https://bugs.kde.org/show_bug.cgi?id=457019) -Patch60: plasma-workspace-5.25.3.1-fix-unable-to-remove-manually-added-wallpaper.patch ## upstreamable Patches From 4a9e66fd5bf0e44889e10984677a666c33a92fac Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 26 Aug 2022 14:56:50 -0700 Subject: [PATCH 23/36] Disable sddm-on-wayland for F37 (#2110801) --- plasma-workspace.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 747c273..707e07f 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -12,7 +12,7 @@ %endif # Control sddm wayland by default -%if (0%{?fedora} && 0%{?fedora} < 37) || (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.25.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -772,6 +772,9 @@ fi %changelog +* Fri Aug 26 2022 Adam Williamson - 5.25.4-2 +- Disable sddm-on-wayland for F37 (#2110801) + * Wed Aug 03 2022 Justin Zobel - 5.25.4-1 - Update to 5.25.4 From 3881512c902696862f3286fd40c0a084ce3f276f Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Wed, 7 Sep 2022 10:22:41 +0200 Subject: [PATCH 24/36] 5.25.5 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b9d37ad..d80b1dc 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /plasma-workspace-5.25.3.tar.xz /plasma-workspace-5.25.3.1.tar.xz /plasma-workspace-5.25.4.tar.xz +/plasma-workspace-5.25.5.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 707e07f..9da088f 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.4 -Release: 2%{?dist} +Version: 5.25.5 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -772,6 +772,9 @@ fi %changelog +* Wed Sep 07 2022 Marc Deop - 5.25.5-1 +- 5.25.5 + * Fri Aug 26 2022 Adam Williamson - 5.25.4-2 - Disable sddm-on-wayland for F37 (#2110801) diff --git a/sources b/sources index 2259b01..6a3142b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.4.tar.xz) = 4f06eedcae47d3c03e0d604a95242d13284bf64891d1c982884a482583ff81ba60202b60e63cc46c3f7e35b98e2910bf69e451fe1aedb64af387add8bcaf4e87 +SHA512 (plasma-workspace-5.25.5.tar.xz) = 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb From 741a3bc6b99ec2d5922ba21c479638a39f16942b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Mon, 19 Sep 2022 08:35:28 +0200 Subject: [PATCH 25/36] 5.25.90 --- .gitignore | 1 + ...-workspace-5.21.90-folderview_layout.patch | 7 +- plasma-workspace-konsole-in-contextmenu.patch | 78 ------------------- plasma-workspace.spec | 25 +++--- sources | 3 +- 5 files changed, 21 insertions(+), 93 deletions(-) delete mode 100644 plasma-workspace-konsole-in-contextmenu.patch diff --git a/.gitignore b/.gitignore index d80b1dc..b13d53d 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /plasma-workspace-5.25.3.1.tar.xz /plasma-workspace-5.25.4.tar.xz /plasma-workspace-5.25.5.tar.xz +/plasma-workspace-5.25.90.tar.xz diff --git a/plasma-workspace-5.21.90-folderview_layout.patch b/plasma-workspace-5.21.90-folderview_layout.patch index 3e48e74..70531a7 100644 --- a/plasma-workspace-5.21.90-folderview_layout.patch +++ b/plasma-workspace-5.21.90-folderview_layout.patch @@ -1,6 +1,7 @@ -diff -up plasma-workspace-5.21.90/lookandfeel/contents/defaults.folderview_layout plasma-workspace-5.21.90/lookandfeel/contents/defaults ---- plasma-workspace-5.21.90/lookandfeel/contents/defaults.folderview_layout 2021-05-14 16:15:40.647354536 -0500 -+++ plasma-workspace-5.21.90/lookandfeel/contents/defaults 2021-05-14 16:16:21.580720452 -0500 +diff --git a/lookandfeel/org.kde.breeze/contents/defaults b/lookandfeel/org.kde.breeze/contents/defaults +index d8df939b3..b050a7a87 100644 +--- a/lookandfeel/org.kde.breeze/contents/defaults ++++ b/lookandfeel/org.kde.breeze/contents/defaults @@ -27,3 +27,7 @@ library=org.kde.breeze [KSplash] diff --git a/plasma-workspace-konsole-in-contextmenu.patch b/plasma-workspace-konsole-in-contextmenu.patch deleted file mode 100644 index e878c7e..0000000 --- a/plasma-workspace-konsole-in-contextmenu.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -Nurr plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.cpp plasma-workspace-5.24.90/containmentactions/contextmenu/menu.cpp ---- plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.cpp 2022-05-21 16:42:05.980661922 +0200 -+++ plasma-workspace-5.24.90/containmentactions/contextmenu/menu.cpp 2022-05-21 16:47:43.503606798 +0200 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -29,6 +30,7 @@ - - ContextMenu::ContextMenu(QObject *parent, const QVariantList &args) - : Plasma::ContainmentActions(parent, args) -+ , m_runKonsoleAction(nullptr) - , m_session(new SessionManagement(this)) - { - } -@@ -61,6 +63,7 @@ - << QStringLiteral("configure shortcuts") - << QStringLiteral("_sep1") - << QStringLiteral("_context") -+ << QStringLiteral("_run_konsole") - << QStringLiteral("_run_command") - << QStringLiteral("add widgets") - << QStringLiteral("_add panel") -@@ -97,6 +100,10 @@ - m_runCommandAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("krunner.desktop"), QStringLiteral("_launch")).value(0)); - connect(m_runCommandAction, &QAction::triggered, this, &ContextMenu::runCommand); - -+ m_runKonsoleAction = new QAction(i18n("Konsole"), this); -+ m_runKonsoleAction->setIcon(QIcon::fromTheme("utilities-terminal")); -+ connect(m_runKonsoleAction, &QAction::triggered, this, &ContextMenu::runKonsole); -+ - m_lockScreenAction = new QAction(i18nc("plasma_containmentactions_contextmenu", "Lock Screen"), this); - m_lockScreenAction->setIcon(QIcon::fromTheme(QStringLiteral("system-lock-screen"))); - m_lockScreenAction->setShortcut(KGlobalAccel::self()->globalShortcut(QStringLiteral("ksmserver"), QStringLiteral("Lock Session")).value(0)); -@@ -179,6 +186,8 @@ - if (KAuthorized::authorizeAction(QStringLiteral("run_command")) && KAuthorized::authorize(QStringLiteral("run_command"))) { - return m_runCommandAction; - } -+ } else if (name == QLatin1String("_run_konsole")) { -+ return m_runKonsoleAction; - } else if (name == QLatin1String("_lock_screen")) { - if (KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) { - return m_lockScreenAction; -@@ -212,6 +221,13 @@ - return nullptr; - } - -+void ContextMenu::runKonsole() -+{ -+ auto job = new KTerminalLauncherJob(QString()); -+ job->setWorkingDirectory(QDir::homePath()); -+ job->start(); -+} -+ - void ContextMenu::runCommand() - { - if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) { -diff -Nurr plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.h plasma-workspace-5.24.90/containmentactions/contextmenu/menu.h ---- plasma-workspace-5.24.90-new/containmentactions/contextmenu/menu.h 2022-05-21 16:42:05.980661922 +0200 -+++ plasma-workspace-5.24.90/containmentactions/contextmenu/menu.h 2022-05-21 16:48:39.122597718 +0200 -@@ -29,11 +29,13 @@ - - public Q_SLOTS: - void runCommand(); -+ void runKonsole(); - void startLogout(); - void configureDisplays(); - - private: - QAction *m_runCommandAction = nullptr; -+ QAction *m_runKonsoleAction = nullptr; - QAction *m_lockScreenAction = nullptr; - QAction *m_logoutAction = nullptr; - QAction *m_configureDisplaysAction = nullptr; diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 9da088f..ccffc9b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -2,7 +2,7 @@ # repo or arch where there's no package that would provide plasmashell #global bootstrap 1 -%global kf5_version_min 5.91.0 +%global kf5_version_min 5.98.0 # Control wayland by default %if (0%{?rhel} && 0%{?rhel} < 9) @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.5 +Version: 5.25.90 Release: 1%{?dist} License: GPLv2+ @@ -67,7 +67,6 @@ Source41: spice-vdagent.conf ## upstreamable Patches ## downstream Patches -Patch100: plasma-workspace-konsole-in-contextmenu.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html # and example, @@ -126,6 +125,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-qtwayland-devel BuildRequires: phonon-qt5-devel +BuildRequires: polkit-qt5-1-devel BuildRequires: kf5-rpm-macros >= %{kf5_version_min} BuildRequires: systemd-rpm-macros @@ -144,7 +144,6 @@ BuildRequires: kf5-kguiaddons-devel >= %{kf5_version_min} BuildRequires: kf5-kidletime-devel >= %{kf5_version_min} BuildRequires: kf5-kinit-devel >= %{kf5_version_min} BuildRequires: kf5-kitemmodels-devel >= %{kf5_version_min} -# konsole patch BuildRequires: kf5-kio-devel >= %{kf5_version_min} BuildRequires: kf5-kjsembed-devel >= %{kf5_version_min} BuildRequires: kf5-knewstuff-devel >= %{kf5_version_min} @@ -467,7 +466,7 @@ BuildArch: noarch # Populate initial lookandfeel package cp -a lookandfeel lookandfeel.fedora # Overwrite settings to configure twilight mode -cp -a lookandfeel.twilight/* lookandfeel.fedora +cp -a lookandfeel/org.kde.breezetwilight/* lookandfeel.fedora install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop cat >> CMakeLists.txt < - 5.25.90-1 +- 5.25.90 + * Wed Sep 07 2022 Marc Deop - 5.25.5-1 - 5.25.5 diff --git a/sources b/sources index 6a3142b..86bf181 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.5.tar.xz) = 0c6cf5104b584b34a8bcb45d57069fed3b25e871fccf1bfefd47d8fc1b595867c1c4f0fcfcc0e07847534e1e77ce8ed1f3be1ac6cb7eea8669a9c7649c8466cb +SHA512 (plasma-workspace-5.25.90.tar.xz) = 90d0a6410a22b4b25682536e80bb7d687f013a51fca1b474c7611fc3348e62c9522c5f1ef73c30a97747a4d5781eed95716d3ad61f12eb457ea74606bc565579 From 547cb587198b3bcf49ad565c8a1bd9d9d514adf5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 19 Sep 2022 08:11:54 -0400 Subject: [PATCH 26/36] Fix installation of Fedora Breeze look and feel package --- plasma-workspace.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index ccffc9b..fef5548 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -464,12 +464,12 @@ BuildArch: noarch %autosetup -a 20 -p1 # Populate initial lookandfeel package -cp -a lookandfeel lookandfeel.fedora +cp -a lookandfeel/org.kde.breeze lookandfeel/org.fedoraproject.fedora # Overwrite settings to configure twilight mode -cp -a lookandfeel/org.kde.breezetwilight/* lookandfeel.fedora -install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop -cat >> CMakeLists.txt <> lookandfeel/CMakeLists.txt < Date: Wed, 21 Sep 2022 17:14:57 +0200 Subject: [PATCH 27/36] fix(sources): re-add breeze-fedora-02.tar.gz --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 86bf181..3ceacc7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (plasma-workspace-5.25.90.tar.xz) = 90d0a6410a22b4b25682536e80bb7d687f013a51fca1b474c7611fc3348e62c9522c5f1ef73c30a97747a4d5781eed95716d3ad61f12eb457ea74606bc565579 From fb8ce443c9344174479d864465e85efb3c84fe1f Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 25 Sep 2022 16:52:33 -0400 Subject: [PATCH 28/36] Add Fedora patches to change default desktop context menu configuration - Enable "Open Terminal" action - Enable "Lock" and "Logout" actions --- ...ce-5.25.90-enable-lock-logout-action.patch | 29 +++++++++++++++++++ ...-5.25.90-enable-open-terminal-action.patch | 28 ++++++++++++++++++ plasma-workspace.spec | 11 ++++++- 3 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 plasma-workspace-5.25.90-enable-lock-logout-action.patch create mode 100644 plasma-workspace-5.25.90-enable-open-terminal-action.patch diff --git a/plasma-workspace-5.25.90-enable-lock-logout-action.patch b/plasma-workspace-5.25.90-enable-lock-logout-action.patch new file mode 100644 index 0000000..86dc32c --- /dev/null +++ b/plasma-workspace-5.25.90-enable-lock-logout-action.patch @@ -0,0 +1,29 @@ +From 6f6a8771afdaa27208d3aea63525f62cafe787cf Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sun, 25 Sep 2022 16:46:47 -0400 +Subject: [PATCH] containmentactions/contextmenu: Enable lock/logout + actions by default + +Fedora users expect these items to exist in the desktop context menu +by default unless they've been manually disabled or removed via the +Kiosk mode. +--- + containmentactions/contextmenu/menu.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp +index 4392d50f5..80769e615 100644 +--- a/containmentactions/contextmenu/menu.cpp ++++ b/containmentactions/contextmenu/menu.cpp +@@ -78,8 +78,6 @@ void ContextMenu::restore(const KConfigGroup &config) + disabled.insert(QStringLiteral("configure shortcuts")); + disabled.insert(QStringLiteral("_run_command")); + disabled.insert(QStringLiteral("run associated application")); +- disabled.insert(QStringLiteral("_lock_screen")); +- disabled.insert(QStringLiteral("_logout")); + } + // clang-format on + +-- +2.36.1 + diff --git a/plasma-workspace-5.25.90-enable-open-terminal-action.patch b/plasma-workspace-5.25.90-enable-open-terminal-action.patch new file mode 100644 index 0000000..1c0fbb1 --- /dev/null +++ b/plasma-workspace-5.25.90-enable-open-terminal-action.patch @@ -0,0 +1,28 @@ +From 9788427b7f4f8802ccc2d4de7fad02b19488c2c8 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sun, 25 Sep 2022 16:45:07 -0400 +Subject: [PATCH] containmentactions/contextmenu: Enable "Open Terminal" by + default + +Fedora users expect this item to exist in the desktop context menu +by default unless it has been manually disabled or removed via the +Kiosk mode. +--- + containmentactions/contextmenu/menu.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp +index 6bad29751..4392d50f5 100644 +--- a/containmentactions/contextmenu/menu.cpp ++++ b/containmentactions/contextmenu/menu.cpp +@@ -76,7 +76,6 @@ void ContextMenu::restore(const KConfigGroup &config) + << QStringLiteral("_sep3") + << QStringLiteral("_wallpaper"); + disabled.insert(QStringLiteral("configure shortcuts")); +- disabled.insert(QStringLiteral("_open_terminal")); + disabled.insert(QStringLiteral("_run_command")); + disabled.insert(QStringLiteral("run associated application")); + disabled.insert(QStringLiteral("_lock_screen")); +-- +2.36.1 + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index fef5548..3778421 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -72,6 +72,10 @@ Source41: spice-vdagent.conf # and example, # https://github.com/notmart/artwork-lnf-netrunner-core/blob/master/usr/share/plasma/look-and-feel/org.kde.netrunner-core.desktop/contents/defaults Patch105: plasma-workspace-5.21.90-folderview_layout.patch +# default to enable open terminal action +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 # udev BuildRequires: zlib-devel @@ -774,6 +778,11 @@ fi %changelog +* Sun Sep 25 2022 Neal Gompa - 5.25.90-2 +- Add Fedora patches to change default desktop context menu configuration + + Enable "Open Terminal" action + + Enable "Lock" and "Logout" actions + * Sat Sep 17 2022 Marc Deop - 5.25.90-1 - 5.25.90 From 0bf8487df701d9a17da16553296e0fd5f0564fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Thu, 6 Oct 2022 16:04:05 +0200 Subject: [PATCH 29/36] 5.26.0 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b13d53d..45fbcc9 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /plasma-workspace-5.25.4.tar.xz /plasma-workspace-5.25.5.tar.xz /plasma-workspace-5.25.90.tar.xz +/plasma-workspace-5.26.0.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 3778421..b649fa0 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.25.90 -Release: 2%{?dist} +Version: 5.26.0 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -778,6 +778,9 @@ fi %changelog +* Thu Oct 06 2022 Marc Deop - 5.26.0-1 +- 5.26.0 + * Sun Sep 25 2022 Neal Gompa - 5.25.90-2 - Add Fedora patches to change default desktop context menu configuration + Enable "Open Terminal" action diff --git a/sources b/sources index 3ceacc7..41fa05d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.25.90.tar.xz) = 90d0a6410a22b4b25682536e80bb7d687f013a51fca1b474c7611fc3348e62c9522c5f1ef73c30a97747a4d5781eed95716d3ad61f12eb457ea74606bc565579 +SHA512 (plasma-workspace-5.26.0.tar.xz) = cd727a5ea8b951472869265ec9cbf57fc222bbc1a2656516e3738f326f5276407c04382a39fb3c63e5619041a0d9e8e7a1064c6d6d3ce5e2c5a60ed6f002c4da From ffaf714069a16f0e29ca5c99ea091d2773903a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 18 Oct 2022 16:20:24 +0200 Subject: [PATCH 30/36] 5.26.1 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45fbcc9..853ae7a 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /plasma-workspace-5.25.5.tar.xz /plasma-workspace-5.25.90.tar.xz /plasma-workspace-5.26.0.tar.xz +/plasma-workspace-5.26.1.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b649fa0..b9338c1 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.26.0 +Version: 5.26.1 Release: 1%{?dist} License: GPLv2+ @@ -778,6 +778,9 @@ fi %changelog +* Tue Oct 18 2022 Marc Deop - 5.26.1-1 +- 5.26.1 + * Thu Oct 06 2022 Marc Deop - 5.26.0-1 - 5.26.0 diff --git a/sources b/sources index 41fa05d..9520205 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.26.0.tar.xz) = cd727a5ea8b951472869265ec9cbf57fc222bbc1a2656516e3738f326f5276407c04382a39fb3c63e5619041a0d9e8e7a1064c6d6d3ce5e2c5a60ed6f002c4da +SHA512 (plasma-workspace-5.26.1.tar.xz) = 1b6db65fecaad9b0b996ba3e13432dba67b3f8cf727fb5079902728db6946ea6a1e2d2146e34a5fcc89f993867987ac7b2d6166390114e7d6b179d85a1dd46d1 From 12180aef990241b42370cc250943ae3bb23a7304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 26 Oct 2022 14:58:02 +0200 Subject: [PATCH 31/36] feat: 5.26.2 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 853ae7a..c957cd0 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /plasma-workspace-5.25.90.tar.xz /plasma-workspace-5.26.0.tar.xz /plasma-workspace-5.26.1.tar.xz +/plasma-workspace-5.26.2.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index b9338c1..04268af 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.26.1 +Version: 5.26.2 Release: 1%{?dist} License: GPLv2+ @@ -778,6 +778,9 @@ fi %changelog +* Wed Oct 26 2022 Marc Deop - 5.26.2-1 +- 5.26.2 + * Tue Oct 18 2022 Marc Deop - 5.26.1-1 - 5.26.1 diff --git a/sources b/sources index 9520205..f169a44 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.26.1.tar.xz) = 1b6db65fecaad9b0b996ba3e13432dba67b3f8cf727fb5079902728db6946ea6a1e2d2146e34a5fcc89f993867987ac7b2d6166390114e7d6b179d85a1dd46d1 +SHA512 (plasma-workspace-5.26.2.tar.xz) = 6f39bfc1085bd05e050bf5cbc013d2382e1d2fa1171618caff557124a5895f0d84d8d8de56bba1db561c224ce2c24acfcd763309254942d8ae6e04d3630712ae From d4af96038fb9ec4dbf625cce39263b9553010a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 5 Nov 2022 12:23:08 +0100 Subject: [PATCH 32/36] feat: require kpipewire --- plasma-workspace.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 04268af..60039c6 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.26.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -281,6 +281,10 @@ Requires: maliit-keyboard Requires: (uresourced if systemd-oomd-defaults) %endif +# needed for task manager thumbnails under wayland and for things like +# screenshare portal +Requires: kpipewire + # Require any plasmashell (plasma-desktop provides plasmashell(desktop)) %if 0%{?bootstrap} Provides: plasmashell = %{version} @@ -778,6 +782,9 @@ fi %changelog +* Sat Nov 05 2022 Marc Deop marcdeop@fedoraproject.org - 5.26.2-2 +- Require kpipewire + * Wed Oct 26 2022 Marc Deop - 5.26.2-1 - 5.26.2 From b4568b8481f2c7eb831c7acfb5f2ff56b296cbde Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 8 Nov 2022 19:26:57 +0100 Subject: [PATCH 33/36] fix: add BuildRequires for kpipewire-devel --- plasma-workspace.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 60039c6..e5fe679 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.26.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -283,7 +283,7 @@ Requires: (uresourced if systemd-oomd-defaults) # needed for task manager thumbnails under wayland and for things like # screenshare portal -Requires: kpipewire +BuildRequires: kpipewire-devel # Require any plasmashell (plasma-desktop provides plasmashell(desktop)) %if 0%{?bootstrap} @@ -782,6 +782,9 @@ fi %changelog +* Mon Nov 07 2022 Marc Deop marcdeop@fedoraproject.org - 5.26.2-3 +- BuildRequires for kpipewire-devel + * Sat Nov 05 2022 Marc Deop marcdeop@fedoraproject.org - 5.26.2-2 - Require kpipewire From 3f185b6c68844501cea3705e8635906882e0f245 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Wed, 9 Nov 2022 16:48:39 +0100 Subject: [PATCH 34/36] 5.26.3 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c957cd0..aa527fd 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /plasma-workspace-5.26.0.tar.xz /plasma-workspace-5.26.1.tar.xz /plasma-workspace-5.26.2.tar.xz +/plasma-workspace-5.26.3.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index e5fe679..7a1b0bd 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.26.2 -Release: 3%{?dist} +Version: 5.26.3 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -782,6 +782,9 @@ fi %changelog +* Wed Nov 09 2022 Marc Deop - 5.26.3-1 +- 5.26.3 + * Mon Nov 07 2022 Marc Deop marcdeop@fedoraproject.org - 5.26.2-3 - BuildRequires for kpipewire-devel diff --git a/sources b/sources index f169a44..0f4adea 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.26.2.tar.xz) = 6f39bfc1085bd05e050bf5cbc013d2382e1d2fa1171618caff557124a5895f0d84d8d8de56bba1db561c224ce2c24acfcd763309254942d8ae6e04d3630712ae +SHA512 (plasma-workspace-5.26.3.tar.xz) = a5cba6b64e697cdf6bad07862aa1898bcadf7251cab019bbab3cfb6a5156cd9fdf4c79d5998e55336034f9b1295bfbb7fae17394b6f34a6a5bcdf0dae010c8fa From 53bb1589782b566004ed83c5279ca4d7c642bd9a Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Thu, 10 Nov 2022 10:34:59 +0100 Subject: [PATCH 35/36] fix: add back breeze-fedora to sources file --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 0f4adea..5f45c50 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (plasma-workspace-5.26.3.tar.xz) = a5cba6b64e697cdf6bad07862aa1898bcadf7251cab019bbab3cfb6a5156cd9fdf4c79d5998e55336034f9b1295bfbb7fae17394b6f34a6a5bcdf0dae010c8fa From 8fb34b62f333dfca727e82ae1765e3c146642c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 29 Nov 2022 19:58:11 +0100 Subject: [PATCH 36/36] 5.26.4 --- .gitignore | 1 + plasma-workspace.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aa527fd..5486e92 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /plasma-workspace-5.26.1.tar.xz /plasma-workspace-5.26.2.tar.xz /plasma-workspace-5.26.3.tar.xz +/plasma-workspace-5.26.4.1.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 7a1b0bd..5c911a8 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,7 +27,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.26.3 +Version: 5.26.4.1 Release: 1%{?dist} License: GPLv2+ @@ -782,6 +782,12 @@ fi %changelog +* Tue Nov 29 2022 Marc Deop - 5.26.4.1-1 +- 5.26.4.1 + +* Tue Nov 29 2022 Marc Deop - 5.26.4-1 +- 5.26.4 + * Wed Nov 09 2022 Marc Deop - 5.26.3-1 - 5.26.3 diff --git a/sources b/sources index 5f45c50..b2573a4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (plasma-workspace-5.26.3.tar.xz) = a5cba6b64e697cdf6bad07862aa1898bcadf7251cab019bbab3cfb6a5156cd9fdf4c79d5998e55336034f9b1295bfbb7fae17394b6f34a6a5bcdf0dae010c8fa +SHA512 (plasma-workspace-5.26.4.1.tar.xz) = d4cef07da2802711265e04b1e5ebe284c59ab507e306041e290fd91687179141e42be678a4cd6473b59edfaefcd3edf603ae5cab1f7e85508f6e3d1abaa76784