public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/plasma-workspace] epel10: Merge branch f44 into epel10
Date: Thu, 30 Jul 2026 16:12:47 GMT	[thread overview]
Message-ID: <178542796777.1.9936168640132970165.rpms-plasma-workspace-4be77c3af810@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/plasma-workspace
Branch : epel10
Commit : 4be77c3af810eaa99a4486fc1811bd210405dcf6
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-30T09:12:28-07:00
Stats  : +228/-5 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/plasma-workspace/c/4be77c3af810eaa99a4486fc1811bd210405dcf6?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index 8f4a302..faff177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,10 @@
 /plasma-workspace-6.6.2.tar.xz.sig
 /plasma-workspace-6.6.3.tar.xz.sig
 /plasma-workspace-6.6.4.tar.xz.sig
+/plasma-workspace-6.6.5.tar.xz.sig
+/plasma-workspace-6.6.90.tar.xz.sig
+/plasma-workspace-6.6.91.tar.xz.sig
+/plasma-workspace-6.7.0.tar.xz.sig
+/plasma-workspace-6.7.1.tar.xz.sig
+/plasma-workspace-6.7.2.tar.xz.sig
+/plasma-workspace-6.7.3.tar.xz.sig

diff --git a/6601.patch b/6601.patch
new file mode 100644
index 0000000..b46b5f5
--- /dev/null
+++ b/6601.patch
@@ -0,0 +1,32 @@
+From 04ff1ad223e4efe8f21bd391e81c0f96f6021df9 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa@kde.org>
+Date: Sat, 16 May 2026 16:24:55 -0400
+Subject: [PATCH] sddm-wayland-session: Correctly install to
+ /usr/lib/sddm/sddm.conf.d
+
+The previous attempt to install there incorrectly uses the KDE_INSTALL_LIBDIR
+variable from ECM, which nearly never matches the correct base directory for SDDM
+on 64-bit systems. Instead, explicitly set the directory correctly so that it
+always works properly.
+
+Fixes: 8a9fdb7dac6fb06f6d692e53206a6be4ff337a54 ("sddm-wayland-session: install to KDE_INSTALL_LIBDIR")
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b6de1902c..5d3ff4b79c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,7 +389,7 @@ add_subdirectory(login-sessions)
+ add_subdirectory(lookandfeel)
+ 
+ if (INSTALL_SDDM_WAYLAND_SESSION)
+-    install(FILES sddm-wayland-session/plasma-wayland.conf DESTINATION ${KDE_INSTALL_LIBDIR}/sddm/sddm.conf.d)
++    install(FILES sddm-wayland-session/plasma-wayland.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d)
+ else()
+     message(STATUS "INSTALL_SDDM_WAYLAND_SESSION is disabled. As soon as it's installed, SDDM will default to use Wayland and KWin for its greeter session (BETA, do not deploy to final users yet).")
+ endif()
+-- 
+GitLab
+

diff --git a/6615.patch b/6615.patch
new file mode 100644
index 0000000..d02c8d1
--- /dev/null
+++ b/6615.patch
@@ -0,0 +1,66 @@
+From 4c80f4bde8de04199719b7e5d9b068a9d73ba7bf Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Mon, 18 May 2026 20:13:56 +0200
+Subject: [PATCH] libnotificationmanager: Return something of the correct type
+ for most roles
+
+Qt doesn't like the model not return anything (empty QVariant) when
+put in a required property for a model. For example required property string
+will happily convert to "undefined" as a string which then blows up in
+client code left and right.
+
+Therefore, return something of the correct type for most job properties.
+
+See also 1f246410 which addressed this in one case but seems Qt 6.11.1
+changed it again to be broken in more places.
+
+BUG: 520120
+---
+ libnotificationmanager/jobsmodel.cpp | 29 ++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/libnotificationmanager/jobsmodel.cpp b/libnotificationmanager/jobsmodel.cpp
+index 4bc820288f..459a7c639d 100644
+--- a/libnotificationmanager/jobsmodel.cpp
++++ b/libnotificationmanager/jobsmodel.cpp
+@@ -145,8 +145,37 @@ QVariant JobsModel::data(const QModelIndex &index, int role) const
+     // There's hardly a reason why it should show up as "unread".
+     case Notifications::ReadRole:
+         return true;
++
++    // Qt doesn't like the model not returning anything, for example
++    // casting it to  "undefined" as a string (when put in a required property string)
++    // blowing up in client code left and right.
++    case Notifications::NotifyRcNameRole:
++    case Notifications::OriginNameRole:
++    case Notifications::DefaultActionLabelRole:
++    case Notifications::ConfigureActionLabelRole:
++    case Notifications::ReplyActionLabelRole:
++    case Notifications::ReplyPlaceholderTextRole:
++    case Notifications::ReplySubmitButtonTextRole:
++    case Notifications::ReplySubmitButtonIconNameRole:
++    case Notifications::CategoryRole:
++        return QString();
++
++    case Notifications::ActionNamesRole:
+     case Notifications::ActionLabelsRole:
+         return QStringList();
++
++    case Notifications::HasDefaultActionRole:
++    case Notifications::ResidentRole:
++    case Notifications::TransientRole:
++    case Notifications::UserActionFeedbackRole:
++    case Notifications::HasReplyActionRole:
++        return false;
++
++    case Notifications::UrlsRole:
++        return QVariant::fromValue(QList<QUrl>());
++
++    case Notifications::UrgencyRole:
++        return Notifications::NormalUrgency;
+     }
+ 
+     return {};
+-- 
+GitLab
+

diff --git a/6819.patch b/6819.patch
new file mode 100644
index 0000000..1f09c65
--- /dev/null
+++ b/6819.patch
@@ -0,0 +1,80 @@
+From 83a439f0bc61811e450bc00ed28d1b964a1e1901 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 3 Jul 2026 11:29:59 +0000
+Subject: [PATCH] libtaskmanager: Limit launching new instances where service
+ files do not exist
+
+Libtaskmanager is full of legacy code to handle applications not
+providing application IDs and having workarounds for them.
+
+This includes providing a "Open a New Window" entry for most
+applications unless explicitly inhibited. Where a matching .desktop is
+found the Exec line from there is used otherwise there is a fallback to
+launch the same binary again.
+
+This latter fallback is not very sandbox aware and could be exploited to
+launch a different binary on the host. It's not especially exploitable,
+it relies on the user clicking an action, but we should close it anyway.
+
+
+(cherry picked from commit 7ff209fa1511df6161466d056d0a8d63930c2b66)
+
+Co-authored-by: David Edmundson <kde@davidedmundson.co.uk>
+---
+ libtaskmanager/tasktools.cpp | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/libtaskmanager/tasktools.cpp b/libtaskmanager/tasktools.cpp
+index 62680bc263..57ca8c4fe4 100644
+--- a/libtaskmanager/tasktools.cpp
++++ b/libtaskmanager/tasktools.cpp
+@@ -631,15 +631,6 @@ void runApp(const AppData &appData, const QList<QUrl> &urls)
+             job->start();
+ 
+             KActivities::ResourceInstance::notifyAccessed(QUrl(QString(u"applications:" + service->storageId())), QStringLiteral("org.kde.libtaskmanager"));
+-        } else {
+-            auto *job = new KIO::OpenUrlJob(appData.url);
+-            job->setUiDelegate(new KNotificationJobUiDelegate(KJobUiDelegate::AutoErrorHandlingEnabled));
+-            job->setRunExecutables(true);
+-            job->start();
+-
+-            if (!appData.id.isEmpty()) {
+-                KActivities::ResourceInstance::notifyAccessed(QUrl(QString(u"applications:" + appData.id)), QStringLiteral("org.kde.libtaskmanager"));
+-            }
+         }
+     }
+ }
+@@ -657,7 +648,21 @@ bool canLauchNewInstance(const AppData &appData)
+         desktopEntry.chop(8);
+     }
+ 
+-    const KService::Ptr service = KService::serviceByDesktopName(desktopEntry);
++    KService::Ptr service;
++
++    // applications: URLs are used to refer to applications by their KService::menuId
++    // (i.e. .desktop file name) rather than the absolute path to a .desktop file.
++    if (appData.url.scheme() == QLatin1String("applications")) {
++        service = KService::serviceByMenuId(appData.url.path());
++    } else if (appData.url.scheme() == QLatin1String("preferred")) {
++        service = KService::serviceByStorageId(defaultApplication(appData.url));
++    } else {
++        service = KService::serviceByDesktopPath(appData.url.toLocalFile());
++    }
++
++    if (!service) {
++        return false;
++    }
+ 
+     if (service) {
+         if (service->noDisplay()) {
+@@ -686,7 +691,6 @@ bool canLauchNewInstance(const AppData &appData)
+             }
+         }
+     }
+-
+     return true;
+ }
+ }
+-- 
+GitLab
+

diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 4c38f65..7030a0c 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -2,7 +2,7 @@
 
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
-Version: 6.6.4
+Version: 6.7.3
 Release: 1%{?dist}
 
 # Automatically converted from old format: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT - review is highly recommended.
@@ -434,8 +434,8 @@ ln -sr %{buildroot}%{_kf6_bindir}/startplasma-wayland %{buildroot}%{_kf6_bindir}
 sed -E 's| \(.*\)||g' -i %{buildroot}%{_datadir}/wayland-sessions/plasma.desktop
 
 # move sddm configuration snippet to the right place
-mkdir -p %{buildroot}%{_prefix}/lib/sddm
-mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm
+#mkdir -p %{buildroot}%{_prefix}/lib/sddm
+#mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm
 
 ## customize plasma-lookandfeel-fedora defaults
 # from [Wallpaper] Image=Next to Image=Fedora
@@ -481,6 +481,8 @@ fi
 
 %files -f %{name}.lang
 %{_libexecdir}/ksecretprompter
+%{_libexecdir}/plasma-startup-sound
+%{_kf6_datadir}/xdg-desktop-portal/portals/plasmanotify.portal
 %{_kf6_datadir}/applications/org.kde.baloorunner.desktop
 %{_kf6_datadir}/applications/org.kde.secretprompter.desktop
 %{_kf6_datadir}/xdg-desktop-portal/kde-portals.conf
@@ -661,6 +663,42 @@ fi
 
 
 %changelog
+* Tue Jul 14 2026 Steve Cossette <farchord@gmail.com> - 6.7.3-1
+- 6.7.3
+
+* Sat Jul 04 2026 Steve Cossette <farchord@gmail.com> - 6.7.2-2
+- Fix an issue for a sandbox escape vuln
+
+* Wed Jul 01 2026 Steve Cossette <farchord@gmail.com> - 6.7.2-1
+- 6.7.2
+
+* Tue Jun 23 2026 Steve Cossette <farchord@gmail.com> - 6.7.1-1
+- 6.7.1
+
+* Thu Jun 11 2026 Steve Cossette <farchord@gmail.com> - 6.7.0-1
+- 6.7.0
+
+* Mon Jun 08 2026 František Zatloukal <fzatlouk@redhat.com> - 6.6.91-2
+- Rebuilt for icu 78.3
+
+* Fri May 29 2026 Steve Cossette <farchord@gmail.com> - 6.6.91-1
+- 6.6.91
+
+* Sat May 16 2026 Steve Cossette <farchord@gmail.com> - 6.6.90-1
+- 6.6.90
+
+* Mon May 18 2026 Steve Cossette <farchord@gmail.com> - 6.6.5-2
+- Fix for notifications being partially broken since Qt 6.11.1
+
+* Thu May 14 2026 Steve Cossette <farchord@gmail.com> - 6.6.5-1
+- 6.6.5
+
+* Thu May 14 2026 Jan Grulich <jgrulich@redhat.com> - 6.6.4-3
+- Rebuild (qt6)
+
+* Thu Apr 16 2026 Jan Grulich <jgrulich@redhat.com> - 6.6.4-2
+- Rebuild (qt6)
+
 * Fri Apr 10 2026 Steve Cossette <farchord@gmail.com> - 6.6.4-1
 - 6.6.4
 

diff --git a/sources b/sources
index fa0c5f7..a1e78e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (plasma-workspace-6.6.4.tar.xz) = 52040f299962d5471c32a30e5d27c739608fe677bd262c5ec9377044c5dddd41629521a825214a33fc20e16c2e0d1737e6c5ef5fdc722fb13665721d8117be9a
-SHA512 (plasma-workspace-6.6.4.tar.xz.sig) = 990749027d68e8e45694dc2b10ce4eff27d3aac6effab6142981d5368234d3bfbdc90a4464520092abd84ab667d198c7fccb0f5dc838d03db93c128884982637
+SHA512 (plasma-workspace-6.7.3.tar.xz) = bb43420d66ef36c17af16be853e37b7ecf66e70327f4a6cb96d9502939991062c975cb883eb05be982c74296688f4b5493669add44ff5c7663998299dd2db998
+SHA512 (plasma-workspace-6.7.3.tar.xz.sig) = 7d650ee6f8b28293f5568cd97e2e89570023493ca4e68e4558c58799c28fb0feb184da797d96e173b79160e4c5e3f4380a1b04890ae7b83918df46653f797f83

                 reply	other threads:[~2026-07-30 16:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178542796777.1.9936168640132970165.rpms-plasma-workspace-4be77c3af810@fedoraproject.org \
    --to=tdawson@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox