gentoo resync : 20.03.2022

7 files changed, 0 insertions, 557 deletions

diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
deleted file mode 100644
index 8fb393a568d6..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-fix-centered-text.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 92ac1038cff333d70a71331b2a5fa0b9d91bc39d Mon Sep 17 00:00:00 2001
-From: Eugene Popov <popov895@ukr.net>
-Date: Fri, 19 Nov 2021 11:13:03 +0000
-Subject: [PATCH] Fix IconLabel
-
----
- .../plasmacomponents3/private/IconLabel.qml   | 97 +++++++++++--------
- 1 file changed, 55 insertions(+), 42 deletions(-)
-
-diff --git a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-index 467c2f54b..74a8ff3a5 100644
---- a/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-+++ b/src/declarativeimports/plasmacomponents3/private/IconLabel.qml
-@@ -24,49 +24,62 @@ T.Control {
-     PlasmaCore.ColorScope.inherit: true
-     implicitWidth: implicitContentWidth + leftPadding + rightPadding
-     implicitHeight: implicitContentHeight + topPadding + bottomPadding
--    contentItem: GridLayout {
--        rowSpacing: root.spacing
--        columnSpacing: root.spacing
--        flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
--        PlasmaCore.IconItem {
--            id: iconItem
--            visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
--            colorGroup: root.PlasmaCore.ColorScope.colorGroup
--            implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
--            implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
--            Layout.fillWidth: true
--            Layout.fillHeight: true
--            Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
--            Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
--            Layout.alignment: if (root.textBesideIcon) {
--                Qt.AlignRight | Qt.AlignVCenter
--            } else if (root.textUnderIcon) {
--                Qt.AlignHCenter | Qt.AlignBottom
--            } else {
--                Qt.AlignCenter
-+    contentItem: Item {
-+        implicitWidth: gridLayout.implicitWidth
-+        implicitHeight: gridLayout.implicitHeight
-+        GridLayout {
-+            id: gridLayout
-+            rowSpacing: root.spacing
-+            columnSpacing: root.spacing
-+            flow: root.display === T.AbstractButton.TextUnderIcon ? GridLayout.TopToBottom : GridLayout.LeftToRight
-+            x: {
-+                if (root.alignment & Qt.AlignLeft) {
-+                    return 0;
-+                }
-+                if (root.alignment & Qt.AlignRight) {
-+                    return parent.width - width;
-+                }
-+                return Math.round((parent.width - width) / 2);
-             }
--        }
--        T.Label {
--            id: label
--            visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
--            palette: root.palette
--            font: root.font
--            horizontalAlignment: root.alignment & Qt.AlignHorizontal_Mask || Text.AlignHCenter
--            verticalAlignment: root.alignment & Qt.AlignVertical_Mask || Text.AlignVCenter
--            // Work around Qt bug where NativeRendering breaks for non-integer scale factors
--            // https://bugreports.qt.io/browse/QTBUG-70481
--            renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
--            color: PlasmaCore.ColorScope.textColor
--            linkColor: PlasmaCore.Theme.linkColor
--            elide: Text.ElideRight
--            Layout.fillWidth: root.alignment & Qt.AlignHorizontal_Mask
--            Layout.fillHeight: root.alignment & Qt.AlignVertical_Mask
--            Layout.alignment: if (root.textBesideIcon) {
--                Qt.AlignLeft | Qt.AlignVCenter
--            } else if (root.textUnderIcon) {
--                Qt.AlignHCenter | Qt.AlignTop
--            } else {
--                Qt.AlignCenter
-+            y: {
-+                if (root.alignment & Qt.AlignTop) {
-+                    return 0;
-+                }
-+                if (root.alignment & Qt.AlignBottom) {
-+                    return parent.height - height;
-+                }
-+                return Math.round((parent.height - height) / 2);
-+            }
-+            width: Math.min(parent.width, implicitWidth)
-+            height: Math.min(parent.height, implicitHeight)
-+            PlasmaCore.IconItem {
-+                id: iconItem
-+                visible: valid && width > 0 && height > 0 && root.display !== T.AbstractButton.TextOnly
-+                colorGroup: root.PlasmaCore.ColorScope.colorGroup
-+                implicitWidth: PlasmaCore.Units.iconSizes.sizeForLabels
-+                implicitHeight: PlasmaCore.Units.iconSizes.sizeForLabels
-+                Layout.alignment: Qt.AlignCenter
-+                Layout.maximumWidth: implicitWidth > 0 ? implicitWidth : Number.POSITIVE_INFINITY
-+                Layout.maximumHeight: implicitHeight > 0 ? implicitHeight : Number.POSITIVE_INFINITY
-+            }
-+            T.Label {
-+                id: label
-+                visible: text.length > 0 && root.display !== T.AbstractButton.IconOnly
-+                palette: root.palette
-+                font: root.font
-+                // Work around Qt bug where NativeRendering breaks for non-integer scale factors
-+                // https://bugreports.qt.io/browse/QTBUG-70481
-+                renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering : Text.NativeRendering
-+                color: PlasmaCore.ColorScope.textColor
-+                linkColor: PlasmaCore.Theme.linkColor
-+                elide: Text.ElideRight
-+                Layout.alignment: Qt.AlignCenter
-+                Layout.fillWidth: {
-+                    if (!iconItem.visible || parent.flow === GridLayout.TopToBottom) {
-+                        return implicitWidth > parent.width;
-+                    }
-+                    return iconItem.implicitWidth + parent.columnSpacing + implicitWidth > parent.width;
-+                }
-             }
-         }
-     }
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch b/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
deleted file mode 100644
index d1e6f37d8a2b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-fix-misrenderings-with-transparency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6176d8ef8f36290075c5bd8932d623e68468a1cd Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Tue, 16 Nov 2021 11:05:17 +0100
-Subject: [PATCH] Do updateTheme after QQuickWindow::event
-
-doing updatetheme there will ensure that the window size is correct,
-so then when the surface commit will happen, we'll have the blur
-and contrast regions wit hthe proper geometry
-
-BUG:305247
----
- src/plasmaquick/dialog.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index eac7d432a..343bfe4c0 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -1243,10 +1243,12 @@ bool Dialog::event(QEvent *event)
-         // sometimes non null regions arrive even for non visible windows
-         // for which surface creation would fail
-         if (!d->shellSurface && isVisible()) {
-+            const bool ret = QQuickWindow::event(event);
-             KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
-             d->setupWaylandIntegration();
-             d->updateVisibility(true);
-             d->updateTheme();
-+            return ret;
-         }
- #endif
-     } else if (event->type() == QEvent::PlatformSurface) {
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch b/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
deleted file mode 100644
index 0631155c89bf..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-make-OSD-an-actual-wayland-OSD.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2ba1b0b642d540f74f0e21e7aaa272644ea4eda5 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 8 Nov 2021 16:12:38 +0000
-Subject: [PATCH] make the OSD an actual wayland OSD
-
-when the OnScreenDisplay type is set, set it on the plasma shell surface
-so KWin can actually treat it as such
-
-CCBUG:428859
----
- src/plasmaquick/dialog.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 4cea3a28e..3254b8320 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -736,6 +736,13 @@ void DialogPrivate::applyType()
-         if (!wmType) {
-             KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
-         }
-+#if HAVE_KWAYLAND
-+        if (type == Dialog::OnScreenDisplay) {
-+            if (shellSurface) {
-+                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::OnScreenDisplay);
-+            }
-+        }
-+#endif
-     } else {
-         q->setFlags(Qt::FramelessWindowHint | q->flags());
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch b/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch
deleted file mode 100644
index d3a03411b2cf..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-no-double-delete.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9b37459570f75e09f17aadf32f7abfe8b8d4d1e0 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 4 Dec 2021 17:16:30 +0800
-Subject: [PATCH] wallpaperinterface: Don't double delete action
-
-`removeAction` already deletes the action, it makes no sense to delete
-the action again and will crash plasmashell.
-
-CCBUG: 446195
----
- src/scriptengines/qml/plasmoid/wallpaperinterface.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-index 570cf8e45..65adf838e 100644
---- a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-@@ -229,7 +229,6 @@ void WallpaperInterface::removeAction(const QString &name)
- 
-     if (action) {
-         m_actions->removeAction(action);
--        delete action;
-     }
-     setProperty("contextualActions", QVariant::fromValue(contextualActions()));
- }
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch b/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch
deleted file mode 100644
index 07d25c836bbf..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-From fe9e118ff2212d48a0ea5fcc0346d6312978f3ed Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 29 Nov 2021 14:40:38 +0000
-Subject: [PATCH] Reload shared renderers when a file changed on disk
-
-When we have to render a new pixmap, compare the file date with the date of the last time the file was cached. if the dates are different (not only older, in order to allow downgrades) then force the svg renderer to be reloaded from the new file, otherwise the renderer with the old file still loaded will save in cache old graphics with the id derived from the date of the new file, causing a wrong cache entry
-
-BUG:445516
----
- src/plasma/private/svg_p.h |  15 +++++-
- src/plasma/svg.cpp         | 100 +++++++++++++++++++++++++++----------
- 2 files changed, 86 insertions(+), 29 deletions(-)
-
-diff --git a/src/plasma/private/svg_p.h b/src/plasma/private/svg_p.h
-index 11b68f21c..d39f274b4 100644
---- a/src/plasma/private/svg_p.h
-+++ b/src/plasma/private/svg_p.h
-@@ -30,8 +30,14 @@ public:
- 
-     SharedSvgRenderer(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements, QObject *parent = nullptr);
- 
-+    void reload();
-+
- private:
-     bool load(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements);
-+
-+    QString m_filename;
-+    QString m_styleSheet;
-+    QHash<QString, QRectF> m_interestingElements;
- };
- 
- class SvgPrivate
-@@ -125,9 +131,8 @@ public:
-     bool findElementRect(SvgPrivate::CacheId cacheId, QRectF &rect);
-     bool findElementRect(uint id, const QString &filePath, QRectF &rect);
- 
--    void loadImageFromCache(const QString &path, uint lastModified);
-+    bool loadImageFromCache(const QString &path, uint lastModified);
-     void dropImageFromCache(const QString &path);
--    void expireCache(const QString &path);
- 
-     void setNaturalSize(const QString &path, qreal scaleFactor, const QSizeF &size);
-     QSizeF naturalSize(const QString &path, qreal scaleFactor);
-@@ -140,10 +145,15 @@ public:
- 
-     QStringList cachedKeysForPath(const QString &path) const;
- 
-+    unsigned int lastModifiedTimeFromCache(const QString &filePath);
-+
-     void updateLastModified(const QString &filePath, unsigned int lastModified);
- 
-     static const uint s_seed;
- 
-+Q_SIGNALS:
-+    void lastModifiedChanged(const QString &filePath, unsigned int lastModified);
-+
- private:
-     QTimer *m_configSyncTimer = nullptr;
-     QString m_iconThemePath;
-@@ -156,6 +166,7 @@ private:
-     QHash<uint, QRectF> m_localRectCache;
-     QHash<QString, QSet<unsigned int>> m_invalidElements;
-     QHash<QString, QList<QSize>> m_sizeHintsForId;
-+    QHash<QString, unsigned int> m_lastModifiedTimes;
- };
- }
- 
-diff --git a/src/plasma/svg.cpp b/src/plasma/svg.cpp
-index 1749381b7..47cf142e1 100644
---- a/src/plasma/svg.cpp
-+++ b/src/plasma/svg.cpp
-@@ -73,6 +73,9 @@ SharedSvgRenderer::SharedSvgRenderer(const QString &filename, const QString &sty
-     if (!file.open(QIODevice::ReadOnly)) {
-         return;
-     }
-+    m_filename = filename;
-+    m_styleSheet = styleSheet;
-+    m_interestingElements = interestingElements;
-     load(file.readAll(), styleSheet, interestingElements);
- }
- 
-@@ -82,6 +85,16 @@ SharedSvgRenderer::SharedSvgRenderer(const QByteArray &contents, const QString &
-     load(contents, styleSheet, interestingElements);
- }
- 
-+void SharedSvgRenderer::reload()
-+{
-+    KCompressionDevice file(m_filename, KCompressionDevice::GZip);
-+    if (!file.open(QIODevice::ReadOnly)) {
-+        return;
-+    }
-+
-+    load(file.readAll(), m_styleSheet, m_interestingElements);
-+}
-+
- bool SharedSvgRenderer::load(const QByteArray &contents, const QString &styleSheet, QHash<QString, QRectF> &interestingElements)
- {
-     // Apply the style sheet.
-@@ -161,21 +174,31 @@ void SvgRectsCache::insert(Plasma::SvgPrivate::CacheId cacheId, const QRectF &re
- 
- void SvgRectsCache::insert(uint id, const QString &filePath, const QRectF &rect, unsigned int lastModified)
- {
--    if (m_localRectCache.contains(id)) {
-+    const unsigned int savedTime = lastModifiedTimeFromCache(filePath);
-+
-+    if (savedTime == lastModified && m_localRectCache.contains(id)) {
-         return;
-     }
- 
-     m_localRectCache.insert(id, rect);
- 
-+
-     KConfigGroup imageGroup(m_svgElementsCache, filePath);
--    imageGroup.writeEntry("LastModified", lastModified);
-+
-     if (rect.isValid()) {
-         imageGroup.writeEntry(QString::number(id), rect);
-     } else {
-         m_invalidElements[filePath] << id;
-         imageGroup.writeEntry("Invalidelements", m_invalidElements[filePath].values());
-     }
-+
-     QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-+
-+    if (savedTime != lastModified) {
-+        m_lastModifiedTimes[filePath] = lastModified;
-+        imageGroup.writeEntry("LastModified", lastModified);
-+        Q_EMIT lastModifiedChanged(filePath, lastModified);
-+    }
- }
- 
- bool SvgRectsCache::findElementRect(Plasma::SvgPrivate::CacheId cacheId, QRectF &rect)
-@@ -201,20 +224,21 @@ bool SvgRectsCache::findElementRect(uint id, const QString &filePath, QRectF &re
-     return true;
- }
- 
--void SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
-+bool SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
- {
-     if (path.isEmpty()) {
--        return;
-+        return false;
-     }
- 
-     KConfigGroup imageGroup(m_svgElementsCache, path);
- 
--    unsigned int savedTime = imageGroup.readEntry("LastModified", 0);
-+    unsigned int savedTime = lastModifiedTimeFromCache(path);
- 
--    if (lastModified > savedTime) {
-+    // Reload even if is older, to support downgrades
-+    if (lastModified != savedTime) {
-         imageGroup.deleteGroup();
-         QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
--        return;
-+        return false;
-     }
- 
-     auto &elements = m_invalidElements[path];
-@@ -231,6 +255,7 @@ void SvgRectsCache::loadImageFromCache(const QString &path, uint lastModified)
-             }
-         }
-     }
-+    return true;
- }
- 
- void SvgRectsCache::dropImageFromCache(const QString &path)
-@@ -302,22 +327,6 @@ void SvgRectsCache::setIconThemePath(const QString &path)
-     QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
- }
- 
--void SvgRectsCache::expireCache(const QString &path)
--{
--    KConfigGroup imageGroup(m_svgElementsCache, path);
--
--    unsigned int savedTime = imageGroup.readEntry("LastModified", QDateTime().toSecsSinceEpoch());
--    QFileInfo info(path);
--    if (info.exists()) {
--        unsigned int lastModified = info.lastModified().toSecsSinceEpoch();
--        if (lastModified <= savedTime) {
--            return;
--        }
--    }
--
--    imageGroup.deleteGroup();
--}
--
- void SvgRectsCache::setNaturalSize(const QString &path, qreal scaleFactor, const QSizeF &size)
- {
-     KConfigGroup imageGroup(m_svgElementsCache, path);
-@@ -349,11 +358,30 @@ QStringList SvgRectsCache::cachedKeysForPath(const QString &path) const
-     return filtered;
- }
- 
-+unsigned int SvgRectsCache::lastModifiedTimeFromCache(const QString &filePath)
-+{
-+    const auto &i = m_lastModifiedTimes.constFind(filePath);
-+    if (i != m_lastModifiedTimes.constEnd()) {
-+        return i.value();
-+    }
-+
-+    KConfigGroup imageGroup(m_svgElementsCache, filePath);
-+    const unsigned int savedTime = imageGroup.readEntry("LastModified", 0);
-+    m_lastModifiedTimes[filePath] = savedTime;
-+    return savedTime;
-+}
-+
- void SvgRectsCache::updateLastModified(const QString &filePath, unsigned int lastModified)
- {
-     KConfigGroup imageGroup(m_svgElementsCache, filePath);
--    imageGroup.writeEntry("LastModified", lastModified);
--    QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-+    const unsigned int savedTime = lastModifiedTimeFromCache(filePath);
-+
-+    if (savedTime != lastModified) {
-+        m_lastModifiedTimes[filePath] = lastModified;
-+        imageGroup.writeEntry("LastModified", lastModified);
-+        QMetaObject::invokeMethod(m_configSyncTimer, qOverload<>(&QTimer::start));
-+        Q_EMIT lastModifiedChanged(filePath, lastModified);
-+    }
- }
- 
- SvgPrivate::SvgPrivate(Svg *svg)
-@@ -463,7 +491,17 @@ bool SvgPrivate::setImagePath(const QString &imagePath)
- 
-     lastModified = lastModifiedDate.toSecsSinceEpoch();
- 
--    SvgRectsCache::instance()->loadImageFromCache(path, lastModified);
-+    const bool imageWasCached = SvgRectsCache::instance()->loadImageFromCache(path, lastModified);
-+
-+    if (!imageWasCached) {
-+        auto i = s_renderers.constBegin();
-+        while (i != s_renderers.constEnd()) {
-+            if (i.key().contains(path)) {
-+                i.value()->reload();
-+            }
-+            i++;
-+        }
-+    }
- 
-     // check if svg wants colorscheme applied
-     checkColorHints();
-@@ -552,7 +590,8 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, qreal ratio, const QSi
-     const QString id = cachePath(actualElementId, size);
- 
-     QPixmap p;
--    if (cacheRendering && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
-+    if (cacheRendering && lastModified == SvgRectsCache::instance()->lastModifiedTimeFromCache(path)
-+        && cacheAndColorsTheme()->findInCache(id, p, lastModified)) {
-         p.setDevicePixelRatio(ratio);
-         // qCDebug(LOG_PLASMA) << "found cached version of " << id << p.size();
-         return p;
-@@ -845,6 +884,13 @@ Svg::Svg(QObject *parent)
-     : QObject(parent)
-     , d(new SvgPrivate(this))
- {
-+    connect(SvgRectsCache::instance(), &SvgRectsCache::lastModifiedChanged,
-+            this, [this] (const QString &filePath, unsigned int lastModified) {
-+                if (d->lastModified != lastModified && filePath == d->path) {
-+                    d->lastModified = lastModified;
-+                    Q_EMIT repaintNeeded();
-+                }
-+            });
- }
- 
- Svg::~Svg()
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch b/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
deleted file mode 100644
index f735b392667b..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9ba4ed4da72a3d1bbec8920d93a547cf633cfacd Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Wed, 10 Nov 2021 15:50:10 +0100
-Subject: [PATCH] smaller mask to hide glitches
-
-This makes the mask slightly maller than the frame. Since the svg will have antialiasing and the mask not,
-there will be artifacts at the corners, if they go under the svg they're less evident
-
-CCBUG:438644
----
- src/plasmaquick/dialog.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 3254b8320..6b3963303 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -237,14 +237,19 @@ void DialogPrivate::updateTheme()
-             frameSvgItem->setImagePath(prefix + QStringLiteral("dialogs/background"));
-         }
- 
--        KWindowEffects::enableBlurBehind(q, theme.blurBehindEnabled(), frameSvgItem->mask());
-+        // This makes the mask slightly maller than the frame. Since the svg will have antialiasing and the mask not,
-+        // there will be artifacts at the corners, if they go under the svg they're less evident
-+        frameSvgItem->frameSvg()->resizeFrame(q->size() - QSize(2,2));
-+        const QRegion mask = frameSvgItem->frameSvg()->mask().translated(1,1);
-+        KWindowEffects::enableBlurBehind(q, theme.blurBehindEnabled(), mask);
- 
-         KWindowEffects::enableBackgroundContrast(q,
-                                                  theme.backgroundContrastEnabled(),
-                                                  theme.backgroundContrast(),
-                                                  theme.backgroundIntensity(),
-                                                  theme.backgroundSaturation(),
--                                                 frameSvgItem->mask());
-+                                                 mask);
-+        frameSvgItem->frameSvg()->resizeFrame(q->size());
- 
-         if (KWindowSystem::compositingActive()) {
-             if (hasMask) {
--- 
-GitLab
-
diff --git a/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch b/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch
deleted file mode 100644
index a30e9b6e5b1d..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.88.0-update-after-clearing-actions.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 77fedf1f9919eb2cc07c8ecccdd70ad2a7343161 Mon Sep 17 00:00:00 2001
-From: Fushan Wen <qydwhotmail@gmail.com>
-Date: Sat, 4 Dec 2021 18:08:43 +0800
-Subject: [PATCH] wallpaperinterface: Update "contextualActions" after clearing
- actions
-
-After clearing the entire action collection, "contextualActions" needs
-to be updated to remove invalid action pointers.
-
-BUG: 446195
----
- src/scriptengines/qml/plasmoid/wallpaperinterface.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-index 65adf838e..49bdb9512 100644
---- a/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-+++ b/src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
-@@ -115,6 +115,7 @@ void WallpaperInterface::syncWallpaperPackage()
-     }
- 
-     m_actions->clear();
-+    setProperty("contextualActions", QVariant::fromValue(contextualActions()));
-     m_pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/Wallpaper"));
-     m_pkg.setPath(m_wallpaperPlugin);
-     if (!m_pkg.isValid()) {
--- 
-GitLab
-