diff --git a/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch b/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch deleted file mode 100644 index a6dc3ad..0000000 --- a/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c Mon Sep 17 00:00:00 2001 -From: Fushan Wen -Date: Fri, 4 Aug 2023 12:40:17 +0800 -Subject: [PATCH] shell: avoid potential crash when previous window is gone - before returning focus - -m_previousPlasmaWindow is bound to a window, and if a window is closed -before `restorePreviousWindow` is called, there will be a crash. Use -QPointer to track the window destruction. ---- - shell/shellcorona.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/shell/shellcorona.h b/shell/shellcorona.h -index a3aff351af..db218d16e2 100644 ---- a/shell/shellcorona.h -+++ b/shell/shellcorona.h -@@ -14,6 +14,7 @@ - - #include - #include -+#include - #include - #include - -@@ -301,7 +302,7 @@ private: - KWayland::Client::PlasmaShell *m_waylandPlasmaShell; - // For getting the active window on Wayland - KWayland::Client::PlasmaWindowManagement *m_waylandWindowManagement = nullptr; -- KWayland::Client::PlasmaWindow *m_previousPlasmaWindow = nullptr; -+ QPointer m_previousPlasmaWindow; - bool m_closingDown : 1; - bool m_screenReorderInProgress = false; - QString m_testModeLayout; --- -GitLab - diff --git a/hide-virtual-keyboard-indicator-on-sddm.patch b/hide-virtual-keyboard-indicator-on-sddm.patch new file mode 100644 index 0000000..7db14a3 --- /dev/null +++ b/hide-virtual-keyboard-indicator-on-sddm.patch @@ -0,0 +1,12 @@ +diff -bur plasma-workspace-5.27.3.old/lookandfeel/sddm-theme/Main.qml plasma-workspace-5.27.3/lookandfeel/sddm-theme/Main.qml +--- plasma-workspace-5.27.3.old/lookandfeel/sddm-theme/Main.qml 2023-03-14 15:12:21.000000000 +0100 ++++ plasma-workspace-5.27.3/lookandfeel/sddm-theme/Main.qml 2023-03-27 20:20:10.759761866 +0200 +@@ -555,7 +555,7 @@ + userListComponent.mainPasswordBox.forceActiveFocus(); + inputPanel.showHide() + } +- visible: inputPanel.status === Loader.Ready ++ visible: false + } + + KeyboardButton { diff --git a/plasma-workspace-5.21.90-folderview_layout.patch b/plasma-workspace-5.21.90-folderview_layout.patch new file mode 100644 index 0000000..70531a7 --- /dev/null +++ b/plasma-workspace-5.21.90-folderview_layout.patch @@ -0,0 +1,12 @@ +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] + Theme=org.kde.Breeze ++ ++[Desktop][org.kde.plasma.desktop] ++Containment=org.kde.plasma.folder ++ 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-5.27.6.tar.xz b/plasma-workspace-5.27.10.tar.xz similarity index 73% rename from plasma-workspace-5.27.6.tar.xz rename to plasma-workspace-5.27.10.tar.xz index a3db526..c349015 100644 Binary files a/plasma-workspace-5.27.6.tar.xz and b/plasma-workspace-5.27.10.tar.xz differ diff --git a/plasma-workspace.spec b/plasma-workspace.spec index c2ed028..e432301 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -10,7 +10,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.6 +Version: 5.27.10 Release: 1 License: GPLv2+ @@ -34,8 +34,15 @@ Source11: startkderc Source40: ssh-agent.conf Source41: spice-vdagent.conf -# https://invent.kde.org/plasma/plasma-workspace/-/commit/fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c -Patch0: fc01a7f837d06ee9e92d02f13acb79c2b06e9e3c.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 +# 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 +# Hide virtual keyboard indicator on sddm. +# Do not remove this as it breaks Fedora's QA policy +Patch108: hide-virtual-keyboard-indicator-on-sddm.patch # udev BuildRequires: zlib-devel @@ -80,7 +87,7 @@ BuildRequires: libicu-devel BuildRequires: qt5-qtbase-devel >= 5.15 BuildRequires: qt5-qtbase-private-devel -%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +%{?_qt5:Requires: %{_qt5} = %{_qt5_version}} BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qtdeclarative-devel @@ -121,7 +128,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 >= %{_kf5_version} BuildRequires: kf5-threadweaver-devel >= %{kf5_version_min} BuildRequires: kf5-kded-devel >= %{kf5_version_min} BuildRequires: kf5-kirigami2-devel >= %{kf5_version_min} @@ -152,15 +159,15 @@ Conflicts: kio-extras < 5.4.0 Requires: %{name}-geolocation = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: libkworkspace5%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: libkworkspace5 = %{version}-%{release} Requires: policycoreutils # for libkdeinit5_* %{?kf5_kinit_requires} -Requires: kactivitymanagerd%{?_isa} >= %{majmin_ver} -Requires: khotkeys%{?_isa} >= %{majmin_ver} -Requires: ksystemstats%{?_isa} >= %{majmin_ver} +Requires: kactivitymanagerd >= %{majmin_ver} +Requires: khotkeys >= %{majmin_ver} +Requires: ksystemstats >= %{majmin_ver} Requires: kf5-baloo >= %{kf5_version_min} Requires: kf5-kded >= %{kf5_version_min} Requires: kf5-kdoctools >= %{kf5_version_min} @@ -248,7 +255,7 @@ Requires: %{name}-common = %{version}-%{release} %package libs Summary: Runtime libraries for %{name} Obsoletes: plasma-workspace < 5.4.2-2 -#Requires: %%{name}%%{?_isa} = %%{version}-%%{release} +#Requires: %%{name}% = %%{version}-%%{release} Requires: %{name}-common = %{version}-%{release} Provides: plasma-packagestructure = %{version}-%{release} @@ -257,8 +264,8 @@ Provides: plasma-packagestructure = %{version}-%{release} %package devel Summary: Development files for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: libkworkspace5%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Requires: libkworkspace5 = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -277,7 +284,7 @@ Documentation and user manuals for %{name}. %package geolocation Summary: Plasma5 geolocation components Obsoletes: plasma-workspace < 5.4.2-2 -Requires: %{name}-geolocation-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-geolocation-libs = %{version}-%{release} %description geolocation %{summary}. @@ -294,9 +301,9 @@ Requires: %{name}-geolocation = %{version}-%{release} Summary: Wayland support for Plasma Requires: %{name} = %{version}-%{release} Requires: kwin-wayland >= %{majmin_ver} -Requires: kwayland-integration%{?_isa} >= %{majmin_ver} +Requires: kwayland-integration >= %{majmin_ver} Requires: xorg-x11-server-Xwayland -Requires: qt5-qtwayland%{?_isa} +Requires: qt5-qtwayland Requires: qt5-qttools Recommends: xdg-desktop-portal-kde >= %{majmin_ver} @@ -307,7 +314,7 @@ Recommends: xdg-desktop-portal-kde >= %{majmin_ver} Summary: Xorg support for Plasma Obsoletes: %{name}-xorg < 5.20.90-2 Provides: %{name}-xorg = %{version}-%{release} -Provides: %{name}-xorg%{?_isa} = %{version}-%{release} +Provides: %{name}-xorg = %{version}-%{release} Obsoletes: %{name} < 5.19.5-2 Requires: %{name} = %{version}-%{release} Requires: kwin-x11 >= %{majmin_ver} @@ -321,8 +328,10 @@ Requires: xsetroot %prep %setup -q -%patch0 -p1 - +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 %build mkdir %{_target_platform} @@ -582,6 +591,9 @@ setsebool -P selinuxuser_execmod 1 %endif %changelog +* Tue Jan 09 2024 jiangxinyu - 5.27.10-1 +- Update package to version 5.27.10 + * Tue Aug 29 2023 misaka00251 - 5.27.6-1 - Upgrade to 5.27.6