kde-plasma/plasma-workspace: Backport 3 fixes from 6.1.5

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=450579
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=490569
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=491369

Set KFMIN=6.5.0 to be in sync with kde-plasma/kwin-6.1.4-r1.

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 159 insertions, 0 deletions

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch
new file mode 100644
index 000000000000..2cf7c959d996
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-1.patch
@@ -0,0 +1,39 @@
+From 9a294b8a91170ed2bd5c75a65c81fee7c58839d2 Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 9 Aug 2024 00:57:00 +0000
+Subject: [PATCH] applets/mediacontroller: use Play/Pause to control players
+
+Some players don't report updated CanPlay or CanPause properties to
+MPRIS, which is a problem for PlayPause() as it requires the player can
+play and pause at the same time. Use Play/Pause to work around it.
+
+CCBUG: 490569
+
+
+(cherry picked from commit c5edc144665a0d814a908ae6a120a288f7965d7d)
+
+Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
+---
+ applets/mediacontroller/package/contents/ui/main.qml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/applets/mediacontroller/package/contents/ui/main.qml b/applets/mediacontroller/package/contents/ui/main.qml
+index 885c972ae71..fa09d2a86c4 100644
+--- a/applets/mediacontroller/package/contents/ui/main.qml
++++ b/applets/mediacontroller/package/contents/ui/main.qml
+@@ -174,7 +174,11 @@ PlasmoidItem {
+         mpris2Model.currentPlayer.Pause();
+     }
+     function togglePlaying() {
+-        mpris2Model.currentPlayer.PlayPause();
++        if (root.isPlaying) {
++            mpris2Model.currentPlayer.Pause();
++        } else {
++            mpris2Model.currentPlayer.Play();
++        }
+     }
+     function stop() {
+         mpris2Model.currentPlayer.Stop();
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch
new file mode 100644
index 000000000000..e7bc079b6577
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-mediacontroller-2.patch
@@ -0,0 +1,46 @@
+From 1ff8f37f6a8fb47697364d56460989abbd764bbf Mon Sep 17 00:00:00 2001
+From: Fushan Wen <qydwhotmail@gmail.com>
+Date: Fri, 9 Aug 2024 00:57:31 +0000
+Subject: [PATCH] libkmpris: refresh player when track list changes
+
+For some players when the current track list changes, it doesn't emit
+all changed properties for org.mpris.MediaPlayer2.Player. This adds a
+check for the track list so when the track list changes, the player
+information is refreshed.
+
+BUG: 490569
+FIXED-IN: 6.1.5
+
+
+(cherry picked from commit 627f5418409f2e362fb83f6fdb6f427221460a0c)
+
+Co-authored-by: Fushan Wen <qydwhotmail@gmail.com>
+---
+ libkmpris/playercontainer.cpp | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/libkmpris/playercontainer.cpp b/libkmpris/playercontainer.cpp
+index f48103d507d..c8d37efae5e 100644
+--- a/libkmpris/playercontainer.cpp
++++ b/libkmpris/playercontainer.cpp
+@@ -711,15 +711,11 @@ void PlayerContainer::onGetPropsFinished(QDBusPendingCallWatcher *watcher)
+ 
+ void PlayerContainer::onPropertiesChanged(const QString &interfaceName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties)
+ {
+-    if (interfaceName != QLatin1String("org.mpris.MediaPlayer2.Player") && interfaceName != QLatin1String("org.mpris.MediaPlayer2")) {
+-        // org.mpris.MediaPlayer2.TrackList is ignored for now
+-        return;
+-    }
+-    if (!invalidatedProperties.empty()) {
++    if (!invalidatedProperties.empty() || interfaceName == u"org.mpris.MediaPlayer2.TrackList") {
+         disconnect(m_propsIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, this, &PlayerContainer::onPropertiesChanged);
+         disconnect(m_playerIface, &OrgMprisMediaPlayer2PlayerInterface::Seeked, this, &PlayerContainer::onSeeked);
+         refresh();
+-    } else {
++    } else if (interfaceName == u"org.mpris.MediaPlayer2.Player" || interfaceName == u"org.mpris.MediaPlayer2") [[likely]] {
+         updateFromMap(changedProperties);
+     }
+ }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch
new file mode 100644
index 000000000000..612dfb871a37
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-fix-svg-images.patch
@@ -0,0 +1,36 @@
+From ab80bee1724804650147a1c9485ee67ae4f42f83 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 12 Aug 2024 18:56:04 +0000
+Subject: [PATCH] Fix svg images
+
+Image delegate needs to be loaded also for ScalableImage
+
+BUG:491369
+
+
+(cherry picked from commit 1c6e817a476e76970437faa7fef1dbdc5d3be082)
+
+1c6e817a Fix svg images
+
+Co-authored-by: Marco Martin <notmart@gmail.com>
+---
+ wallpapers/image/imagepackage/contents/ui/ImageStackView.qml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml b/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml
+index 70545d8814e..bbf64138a4b 100644
+--- a/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml
++++ b/wallpapers/image/imagepackage/contents/ui/ImageStackView.qml
+@@ -43,7 +43,8 @@ QQC2.StackView {
+ 
+     function createBackgroundComponent() {
+         switch (mediaProxy.backgroundType) {
+-        case Wallpaper.BackgroundType.Image: {
++        case Wallpaper.BackgroundType.Image:
++        case Wallpaper.BackgroundType.VectorImage: {
+             if (!staticImageComponent) {
+                 staticImageComponent = Qt.createComponent("mediacomponent/StaticImageComponent.qml");
+             }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch
new file mode 100644
index 000000000000..a10a9a84078e
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-restart-unhide-timer-on-dnd.patch
@@ -0,0 +1,38 @@
+From 84d0555e4484cde0cfd41c63047b69381e511767 Mon Sep 17 00:00:00 2001
+From: Yifan Zhu <fanzhuyifan@gmail.com>
+Date: Wed, 7 Aug 2024 17:12:02 +0000
+Subject: [PATCH] shell/panelview: restart unhide timer on drag leave
+
+Otherwise the autohide and dodge windows panels don't rehide when
+leaving them during drag and drop.
+
+CCBUG: 450579
+
+
+(cherry picked from commit 72e963100eb630771a9f2b7ce57375a7ddc0f59f)
+
+Co-authored-by: Yifan Zhu <fanzhuyifan@gmail.com>
+---
+ shell/panelview.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/shell/panelview.cpp b/shell/panelview.cpp
+index 095315a8c85..5a88764cf3c 100644
+--- a/shell/panelview.cpp
++++ b/shell/panelview.cpp
+@@ -1194,8 +1194,11 @@ bool PanelView::event(QEvent *e)
+         }
+         break;
+     }
+-    // DragLeave just works
+     case QEvent::DragLeave:
++        m_containsMouse = false;
++        if (edgeActivated()) {
++            m_unhideTimer.start();
++        }
+         break;
+     case QEvent::DragMove: {
+         QDragMoveEvent *de = static_cast<QDragMoveEvent *>(e);
+-- 
+GitLab
+