diff --git a/plasma-workspace-6.1.5-backport-fix_wayland_session_restore_saving.patch b/plasma-workspace-6.1.5-backport-fix_wayland_session_restore_saving.patch deleted file mode 100644 index a267cb0..0000000 --- a/plasma-workspace-6.1.5-backport-fix_wayland_session_restore_saving.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fae71841ff018e34bbb02aa1098b53f63c1743d2 Mon Sep 17 00:00:00 2001 -From: Fushan Wen -Date: Tue, 17 Sep 2024 07:53:35 +0000 -Subject: [PATCH] startkde: Fix wayland session restore saving - -When we added manual saving support to plasma-shutdown a guard was -changed in the normal shutdown path. This guard was wrong, we want to -check we're in the restorePreviousLogout path here. - -This amends 804976c5ecec1fbf5f6e7e09970a8269bdf748d2 - -BUG: 436318 - - -(cherry picked from commit 4dff1973116597210cf9fb1c102e5c9433d13b1d) - -89ee67ad startkde: Fix wayland session restore saving - -Co-authored-by: David Edmundson ---- - startkde/plasma-shutdown/shutdown.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/startkde/plasma-shutdown/shutdown.cpp b/startkde/plasma-shutdown/shutdown.cpp -index 11c002bcd80..ab93cca6ef7 100644 ---- a/startkde/plasma-shutdown/shutdown.cpp -+++ b/startkde/plasma-shutdown/shutdown.cpp -@@ -84,7 +84,7 @@ void Shutdown::ksmServerComplete() - { - const KConfigGroup c(KSharedConfig::openConfig(QStringLiteral("ksmserverrc")), QStringLiteral("General")); - -- if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restoreSavedSession")) { -+ if (c.readEntry("loginMode", "restorePreviousLogout") == QLatin1String("restorePreviousLogout")) { - // Now record windows that are not session managed - int ret = QProcess::execute(QStringLiteral(PLASMA_FALLBACK_SESSION_SAVE_BIN)); - if (ret) { --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index ea7db14..6798b8d 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -1,8 +1,8 @@ %define plasmaver %(echo %version | cut -d. -f1-3) Name: plasma-workspace -Version: 6.1.5 -Release: 2mamba +Version: 6.2.0 +Release: 1mamba Summary: KDE Plasma Workspace Group: Graphical Desktop/Applications/Environment Vendor: openmamba @@ -20,7 +20,6 @@ Source7: openmambaLookAndFeel.sh Source8: openmamba-preview-light.png Source9: openmamba-preview-dark.png Patch1: plasma-workspace-5.25.4-hide-qtwindows-style.patch -Patch2: plasma-workspace-6.1.5-backport-fix_wayland_session_restore_saving.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -37,6 +36,7 @@ BuildRequires: libXrender-devel BuildRequires: libXtst-devel BuildRequires: libappstream-qt-devel BuildRequires: libcanberra-devel +BuildRequires: libdbus-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgcc @@ -91,15 +91,14 @@ BuildRequires: libkf6-prison-devel BuildRequires: libkf6-solid-devel BuildRequires: libkf6-sonnet-devel BuildRequires: libkf6-syntax-highlighting-devel -BuildRequires: libkpipewire-devel BuildRequires: libkscreen-devel BuildRequires: libkscreenlocker-devel BuildRequires: libksysguard-devel BuildRequires: libkwayland-devel BuildRequires: liblayer-shell-qt-devel BuildRequires: libnm-devel +BuildRequires: libpackagekitqt6-devel BuildRequires: libphonon-qt6-devel -BuildRequires: libpipewire-devel BuildRequires: libplasma-activities-devel BuildRequires: libplasma-activities-stats-devel BuildRequires: libplasma-devel @@ -119,6 +118,7 @@ BuildRequires: libz-devel BuildRequires: plasma5support-devel BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtpositioning-devel BuildRequires: qt6-qtsvg-devel BuildRequires: qt6-qtwayland-devel ## AUTOBUILDREQ-END @@ -197,7 +197,6 @@ openmamba theme for KDE Plasma. #-D -T #:<< __EOF %patch 1 -p1 -%patch 2 -p1 -b .backport-fix_wayland_session_restore_saving # From Fedora @@ -330,6 +329,7 @@ install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookA %{_datadir}/kio_desktop/directory.trash %{_datadir}/kio/servicemenus/installfont.desktop %{_datadir}/knotifications6/devicenotifications.notifyrc +%{_datadir}/knotifications6/donationmessage.notifyrc %{_datadir}/knotifications6/freespacenotifier.notifyrc %{_datadir}/knotifications6/phonon.notifyrc %{_datadir}/knsrcfiles/*.knsrc @@ -350,6 +350,7 @@ install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookA %{_datadir}/qlogging-categories6/*.categories %{_datadir}/solid/actions/openWithFileManager.desktop %{_datadir}/wayland-sessions/plasma.desktop +%{_datadir}/xdg-desktop-portal/kde-portals.conf %{_datadir}/xsessions/plasmax11.desktop %{_datadir}/zsh/site-functions/_* %{_datadir}/icons/hicolor/*/mimetypes/fonts-package.png @@ -366,6 +367,7 @@ install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookA %{_libdir}/libkfontinstui.so.* %{_libdir}/libkfontinst.so %{_libdir}/libkfontinstui.so +%{_libdir}/libklipper.so.* %{_libdir}/libkrdb.so %{_libdir}/libkmpris.so.* %{_libdir}/libkworkspace6.so.* @@ -433,6 +435,7 @@ install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookA %{_includedir}/taskmanager/* %{_libdir}/libbatterycontrol.so %{_libdir}/libcolorcorrect.so +%{_libdir}/libklipper.so %{_libdir}/libnotificationmanager.so %{_libdir}/libtaskmanager.so %{_libdir}/libweather_ion.so @@ -468,6 +471,9 @@ install -D -m0755 %{SOURCE7} %{buildroot}%{_datadir}/kconf_update/openmambaLookA %{_datadir}/kconf_update/openmambaLookAndFeel.* %changelog +* Fri Oct 11 2024 Automatic Build System 6.2.0-1mamba +- automatic version update by autodist + * Wed Sep 18 2024 Silvan Calarco 6.1.5-2mamba - backport upstream patch to fix session restore on wayland (https://bugs.kde.org/show_bug.cgi?id=436318 )