From 9ecd08d62add5ab62f25272de387f7aa1acb6781 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Thu, 13 Jan 2022 17:25:47 +0100 Subject: [PATCH 01/29] 5.23.90 --- .gitignore | 1 + plasma-workspace.spec | 23 ++++++++++++++++------- sources | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3c235af..3683bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /plasma-workspace-5.23.3.tar.xz /plasma-workspace-5.23.4.tar.xz /plasma-workspace-5.23.5.tar.xz +/plasma-workspace-5.23.90.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 7d1485b..59fbc7b 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -20,7 +20,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.23.5 +Version: 5.23.90 Release: 1%{?dist} License: GPLv2+ @@ -530,7 +530,6 @@ cat *.lang | sort | uniq -u > %{name}.lang %check -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/plasma-windowed.desktop desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,plasmashell,systemmonitor}.desktop @@ -567,6 +566,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_libexecdir}/plasma-changeicons %{_libexecdir}/plasma-dbus-run-session-if-needed %{_kf5_datadir}/ksplash/ +%{_kf5_datadir}/plasma/avatars/ %{_kf5_datadir}/plasma/plasmoids/ %{_kf5_datadir}/plasma/services/ %{_kf5_datadir}/plasma/wallpapers/ @@ -590,9 +590,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_datadir}/kfontinst/icons/hicolor/*/actions/*font*.png %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop %{_datadir}/krunner/dbusplugins/plasma-runner-baloosearch.desktop -%{_datadir}/kxmlgui5/kfontinst/kfontviewpart.rc +%{_datadir}/kxmlgui5/kfontview/kfontviewpart.rc %{_datadir}/kxmlgui5/kfontview/kfontviewui.rc %{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop +%{_kf5_datadir}/kservices5/ServiceMenus/setaswallpaper.desktop %{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/knotifications5/*.notifyrc @@ -604,17 +605,17 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_datadir}/kconf_update/style_widgetstyle_default_breeze.pl %{_kf5_datadir}/kconf_update/style_widgetstyle_default_breeze.upd %{_kf5_metainfodir}/*.xml +%{_kf5_datadir}/applications/kcm_* %{_kf5_datadir}/applications/org.kde.klipper.desktop %{_kf5_datadir}/applications/org.kde.plasmashell.desktop -%{_kf5_datadir}/applications/plasma-windowed.desktop %{_kf5_datadir}/applications/org.kde.systemmonitor.desktop %{_kf5_datadir}/applications/org.kde.kcolorschemeeditor.desktop %{_kf5_datadir}/applications/org.kde.kfontview.desktop +%{_kf5_datadir}/applications/org.kde.plasmawindowed.desktop %{_kf5_datadir}/qlogging-categories5/*.categories %{_sysconfdir}/xdg/plasmanotifyrc %{_kf5_datadir}/kpackage/kcms/kcm_autostart/ %{_kf5_datadir}/kpackage/kcms/kcm_translations/ -%{_kf5_datadir}/kpackage/kcms/kcm5_icons/ %{_kf5_datadir}/kpackage/kcms/kcm_colors/ %{_kf5_datadir}/kpackage/kcms/kcm_cursortheme/ %{_kf5_datadir}/kpackage/kcms/kcm_desktoptheme/ @@ -624,6 +625,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_datadir}/kpackage/kcms/kcm_nightcolor/ %{_kf5_datadir}/kpackage/kcms/kcm_notifications/ %{_kf5_datadir}/kpackage/kcms/kcm_style/ +%{_kf5_datadir}/kpackage/kcms/kcm_users/ +%{_kf5_datadir}/kpackage/kcms/kcm_icons/ +%{_kf5_datadir}/kpackage/kcms/kcm_formats/ %{_kf5_datadir}/polkit-1/actions/org.kde.fontinst.policy %{_userunitdir}/*.service %{_userunitdir}/plasma-core.target @@ -668,7 +672,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_plugindir}/kio/*.so %{_kf5_plugindir}/kded/*.so %{_kf5_plugindir}/krunner/* -%{_qt5_plugindir}/kcms/kcm_*.so +%{_qt5_plugindir}/plasma/kcms/systemsettings/kcm_*.so %{_libdir}/kconf_update_bin/krunnerhistory %{_libdir}/kconf_update_bin/krunnerglobalshortcuts %{_kf5_qtplugindir}/kf5/parts/kfontviewpart.so @@ -678,8 +682,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchdesktop.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchwindow.so %{_kf5_qtplugindir}/plasma/containmentactions/plasma_containmentactions_switchactivity.so +%{_kf5_qtplugindir}/plasma/kcminit/kcm_fonts_init.so +%{_kf5_qtplugindir}/plasma/kcminit/kcm_style_init.so +%{_kf5_qtplugindir}/plasma/kcms/systemsettings_qwidgets/kcm_fontinst.so %{_libexecdir}/plasma-sourceenv.sh -%{_libexecdir}/startplasma-waylandsession %{_kf5_datadir}/kconf_update/krunnerhistory.upd %{_kf5_datadir}/kconf_update/krunnerglobalshortcuts2.upd %{_kf5_datadir}/kglobalaccel/org.kde.krunner.desktop @@ -746,6 +752,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Thu Jan 13 2022 Marc Deop - 5.23.90-1 +- 5.23.90 + * Tue Jan 04 2022 Marc Deop - 5.23.5-1 - 5.23.5 diff --git a/sources b/sources index a9a3d58..3dfb1cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.23.5.tar.xz) = 5f55137a1c0949ea65e61d8bbf5476a7ba56ef5afd721945c42817030d1c519ada86442426a4eda0dca164cd6676534f710ddc588c319f849415224b6c953099 +SHA512 (plasma-workspace-5.23.90.tar.xz) = 521f6a33649549af9a15c55c1143b364fa0d094ee1265f8a9d113e8f1730fb766a31aa60a10aab35bd07b2e669b8390e426ab0aeb7ba2313c05bb2c983b21cf5 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From a81bd1f4447d373bdf513b48e000212da9e7db09 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 19 Jan 2022 16:48:20 -0600 Subject: [PATCH 02/29] rebase konsole-in-contextmenu.patch (#2026789) --- ...space-5.21.90-konsole-in-contextmenu.patch | 78 ------------------ plasma-workspace-konsole-in-contextmenu.patch | 79 +++++++++++++++++++ plasma-workspace.spec | 16 ++-- 3 files changed, 89 insertions(+), 84 deletions(-) delete mode 100644 plasma-workspace-5.21.90-konsole-in-contextmenu.patch create mode 100644 plasma-workspace-konsole-in-contextmenu.patch diff --git a/plasma-workspace-5.21.90-konsole-in-contextmenu.patch b/plasma-workspace-5.21.90-konsole-in-contextmenu.patch deleted file mode 100644 index 9ed5c7f..0000000 --- a/plasma-workspace-5.21.90-konsole-in-contextmenu.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp -index 3271140..28409ff 100644 ---- a/containmentactions/contextmenu/menu.cpp -+++ b/containmentactions/contextmenu/menu.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -41,6 +42,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_separator1(nullptr) -@@ -71,7 +73,7 @@ void ContextMenu::restore(const KConfigGroup &config) - } else { - actions.insert(QStringLiteral("configure shortcuts"), false); - m_actionOrder << QStringLiteral("configure") << QStringLiteral("run associated application") << QStringLiteral("configure shortcuts") -- << QStringLiteral("_sep1") << QStringLiteral("_context") << QStringLiteral("_run_command") << QStringLiteral("add widgets") -+ << QStringLiteral("_sep1") << QStringLiteral("_context") << QStringLiteral("_run_konsole") << QStringLiteral("_run_command") << QStringLiteral("add widgets") - << QStringLiteral("_add panel") << QStringLiteral("manage activities") << QStringLiteral("remove") << QStringLiteral("edit mode") - << QStringLiteral("_sep2") << QStringLiteral("_lock_screen") << QStringLiteral("_logout") << QStringLiteral("_sep3") - << QStringLiteral("_wallpaper"); -@@ -95,6 +97,10 @@ void ContextMenu::restore(const KConfigGroup &config) - 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)); -@@ -173,6 +179,8 @@ QAction *ContextMenu::action(const QString &name) - 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; -@@ -196,6 +204,11 @@ QAction *ContextMenu::action(const QString &name) - return nullptr; - } - -+void ContextMenu::runKonsole() -+{ -+ KToolInvocation::invokeTerminal(QString(), QDir::homePath()); -+} -+ - void ContextMenu::runCommand() - { - if (!KAuthorized::authorizeAction(QStringLiteral("run_command"))) { -diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h -index 3cc3d32..6c5aa21 100644 ---- a/containmentactions/contextmenu/menu.h -+++ b/containmentactions/contextmenu/menu.h -@@ -43,10 +43,12 @@ public: - - public Q_SLOTS: - void runCommand(); -+ void runKonsole(); - void startLogout(); - - private: - QAction *m_runCommandAction; -+ QAction *m_runKonsoleAction; - QAction *m_lockScreenAction; - QAction *m_logoutAction; - QAction *m_separator1; diff --git a/plasma-workspace-konsole-in-contextmenu.patch b/plasma-workspace-konsole-in-contextmenu.patch new file mode 100644 index 0000000..e70e58d --- /dev/null +++ b/plasma-workspace-konsole-in-contextmenu.patch @@ -0,0 +1,79 @@ +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 @@ + #include + #include + #include ++#include + #include + #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 + << QStringLiteral("configure shortcuts") + << QStringLiteral("_sep1") + << QStringLiteral("_context") ++ << QStringLiteral("_run_konsole") + << QStringLiteral("_run_command") + << QStringLiteral("add widgets") + << QStringLiteral("_add panel") +@@ -102,6 +105,10 @@ void ContextMenu::restore(const KConfigG + 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)); +@@ -184,6 +191,8 @@ QAction *ContextMenu::action(const QStri + 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; +@@ -211,6 +220,13 @@ QAction *ContextMenu::action(const QStri + 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 -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: + + public Q_SLOTS: + void runCommand(); ++ void runKonsole(); + void startLogout(); + void configureDisplays(); + + private: + QAction *m_runCommandAction; ++ QAction *m_runKonsoleAction; + QAction *m_lockScreenAction; + QAction *m_logoutAction; + QAction *m_configureDisplaysAction; diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 59fbc7b..467e6e0 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -21,7 +21,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.23.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -56,7 +56,7 @@ Source40: ssh-agent.conf Source41: spice-vdagent.conf ## downstream Patches -#Patch100: plasma-workspace-5.21.90-konsole-in-contextmenu.patch +Patch100: plasma-workspace-konsole-in-contextmenu.patch Patch101: plasma-workspace-5.3.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 @@ -137,6 +137,8 @@ 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} BuildRequires: kf5-knotifications-devel >= %{kf5_version_min} @@ -441,10 +443,9 @@ BuildArch: noarch %setup -q -a 20 ## upstream patches -# FIXME/TODO: commented out in need of work: does not applyl cleanly and -# potentially causes problems: -# Since it appears plasma-workspace no longer uses kinit, the KToolInvocation::invokeTerminal call may not be 100% reliable -#%patch100 -p1 -b .konsole-in-contextmenu + +## downstream patches +%patch100 -p1 -b .konsole-in-contextmenu # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex %if 0%{?default_lookandfeel:1} %patch101 -p1 -b .set-fedora-default-look-and-feel @@ -752,6 +753,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Wed Jan 19 2022 Rex Dieter - 5.23.90-2 +- rebase konsole-in-contextmenu.patch (#2026789) + * Thu Jan 13 2022 Marc Deop - 5.23.90-1 - 5.23.90 From 64187bca16e8a11b463ad60c06263c42d862fa24 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Thu, 3 Feb 2022 15:06:40 +0100 Subject: [PATCH 03/29] 5.24.0 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3683bc3..1c152f0 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /plasma-workspace-5.23.4.tar.xz /plasma-workspace-5.23.5.tar.xz /plasma-workspace-5.23.90.tar.xz +/plasma-workspace-5.24.0.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 467e6e0..d9a71e9 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -20,8 +20,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.23.90 -Release: 2%{?dist} +Version: 5.24.0 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -753,6 +753,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Thu Feb 03 2022 Marc Deop - 5.24.0-1 +- 5.24.0 + * Wed Jan 19 2022 Rex Dieter - 5.23.90-2 - rebase konsole-in-contextmenu.patch (#2026789) diff --git a/sources b/sources index 3dfb1cb..4414a9b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.23.90.tar.xz) = 521f6a33649549af9a15c55c1143b364fa0d094ee1265f8a9d113e8f1730fb766a31aa60a10aab35bd07b2e669b8390e426ab0aeb7ba2313c05bb2c983b21cf5 +SHA512 (plasma-workspace-5.24.0.tar.xz) = 27f868244d7ec72cf3573ca52e4514d0a6d115915ba9667589adacf49001ef6dfda2adc56cc7758b88405b697ed00cfd3b3b654708d184a047ab4e232ad335d8 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From 6bd8c5b25e2a1b3473fa9568e754f91a51d5ac10 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 3 Feb 2022 09:37:58 -0500 Subject: [PATCH 04/29] Add sddm-wayland-plasma subpackage to ship Wayland greeter configuration --- plasma-workspace.spec | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d9a71e9..a1faebf 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -5,12 +5,19 @@ %global kf5_version_min 5.82.0 # Control wayland by default -%if (0%{?fedora} && 0%{?fedora} < 34) || (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} < 36) || (0%{?rhel} && 0%{?rhel} < 9) +%bcond_with sddm_wayland_default +%else +%bcond_without sddm_wayland_default +%endif + # Control systemdBoot by default %if 0%{?rhel} && 0%{?rhel} < 9 %bcond_with systemdBoot @@ -395,6 +402,21 @@ BuildArch: noarch %description -n sddm-breeze %{summary}. +%package -n sddm-wayland-plasma +Summary: Plasma Wayland SDDM greeter configuration +Provides: sddm-greeter-displayserver +Conflicts: sddm-greeter-displayserver +Requires: kwin-wayland >= %{majmin_ver} +Requires: maliit-keyboard +%if %{with sddm_wayland_default} +Supplements: (sddm and plasma-workspace-wayland) +%endif +BuildArch: noarch + +%description -n sddm-wayland-plasma +This package contains configuration and dependencies for SDDM +to use KWin for the Wayland compositor for the greeter. + %package wayland Summary: Wayland support for Plasma Requires: %{name} = %{version}-%{release} @@ -468,6 +490,7 @@ EOL %build %{cmake_kf5} \ + -DINSTALL_SDDM_WAYLAND_SESSION:BOOL=ON \ %{?with_wayland_default:-DPLASMA_WAYLAND_DEFAULT_SESSION:BOOL=ON} %cmake_build @@ -500,6 +523,10 @@ ln -sf %{_datadir}/backgrounds/default.png \ install -m644 -p breeze-fedora/* \ %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/ +# 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 @@ -727,6 +754,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %{_datadir}/sddm/themes/01-breeze-fedora/ #%config(noreplace) %{_datadir}/sddm/themes/01-breeze-fedora/theme.conf.user +%files -n sddm-wayland-plasma +%{_prefix}/lib/sddm/sddm.conf.d/plasma-wayland.conf + %files wayland %{_kf5_bindir}/startplasma-wayland %if ! %{with wayland_default} @@ -755,6 +785,7 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog * Thu Feb 03 2022 Marc Deop - 5.24.0-1 - 5.24.0 +- Add sddm-wayland-plasma subpackage to ship Wayland greeter configuration * Wed Jan 19 2022 Rex Dieter - 5.23.90-2 - rebase konsole-in-contextmenu.patch (#2026789) From d383b5854da7b2d226bd1edd40544de91e6eeae6 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 4 Feb 2022 11:05:44 +0100 Subject: [PATCH 05/29] fix: upload fixed 5.24.0 tarball --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 4414a9b..6f0b71c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.24.0.tar.xz) = 27f868244d7ec72cf3573ca52e4514d0a6d115915ba9667589adacf49001ef6dfda2adc56cc7758b88405b697ed00cfd3b3b654708d184a047ab4e232ad335d8 +SHA512 (plasma-workspace-5.24.0.tar.xz) = 85686c93ca867b5ae04afc5c93775c9821739badf33a340c90862b8cbc64e878fcb94ad673fc8770692321e77759a6ef1d5c7738207b650a3af1d5d96c0a5485 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From fcb98883bf82840f55712e72a7da56dfd651bee2 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 4 Feb 2022 12:35:06 +0100 Subject: [PATCH 06/29] fix: yet another 5.24.0 tar re-spin --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6f0b71c..02e52f2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.24.0.tar.xz) = 85686c93ca867b5ae04afc5c93775c9821739badf33a340c90862b8cbc64e878fcb94ad673fc8770692321e77759a6ef1d5c7738207b650a3af1d5d96c0a5485 +SHA512 (plasma-workspace-5.24.0.tar.xz) = 9b0093eb6a2b978a96d72a9eb9adf1b3f76de40645ede31ec066bdff63a2d44b9f207661414ed291d0479c4e5bae97805b0b2f855bc6ca25891dc901fd4e0e8e SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From 4cba585b252be25886d0bced489f5f762334ce06 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 4 Feb 2022 16:45:31 +0100 Subject: [PATCH 07/29] fix: update files section --- plasma-workspace.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index a1faebf..f95c47e 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -662,7 +662,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %dir %{_userunitdir}/plasma-core.target.d/ %{_userunitdir}/plasma-core.target.d/ssh-agent.conf %{_userunitdir}/plasma-core.target.d/spice-vdagent.conf -%{_userunitdir}/plasma-workspace@.target +%{_userunitdir}/plasma-workspace.target +%{_userunitdir}/plasma-workspace-wayland.target +%{_userunitdir}/plasma-workspace-x11.target %dir %{_userunitdir}/plasma-workspace@.target.d/ # PAM %config(noreplace) %{_sysconfdir}/pam.d/kde From 06bd837bae3cd95a54b848d979c2ca84c3ee48b8 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 11 Feb 2022 08:58:14 +0100 Subject: [PATCH 08/29] feat: new sources due to tarball re-spin --- plasma-workspace.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f95c47e..95ef309 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.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -785,6 +785,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Fri Feb 11 2022 Marc Deop - 5.24.0-2 +- Rebuild due to tarball re-spin + * Thu Feb 03 2022 Marc Deop - 5.24.0-1 - 5.24.0 - Add sddm-wayland-plasma subpackage to ship Wayland greeter configuration diff --git a/sources b/sources index 02e52f2..5cba56f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.24.0.tar.xz) = 9b0093eb6a2b978a96d72a9eb9adf1b3f76de40645ede31ec066bdff63a2d44b9f207661414ed291d0479c4e5bae97805b0b2f855bc6ca25891dc901fd4e0e8e +SHA512 (plasma-workspace-5.24.0.tar.xz) = ca0b3f37988d0f2b7ff2a0c109dbf8aaf52a1cf175fa27e606709a0f6394dfa3f54b3488cd0eea289cba925b195368bec877c365cfba961c4f0c9a88eeb8af12 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From 005408bf42fca25763f8129767e7e10dff9225b5 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 15 Feb 2022 16:20:34 +0100 Subject: [PATCH 09/29] 5.24.1 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1c152f0..284a2f8 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /plasma-workspace-5.23.5.tar.xz /plasma-workspace-5.23.90.tar.xz /plasma-workspace-5.24.0.tar.xz +/plasma-workspace-5.24.1.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 95ef309..c6fc838 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.0 -Release: 2%{?dist} +Version: 5.24.1 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -785,6 +785,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Tue Feb 15 2022 Marc Deop - 5.24.1-1 +- 5.24.1 + * Fri Feb 11 2022 Marc Deop - 5.24.0-2 - Rebuild due to tarball re-spin diff --git a/sources b/sources index 5cba56f..a59e8a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plasma-workspace-5.24.0.tar.xz) = ca0b3f37988d0f2b7ff2a0c109dbf8aaf52a1cf175fa27e606709a0f6394dfa3f54b3488cd0eea289cba925b195368bec877c365cfba961c4f0c9a88eeb8af12 +SHA512 (plasma-workspace-5.24.1.tar.xz) = b04535ba51f3c6a86c1ea9dd692e5d02b9728614094350c94377b8df5b154886c16d1b1390f45db8d13370cbc443dfb492807a29e28e589157e769463ec13249 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From 17446af74c2793ab5e4de6f0596160c13d112118 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 Feb 2022 08:47:44 -0600 Subject: [PATCH 10/29] 5.24.2 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 284a2f8..c68f80a 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /plasma-workspace-5.23.90.tar.xz /plasma-workspace-5.24.0.tar.xz /plasma-workspace-5.24.1.tar.xz +/plasma-workspace-5.24.2.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index c6fc838..f1e0600 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.1 +Version: 5.24.2 Release: 1%{?dist} License: GPLv2+ @@ -785,6 +785,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Tue Feb 22 2022 Rex Dieter - 5.24.2-1 +- 5.24.2 + * Tue Feb 15 2022 Marc Deop - 5.24.1-1 - 5.24.1 diff --git a/sources b/sources index a59e8a8..2d8186a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (plasma-workspace-5.24.1.tar.xz) = b04535ba51f3c6a86c1ea9dd692e5d02b9728614094350c94377b8df5b154886c16d1b1390f45db8d13370cbc443dfb492807a29e28e589157e769463ec13249 -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (plasma-workspace-5.24.2.tar.xz) = bc33b7911447064b7a1ecb50578587d7aa5b8861962f4c69ba27ea9a66c3e11eccd4d7cd074203bbcf34821565e991d5f4292be5fe8c5b6ef09727fe2cc44d71 From effbff009f55f20670891762333ee8266580e20a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 Feb 2022 09:43:39 -0600 Subject: [PATCH 11/29] restore sources.keep content --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 2d8186a..112e7a3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (plasma-workspace-5.24.2.tar.xz) = bc33b7911447064b7a1ecb50578587d7aa5b8861962f4c69ba27ea9a66c3e11eccd4d7cd074203bbcf34821565e991d5f4292be5fe8c5b6ef09727fe2cc44d71 +SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 From 1857efd5370f81b74025578a9fbc0250bde7abf8 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 27 Feb 2022 19:11:15 -0500 Subject: [PATCH 12/29] Refresh default look-and-feel patch to fix for Plasma 5.24 --- ...4.0-set-fedora-default-look-and-feel.patch | 26 +++++++++++++++++++ ...3.0-set-fedora-default-look-and-feel.patch | 13 ---------- plasma-workspace.spec | 11 +++++--- 3 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch delete mode 100644 plasma-workspace-5.3.0-set-fedora-default-look-and-feel.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 new file mode 100644 index 0000000..415683b --- /dev/null +++ b/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch @@ -0,0 +1,26 @@ +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 +@@ -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 --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); + + 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")); + activeLnf.open(QIODevice::ReadOnly); + if (activeLnf.readLine() != currentLnf.toUtf8()) { diff --git a/plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch b/plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch deleted file mode 100644 index 2ae5b04..0000000 --- a/plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp -index a6cef04..82c6d36 100644 ---- a/shell/packageplugins/lookandfeel/lookandfeel.cpp -+++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp -@@ -23,7 +23,7 @@ - #include - #include - --#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop" -+#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@" - - void LookAndFeelPackage::initPackage(KPackage::Package *package) - { diff --git a/plasma-workspace.spec b/plasma-workspace.spec index f1e0600..89ae4bd 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.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -64,7 +64,7 @@ Source41: spice-vdagent.conf ## downstream Patches Patch100: plasma-workspace-konsole-in-contextmenu.patch -Patch101: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.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, @@ -468,11 +468,11 @@ BuildArch: noarch ## downstream patches %patch100 -p1 -b .konsole-in-contextmenu -# FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex +# 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 + shell/packageplugins/lookandfeel/lookandfeel.cpp startkde/startplasma.cpp %endif %patch105 -p1 @@ -785,6 +785,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Mon Feb 28 2022 Neal Gompa - 5.24.2-2 +- Refresh default look-and-feel patch to fix for Plasma 5.24 + * Tue Feb 22 2022 Rex Dieter - 5.24.2-1 - 5.24.2 From 0363a0be560cb69b12a415a46ab3fb94ceec21ef Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 6 Mar 2022 20:10:20 -0500 Subject: [PATCH 13/29] Backport sddm theme improvements to fix visual bugs (#2054016, #2058468) Also, correctly set distro logo for fedora breeze sddm theme. --- .gitignore | 1 + plasma-workspace-PR1508-sddm-theme-pc3.patch | 173 ++++++++++++++++++ ...PR1510-sddm-theme-fix-weird-behavior.patch | 28 +++ plasma-workspace.spec | 33 +++- sources | 1 + sources.keep | 1 + 6 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 plasma-workspace-PR1508-sddm-theme-pc3.patch create mode 100644 plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch diff --git a/.gitignore b/.gitignore index c68f80a..2aa04ba 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /plasma-workspace-5.24.0.tar.xz /plasma-workspace-5.24.1.tar.xz /plasma-workspace-5.24.2.tar.xz +/sddm-theme-5.24.80~pre.tar.gz diff --git a/plasma-workspace-PR1508-sddm-theme-pc3.patch b/plasma-workspace-PR1508-sddm-theme-pc3.patch new file mode 100644 index 0000000..22ef7f9 --- /dev/null +++ b/plasma-workspace-PR1508-sddm-theme-pc3.patch @@ -0,0 +1,173 @@ +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 new file mode 100644 index 0000000..4a02762 --- /dev/null +++ b/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch @@ -0,0 +1,28 @@ +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 89ae4bd..15be294 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.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -52,6 +52,10 @@ 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 @@ -62,6 +66,14 @@ Source20: breeze-fedora-0.2.tar.gz Source40: ssh-agent.conf Source41: spice-vdagent.conf +## upstream Patches (master branch) + +## upstreamable Patches +# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1508 +Patch50: plasma-workspace-PR1508-sddm-theme-pc3.patch +# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1510 +Patch51: plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch + ## downstream Patches Patch100: plasma-workspace-konsole-in-contextmenu.patch Patch101: plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch @@ -71,10 +83,6 @@ Patch101: plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch # 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 -## upstreamable Patches - -## upstream Patches (master branch) - # udev BuildRequires: zlib-devel BuildRequires: dbusmenu-qt5-devel @@ -462,10 +470,14 @@ BuildArch: noarch %prep -%setup -q -a 20 +%setup -q -a 19 -a 20 ## upstream patches +## upstreamable patches +%patch50 -p1 +%patch51 -p1 + ## downstream patches %patch100 -p1 -b .konsole-in-contextmenu # XXX: This is horribly broken and needs fixes upstream -- ngompa @@ -522,6 +534,11 @@ ln -sf %{_datadir}/backgrounds/default.png \ %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/components/artwork/background.png install -m644 -p breeze-fedora/* \ %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/ +%if 0%{?fedora} >= 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 @@ -785,6 +802,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Sun Mar 06 2022 Neal Gompa - 5.24.2-3 +- Backport sddm theme improvements to fix visual bugs (#2054016, #2058468) +- Correctly set distro logo for fedora breeze sddm theme + * Mon Feb 28 2022 Neal Gompa - 5.24.2-2 - Refresh default look-and-feel patch to fix for Plasma 5.24 diff --git a/sources b/sources index 112e7a3..9270787 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (plasma-workspace-5.24.2.tar.xz) = bc33b7911447064b7a1ecb50578587d7aa5b8861962f4c69ba27ea9a66c3e11eccd4d7cd074203bbcf34821565e991d5f4292be5fe8c5b6ef09727fe2cc44d71 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 diff --git a/sources.keep b/sources.keep index 58c0216..20f7e0e 100644 --- a/sources.keep +++ b/sources.keep @@ -1 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 From 639ecc5a6f384a0b451109585e55cf044a10bf1f Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 8 Mar 2022 08:54:56 +0100 Subject: [PATCH 14/29] Rebuild (qt5) --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 15be294..d3f5ff8 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.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Tue Mar 08 2022 Jan Grulich - 5.24.2-4 +- Rebuild (qt5) + * Sun Mar 06 2022 Neal Gompa - 5.24.2-3 - Backport sddm theme improvements to fix visual bugs (#2054016, #2058468) - Correctly set distro logo for fedora breeze sddm theme From cba838425bfaeba2766d7dfaf4a0db61fc19cd49 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 8 Mar 2022 20:03:07 +0100 Subject: [PATCH 15/29] 5.24.3 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2aa04ba..9a38551 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /plasma-workspace-5.24.1.tar.xz /plasma-workspace-5.24.2.tar.xz /sddm-theme-5.24.80~pre.tar.gz +/plasma-workspace-5.24.3.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index d3f5ff8..9704949 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.2 -Release: 4%{?dist} +Version: 5.24.3 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Tue Mar 08 2022 Marc Deop - 5.24.3-1 +- 5.24.3 + * Tue Mar 08 2022 Jan Grulich - 5.24.2-4 - Rebuild (qt5) diff --git a/sources b/sources index 9270787..6b20d42 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (plasma-workspace-5.24.1.tar.xz) = b04535ba51f3c6a86c1ea9dd692e5d02b9728614094350c94377b8df5b154886c16d1b1390f45db8d13370cbc443dfb492807a29e28e589157e769463ec13249 SHA512 (plasma-workspace-5.24.2.tar.xz) = bc33b7911447064b7a1ecb50578587d7aa5b8861962f4c69ba27ea9a66c3e11eccd4d7cd074203bbcf34821565e991d5f4292be5fe8c5b6ef09727fe2cc44d71 -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 +SHA512 (plasma-workspace-5.24.3.tar.xz) = cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7 From 2e438d30e3451cfd881472f6962658d5b1bec49e Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 8 Mar 2022 23:22:39 +0100 Subject: [PATCH 16/29] fix: restore all needed sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6b20d42..0ae8df9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (plasma-workspace-5.24.1.tar.xz) = b04535ba51f3c6a86c1ea9dd692e5d02b9728614094350c94377b8df5b154886c16d1b1390f45db8d13370cbc443dfb492807a29e28e589157e769463ec13249 -SHA512 (plasma-workspace-5.24.2.tar.xz) = bc33b7911447064b7a1ecb50578587d7aa5b8861962f4c69ba27ea9a66c3e11eccd4d7cd074203bbcf34821565e991d5f4292be5fe8c5b6ef09727fe2cc44d71 SHA512 (plasma-workspace-5.24.3.tar.xz) = cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7 +SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 From 726d60842f5335cb9c54f91c12c5b37943e73578 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 9 Mar 2022 07:46:29 +0100 Subject: [PATCH 17/29] BR: libusb renamed to libusb-compat-0.1-devel --- plasma-workspace.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 9704949..ec14995 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -110,7 +110,7 @@ BuildRequires: xcb-util-devel BuildRequires: glib2-devel BuildRequires: fontconfig-devel BuildRequires: boost-devel -BuildRequires: libusb-devel +BuildRequires: libusb-compat-0.1-devel BuildRequires: libbsd-devel BuildRequires: pam-devel BuildRequires: lm_sensors-devel From 0abe3e1068a330fa50b459be8594ae9fb788d9c0 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Fri, 11 Mar 2022 10:53:29 +0100 Subject: [PATCH 18/29] fix: use pkgconfig(libusb) instead of libusb-compat-0.1-devel as BuildRequires --- plasma-workspace.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index ec14995..436057e 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -110,7 +110,7 @@ BuildRequires: xcb-util-devel BuildRequires: glib2-devel BuildRequires: fontconfig-devel BuildRequires: boost-devel -BuildRequires: libusb-compat-0.1-devel +BuildRequires: pkgconfig(libusb) BuildRequires: libbsd-devel BuildRequires: pam-devel BuildRequires: lm_sensors-devel From c073fda73c010312e53e1d56dc7454f6d31213c9 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 14 Mar 2022 07:31:45 -0400 Subject: [PATCH 19/29] Do not use the SDDM Wayland greeter by default for F36 --- plasma-workspace.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 436057e..59cbc3a 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -12,7 +12,7 @@ %endif # Control sddm wayland by default -%if (0%{?fedora} && 0%{?fedora} < 36) || (0%{?rhel} && 0%{?rhel} < 9) +%if (0%{?fedora} && 0%{?fedora} < 37) || (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.24.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Mon Mar 14 2022 Neal Gompa - 5.24.3-2 +- Do not use the SDDM Wayland greeter by default for F36 + * Tue Mar 08 2022 Marc Deop - 5.24.3-1 - 5.24.3 From a6c7e847f90dc28fbfecf292f83cab0a13e55239 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 22 Mar 2022 08:39:13 +0100 Subject: [PATCH 20/29] Rebuild (qt5) --- plasma-workspace.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 59cbc3a..68f4fbb 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.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Tue Mar 22 2022 Jan Grulich - 5.24.3-3 +- Rebuild (qt5) + * Mon Mar 14 2022 Neal Gompa - 5.24.3-2 - Do not use the SDDM Wayland greeter by default for F36 From c6ec65966ee2f5b24ac4e4d9ff5880fb0e451fa3 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 31 Mar 2022 16:54:16 +1030 Subject: [PATCH 21/29] Update to 5.24.4 --- .gitignore | 1 + plasma-workspace.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9a38551..953f0b8 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /plasma-workspace-5.24.2.tar.xz /sddm-theme-5.24.80~pre.tar.gz /plasma-workspace-5.24.3.tar.xz +/plasma-workspace-5.24.4.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 59cbc3a..7808fd4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.3 -Release: 2%{?dist} +Version: 5.24.4 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Thu Mar 31 2022 Justin Zobel - 5.24.4-1 +- Update to 5.24.4 + * Mon Mar 14 2022 Neal Gompa - 5.24.3-2 - Do not use the SDDM Wayland greeter by default for F36 diff --git a/sources b/sources index 0ae8df9..f5b9352 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (plasma-workspace-5.24.3.tar.xz) = cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 +SHA512 (plasma-workspace-5.24.4.tar.xz) = 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 From 5f93d478f80cd8bec00a9277f7c06292b7b15c49 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Fri, 1 Apr 2022 08:16:22 +1030 Subject: [PATCH 22/29] Remove patches that have been merged upstream --- plasma-workspace.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 7808fd4..3b926ea 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -69,10 +69,6 @@ Source41: spice-vdagent.conf ## upstream Patches (master branch) ## upstreamable Patches -# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1508 -Patch50: plasma-workspace-PR1508-sddm-theme-pc3.patch -# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1510 -Patch51: plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch ## downstream Patches Patch100: plasma-workspace-konsole-in-contextmenu.patch From 365686126c1e818b6052bf3e7bce3dab6a7ec318 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Fri, 1 Apr 2022 08:21:20 +1030 Subject: [PATCH 23/29] Remove reference to patches in prep phase --- plasma-workspace.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 3b926ea..3708f6d 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -471,8 +471,6 @@ BuildArch: noarch ## upstream patches ## upstreamable patches -%patch50 -p1 -%patch51 -p1 ## downstream patches %patch100 -p1 -b .konsole-in-contextmenu From 2cc26c158388702730f79d6c7611753f57cd6d39 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Sat, 2 Apr 2022 17:09:55 +1030 Subject: [PATCH 24/29] Update to 5.24.4 and remove upstreamed patches --- .gitignore | 1 + plasma-workspace-PR1508-sddm-theme-pc3.patch | 173 ------------------ ...PR1510-sddm-theme-fix-weird-behavior.patch | 28 --- plasma-workspace.spec | 8 +- sources | 1 + 5 files changed, 4 insertions(+), 207 deletions(-) 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/.gitignore b/.gitignore index 9a38551..953f0b8 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /plasma-workspace-5.24.2.tar.xz /sddm-theme-5.24.80~pre.tar.gz /plasma-workspace-5.24.3.tar.xz +/plasma-workspace-5.24.4.tar.xz 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 68f4fbb..3d7424d 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.3 -Release: 3%{?dist} +Version: 5.24.4 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -69,10 +69,6 @@ Source41: spice-vdagent.conf ## upstream Patches (master branch) ## upstreamable Patches -# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1508 -Patch50: plasma-workspace-PR1508-sddm-theme-pc3.patch -# From: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/1510 -Patch51: plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch ## downstream Patches Patch100: plasma-workspace-konsole-in-contextmenu.patch diff --git a/sources b/sources index 0ae8df9..f5b9352 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (plasma-workspace-5.24.3.tar.xz) = cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 +SHA512 (plasma-workspace-5.24.4.tar.xz) = 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 From 201ea0960c73817d5110c4eae3e4a0308ddde44c Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Sun, 3 Apr 2022 13:30:33 +0930 Subject: [PATCH 25/29] Remove reference to upstreamed patches --- plasma-workspace.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 3d7424d..1f82975 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -471,8 +471,6 @@ BuildArch: noarch ## upstream patches ## upstreamable patches -%patch50 -p1 -%patch51 -p1 ## downstream patches %patch100 -p1 -b .konsole-in-contextmenu From 7a3a18cc9d03d1f8b2cde72319051b4aa592a01b Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Tue, 3 May 2022 19:53:55 +0200 Subject: [PATCH 26/29] 5.24.5 --- .gitignore | 1 + plasma-workspace.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 953f0b8..f63a7ca 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ /sddm-theme-5.24.80~pre.tar.gz /plasma-workspace-5.24.3.tar.xz /plasma-workspace-5.24.4.tar.xz +/plasma-workspace-5.24.5.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 3708f6d..6a44a46 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.4 +Version: 5.24.5 Release: 1%{?dist} License: GPLv2+ @@ -796,6 +796,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Tue May 03 2022 Marc Deop - 5.24.5-1 +- 5.24.5 + * Thu Mar 31 2022 Justin Zobel - 5.24.4-1 - Update to 5.24.4 diff --git a/sources b/sources index f5b9352..57f0811 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (plasma-workspace-5.24.3.tar.xz) = cc442e4ca064ef99555c00ebfded348d2358b73dbe9d6f34a63267f9e066b63acad8b18576532bc4fa413c239580e823bde1271551f445190f566b87f66646a7 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 -SHA512 (plasma-workspace-5.24.4.tar.xz) = 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 +SHA512 (plasma-workspace-5.24.5.tar.xz) = ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 From c8c1c5551fb75d6bf1eedf92ebbda2c53c485da6 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 9 May 2022 08:42:51 -0700 Subject: [PATCH 27/29] Enable selinuxuser_execmod (#2058657) --- plasma-workspace.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 1f82975..9b01a62 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.4 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -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 if selinux-policy) # for libkdeinit5_* %{?kf5_kinit_requires} @@ -571,6 +573,10 @@ cat *.lang | sort | uniq -u > %{name}.lang %check desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,plasmashell,systemmonitor}.desktop +%post +if [ -s /usr/sbin/setsebool ] ; then + setsebool -P selinuxuser_execmod 1 ||: +fi %files common %license LICENSES @@ -796,6 +802,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Mon May 09 2022 Troy Dawson - 5.24.3-3.1 +- Enable selinuxuser_execmod (#2058657) + * Tue Mar 22 2022 Jan Grulich - 5.24.3-3 - Rebuild (qt5) From 3300902a4d6a6b2b03688778162c2f63364296c2 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 14 Jul 2022 11:22:47 -0700 Subject: [PATCH 28/29] Update to 5.24.6 --- .gitignore | 1 + plasma-workspace.spec | 7 ++- sources | 2 +- sources.keep | 2 - startkde.patch | 114 ------------------------------------------ 5 files changed, 7 insertions(+), 119 deletions(-) delete mode 100644 sources.keep delete mode 100644 startkde.patch diff --git a/.gitignore b/.gitignore index f63a7ca..753f4a8 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.6.tar.xz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 8143004..ad6fdd4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -27,8 +27,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.24.5 -Release: 1%{?dist}.1 +Version: 5.24.6 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -802,6 +802,9 @@ fi %changelog +* Wed Jul 13 2022 Troy Dawson - 5.24.6-1 +- Update to 5.24.6 + * Thu Jun 16 2022 Troy Dawson - 5.24.5-1.1 - Enable selinuxuser_execmod (#2058657) diff --git a/sources b/sources index 57f0811..dd212b4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 +SHA512 (plasma-workspace-5.24.6.tar.xz) = 4e49f59d565e0b84951122155158966a54c05a6999ff99503bfff667c780fac6cfc076326f0cac7d53629bfc1d81599b30e919848168f6beb79a4dc7cf7c5560 SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 -SHA512 (plasma-workspace-5.24.5.tar.xz) = ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 diff --git a/sources.keep b/sources.keep deleted file mode 100644 index 20f7e0e..0000000 --- a/sources.keep +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 diff --git a/startkde.patch b/startkde.patch deleted file mode 100644 index e702c44..0000000 --- a/startkde.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up plasma-workspace-5.12.5/startkde/startkde.cmake.startkde plasma-workspace-5.12.5/startkde/startkde.cmake ---- plasma-workspace-5.12.5/startkde/startkde.cmake.startkde 2018-05-01 08:03:40.000000000 -0500 -+++ plasma-workspace-5.12.5/startkde/startkde.cmake 2018-05-06 21:12:49.592504191 -0500 -@@ -279,22 +237,21 @@ if test $? -ne 0; then - # Startup error - echo 'startkde: Could not sync environment to dbus.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not sync environment to dbus." -+ xmessage "Could not sync environment to dbus." - exit 1 - fi - --# We set LD_BIND_NOW to increase the efficiency of kdeinit. --# kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." -+ xmessage "Could not start kdeinit5. Check your installation." - exit 1 - fi - --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & -+qdbus=qdbus-qt5 -+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -327,13 +284,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t - # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- qdbus "$address" "/MainApplication" "quit" -+ $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -+ $qdbus "$address" "/MainApplication" "quit" - done - break - fi -diff -up plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde plasma-workspace-5.12.5/startkde/startplasma.cmake ---- plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde 2018-05-01 08:03:40.000000000 -0500 -+++ plasma-workspace-5.12.5/startkde/startplasma.cmake 2018-05-06 21:11:54.749023404 -0500 -@@ -140,7 +140,8 @@ if test $? -ne 0; then - exit 1 - fi - --qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & -+qdbus=qdbus-qt5 -+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & - - # finally, give the session control to the session manager - # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -169,13 +170,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t - # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` - wait_drkonqi_counter=0 -- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do -+ while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do - sleep 5 - wait_drkonqi_counter=$((wait_drkonqi_counter+5)) - if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then - # ask remaining drkonqis to die in a graceful way -- qdbus | grep 'org.kde.drkonqi-' | while read address ; do -- qdbus "$address" "/MainApplication" "quit" -+ $qdbus | grep 'org.kde.drkonqi-' | while read address ; do -+ $qdbus "$address" "/MainApplication" "quit" - done - break - fi -diff -up plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake ---- plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde 2018-05-01 08:03:40.000000000 -0500 -+++ plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake 2018-05-06 21:11:54.749023404 -0500 -@@ -3,6 +3,8 @@ - # DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) - # - -+qdbus=qdbus-qt5 -+ - # We need to create config folder so we can write startupconfigkeys - if [ ${XDG_CONFIG_HOME} ]; then - configDir=$XDG_CONFIG_HOME; -@@ -120,12 +122,12 @@ fi - - # Get a property value from org.freedesktop.locale1 - queryLocale1() { -- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" -+ $qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" - } - - # Query whether org.freedesktop.locale1 is available. If it is, try to - # set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly. --if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then -+if $qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then - # Do not overwrite existing values. There is no point in setting only some - # of them as then they would not match anymore. - if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ -@@ -175,7 +177,7 @@ fi - export XDG_DATA_DIRS - - # Make sure that D-Bus is running --if qdbus >/dev/null 2>/dev/null; then -+if $qdbus >/dev/null 2>/dev/null; then - : # ok - else - echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 From 8a5f8a07f017aaef8600eb3795f5c6ef5e1878d0 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 1 Aug 2022 09:36:16 -0700 Subject: [PATCH 29/29] Build plasma-lookandfeel-fedora on everything --- plasma-workspace.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index ad6fdd4..4392567 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.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -261,13 +261,9 @@ 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 @@ -397,10 +393,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 @@ -477,14 +471,11 @@ BuildArch: noarch ## 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 -%if 0%{?fedora} # Populate initial lookandfeel package cp -a lookandfeel lookandfeel.fedora # Overwrite settings to configure twilight mode @@ -493,7 +484,6 @@ install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop cat >> CMakeLists.txt < 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 +781,14 @@ 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 +* Fri Jul 29 2022 Troy Dawson - 5.24.6-2 +- Build plasma-lookandfeel-fedora on everything + * Wed Jul 13 2022 Troy Dawson - 5.24.6-1 - Update to 5.24.6