diff --git a/.gitignore b/.gitignore index 05fa49d..4f68f00 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /plasma-workspace-5.21.3.tar.xz /plasma-workspace-5.21.4.tar.xz /plasma-workspace-5.21.5.tar.xz +/plasma-workspace-5.21.90.tar.xz diff --git a/0279-startkde-Reset-systemd-failed-units-on-login.patch b/0279-startkde-Reset-systemd-failed-units-on-login.patch deleted file mode 100644 index db82c3b..0000000 --- a/0279-startkde-Reset-systemd-failed-units-on-login.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b0997076c194b1cb72fc4380c8ebbe67b0ebc58a Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Thu, 8 Apr 2021 11:59:44 +0100 -Subject: [PATCH 279/382] [startkde] Reset systemd failed units on login - -If a service has recently failed multiple times, systemd will (quite -cleverly) not restart it. This includes DBus activation so is indepdent -of the systemd boot. - -If a service gets into a broken state on a previous session where ithas -different environment variables and a different display server, we -shouldn't treat it as failed for a new session. - -This shouldn't be needed with the other recent fixes, but it seems like -a good practice nevertheless. - -Gnome are doing something similar: -https://gitlab.gnome.org/GNOME/gnome-session/-/blob/master/gnome-session/main.c#L565 ---- - startkde/startplasma.cpp | 12 ++++++++++++ - startkde/startplasma.h | 1 + - 2 files changed, 13 insertions(+) - -diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index 778242538..997f91e88 100644 ---- a/startkde/startplasma.cpp -+++ b/startkde/startplasma.cpp -@@ -447,6 +447,17 @@ QProcess *setupKSplash() - return p; - } - -+// If something went on an endless restart crash loop it will get blacklisted, as this is a clean login we will want to reset those counters -+// This is independent of whether we use the Plasma systemd boot -+void resetSystemdFailedUnits() -+{ -+ QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.systemd1"), -+ QStringLiteral("/org/freedesktop/systemd1"), -+ QStringLiteral("org.freedesktop.systemd1.Manager"), -+ QStringLiteral("ResetFailed")); -+ QDBusConnection::sessionBus().call(message); -+} -+ - bool hasSystemdService(const QString &serviceName) - { - auto msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.systemd1"), -@@ -489,6 +500,7 @@ bool useSystemdBoot() - - bool startPlasmaSession(bool wayland) - { -+ resetSystemdFailedUnits(); - OrgKdeKSplashInterface iface(QStringLiteral("org.kde.KSplash"), QStringLiteral("/KSplash"), QDBusConnection::sessionBus()); - iface.setStage(QStringLiteral("kinit")); - // finally, give the session control to the session manager -diff --git a/startkde/startplasma.h b/startkde/startplasma.h -index 5283ed8e2..40a78a0c2 100644 ---- a/startkde/startplasma.h -+++ b/startkde/startplasma.h -@@ -51,6 +51,7 @@ bool startPlasmaSession(bool wayland); - - void waitForKonqi(); - -+static void resetSystemdFailedUnits(); - static bool hasSystemdService(const QString &serviceName); - static bool useSystemdBoot(); - --- -2.31.1 - diff --git a/plasma-workspace-announce-buffer-types-available-on-thumbnails-elements.patch b/plasma-workspace-announce-buffer-types-available-on-thumbnails-elements.patch deleted file mode 100644 index 4911ffa..0000000 --- a/plasma-workspace-announce-buffer-types-available-on-thumbnails-elements.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 64db2f098f4fd015684605deb4fd8290cce16e29 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Wed, 5 May 2021 13:20:13 +0200 -Subject: [PATCH] Announce which buffer types are available on thumbnails - elements - -We recently changed it so kwin defaults to memptr because some clients -couldn't deal with dmabuf. We still want dmabuf to be used as it's less -stressful to the system and we support it just fine. ---- - libtaskmanager/declarative/pipewiresourcestream.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp -index 9acc562b1..0118b1c2b 100644 ---- a/libtaskmanager/declarative/pipewiresourcestream.cpp -+++ b/libtaskmanager/declarative/pipewiresourcestream.cpp -@@ -93,7 +93,9 @@ void PipeWireSourceStream::onStreamParamChanged(void *data, uint32_t id, const s - SPA_PARAM_BUFFERS_stride, - SPA_POD_CHOICE_RANGE_Int(stride, stride, INT32_MAX), - SPA_PARAM_BUFFERS_align, -- SPA_POD_Int(16)); -+ SPA_POD_Int(16), -+ SPA_PARAM_BUFFERS_dataType, -+ SPA_POD_Int((1 << SPA_DATA_MemPtr) | (1 << SPA_DATA_MemFd) | (1 << SPA_DATA_DmaBuf))); - pw_stream_update_params(pw->pwStream, ¶m, 1); - } - --- -GitLab diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 1bb70c0..f6366a0 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -2,7 +2,7 @@ # repo or arch where there's no package that would provide plasmashell #global bootstrap 1 -%global kf5_version_min 5.78.0 +%global kf5_version_min 5.82.0 # Control wayland by default %if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9) @@ -13,8 +13,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.21.5 -Release: 4%{?dist} +Version: 5.21.90 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -66,8 +66,6 @@ Patch105: plasma-workspace-5.7.3-folderview_layout.patch ## upstream Patches ## upstream Patches (master branch) -Patch0: plasma-workspace-announce-buffer-types-available-on-thumbnails-elements.patch -Patch279: 0279-startkde-Reset-systemd-failed-units-on-login.patch # udev BuildRequires: zlib-devel @@ -421,8 +419,6 @@ BuildArch: noarch %setup -q -a 20 ## upstream patches -%patch0 -p1 -%patch279 -p1 %patch100 -p1 -b .konsole-in-contextmenu # FIXME/TODO: it is unclear whether this is needed or even a good idea anymore -- rex @@ -726,6 +722,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Fri May 14 2021 Rex Dieter - 5.21.90-1 +- 5.21.90 + * Thu May 06 2021 Rex Dieter - 5.21.5-4 - Reset systemd failed units on login (master/ branch backport) - actually apply buffer types patch from -3 diff --git a/sources b/sources index a9eaf31..9e0f923 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408 SHA512 (breezetwilight-defaults) = f84d4543c0c42609f4f3300fd720ebfc60686c0e5f53a1695bea603876697dd7eb27399f705035b81ab4b5e5eeabec6569aeeff6100a96149f8a2921376ae223 SHA512 (breezetwilight-fullscreenpreview.jpg) = e9e60cbe450696d9d7ed1f5f30122150079f0b75106be3a52122a1c246dca66bd99b75be850434ec3ae37b003a51423d495a506d3e35f2e0a563be172dec1cdb SHA512 (breezetwilight-preview.png) = e625ebd61624a0ac45d80f274c7f6ed2f1dd3ac1f7d66cc2a72524545ca4fc7a3997dd90a57a506b4840978a47c5403630b65ea546d37ab1de165ebf013e8148 -SHA512 (plasma-workspace-5.21.5.tar.xz) = 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 +SHA512 (plasma-workspace-5.21.90.tar.xz) = 1c85ed9cbbd39037ad37ff923d9ca4715c45862b0359a95e633ba4c9e3bc39db900f2cffe1922534706eaef8e4d39292bbdaabba42ea48bd45270cc83138953f