gentoo resync : 22.01.2021

2 files changed, 0 insertions, 70 deletions

diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch
deleted file mode 100644
index 192ba9dcf67f..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6eaefba5001445fa7e198e4caa0bde738240d66f Mon Sep 17 00:00:00 2001
-From: Arjen Hiemstra <ahiemstra@heimr.nl>
-Date: Wed, 9 Sep 2020 13:00:59 +0200
-Subject: [PATCH] Remove actions and delegates from ToolBarLayout when they get
- destroyed
-
-Otherwise we're keeping around stale entries that no longer point to
-valid stuff.
-
-BUG: 425670
----
- src/toolbarlayout.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/toolbarlayout.cpp b/src/toolbarlayout.cpp
-index cbf31062..c2df5998 100644
---- a/src/toolbarlayout.cpp
-+++ b/src/toolbarlayout.cpp
-@@ -112,6 +112,18 @@ void ToolBarLayout::addAction(QObject* action)
-     d->actions.append(action);
-     d->actionsChanged = true;
- 
-+    connect(action, &QObject::destroyed, this, [this](QObject *action) {
-+        auto itr = d->delegates.find(action);
-+        if (itr != d->delegates.end()) {
-+            d->delegates.erase(itr);
-+        }
-+
-+        d->actions.removeOne(action);
-+        d->actionsChanged = true;
-+
-+        relayout();
-+    });
-+
-     relayout();
- }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
deleted file mode 100644
index 60dae8389abf..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aaaabf1ea84d9c5ae9cf50a306b79f15f44f5b35 Mon Sep 17 00:00:00 2001
-From: Carson Black <uhhadd@gmail.com>
-Date: Sat, 19 Sep 2020 12:21:33 -0400
-Subject: [PATCH] Revert "Fix: avatar loading"
-
-This reverts commit 338d91be7254099c1ad4c1f475acb6368df2b114, which
-introduced a visual regression in the users KCM among other places
-that use the Avatar by causing the image to fail to resize according
-to the size of the avatar component.
----
- src/controls/Avatar.qml | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/controls/Avatar.qml b/src/controls/Avatar.qml
-index a4f59448..775e5987 100644
---- a/src/controls/Avatar.qml
-+++ b/src/controls/Avatar.qml
-@@ -133,9 +133,6 @@ QQC2.Control {
-             mipmap: true
-             smooth: true
- 
--            sourceSize.width: avatarRoot.implicitWidth
--            sourceSize.height: avatarRoot.implicitHeight
--
-             fillMode: Image.PreserveAspectFit
-             anchors.fill: parent
-         }
--- 
-GitLab
-