[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/files/, kde-frameworks/plasma/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     cae77541e600d6619cef76697713ac1a83ed7a85
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 16:13:26 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 16:20:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae77541

kde-frameworks/plasma: drop 5.102.0-r3

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

 kde-frameworks/plasma/Manifest                     |  1 -
 ...of-distance-betw-dialog-and-parent-applet.patch | 44 -------------
 ...sma-5.102.0-fix-flicker-on-fade-animation.patch | 44 -------------
 kde-frameworks/plasma/plasma-5.102.0-r3.ebuild     | 75 ----------------------
 4 files changed, 164 deletions(-)

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index a78300807db7..fda2c3c2b390 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
-DIST plasma-framework-5.102.0.tar.xz 3305096 BLAKE2B 225bb5a2d3cc5e0631defa59bafaeef49e6b1c4cf650d19d4b15cd270ec47ab2a613d4e3689bdea8d6cee19ed26aff78cb5c24a1ef0c8245fac4b80fa2a2147d SHA512 0db243ad6425c1f543149f4d939b7787cc20af526d4e81246debf7910b05a318cf18822ab0518d70dbb2641ad5853359a4e23104138f131c3a4073237c56d4b1
 DIST plasma-framework-5.104.0.tar.xz 3308212 BLAKE2B 40dda3c0d67db19c61d56ce7299d4448dab60421cecbff18f8de84aece47d5c9c32e4e22aa896d2b3870836acdef9862d1b7e80aef960e72a0a76e5490636c15 SHA512 0c327d8cb96b75e41a75fa1ff9a68f4d983f27e8c03c1121efba3dc031b286c331b7aad069a7432b51ca3255e246b980e2e44f60c7f769d291fc25665b17e19f
 DIST plasma-framework-5.105.0.tar.xz 3307692 BLAKE2B 63c793d2892a874c1f36bec6544c6bb450b3b71bfbee97515b11fe10abf13c2a524c9f881f5cc0ebefb6956c671301d2683500f8784eee96936050708f7f1c02 SHA512 271218b45176366a34bae6a813eb07a9d4f69f65f3665bbd237721537d58c2406a02d322ce32bb2b760bc28f82653b402d0c977cf9c67844181330c1c9d97c5a

diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch
deleted file mode 100644
index 13f7a7e20232..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.102.0-fix-calc-of-distance-betw-dialog-and-parent-applet.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1e0042c750756d0963d11d125978f47ea830d495 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com>
-Date: Tue, 31 Jan 2023 20:25:06 +0000
-Subject: [PATCH] Dialog: Fix calculation of distance between dialog and parent
- applet
-
-`ParentRect` is not using the same coordinate system as `dialogPos` and `avail`,
-which could result in incorrect placement of dialogs when you have e.g. multiple
-monitors or a non-maximized panel. This replaces `ParentRect` with `dialogPos` so
-the coordinate systems remain in sync.
-
-BUG:464201
-BUG:464513
-FIXED-IN: 5.103
-
-
-(cherry picked from commit eda6caabcffff484544af8949d0ca0a3ea3ce333)
----
- src/plasmaquick/dialog.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
-index 786d7ebe2..bdbdd028b 100644
---- a/src/plasmaquick/dialog.cpp
-+++ b/src/plasmaquick/dialog.cpp
-@@ -1249,13 +1249,13 @@ QPoint Dialog::popupPosition(QQuickItem *item, const QSize &size)
-         switch (d->location) {
-         case Plasma::Types::TopEdge:
-         case Plasma::Types::BottomEdge:
--            if (qAbs(parentRect.center().x() - avail.center().x() ) < size.width() / 2 - parentRect.width() / 3) {
-+            if (qAbs(dialogPos.x() + size.width() / 2 - avail.center().x() ) < size.width() / 2 - parentRect.width() / 3) {
-                 dialogPos.setX(avail.center().x() - size.width() / 2);
-             }
-             break;
-         case Plasma::Types::LeftEdge:
-         case Plasma::Types::RightEdge:
--            if (qAbs(parentRect.center().y() - avail.center().y() ) < size.height() / 2 - parentRect.height() / 3) {
-+            if (qAbs(dialogPos.y() + size.height() / 2 - avail.center().y() ) < size.height() / 2 - parentRect.height() / 3) {
-                 dialogPos.setY(avail.center().y() - size.height() / 2);
-             }
-             break;
--- 
-GitLab
-

diff --git a/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch b/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch
deleted file mode 100644
index 1c6ddab618aa..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.102.0-fix-flicker-on-fade-animation.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3fcd43a6ed03d0aff188dfc190cc464c34302a1f Mon Sep 17 00:00:00 2001
-From: Arjen Hiemstra <ahiemstra@heimr.nl>
-Date: Tue, 10 Jan 2023 12:46:20 +0100
-Subject: [PATCH] iconitem: Adjust fade animation to not flicker as much
-
-As it turns out, mix(old texture, new texture, animation value) does
-actually result in a different visual from simply blending the two
-textures on top of each other, because the old texture first gets
-blended with the underlying color. This results in some of the
-underlying color bleeding through, which can cause flickering if the two
-textures are almost the same. To avoid this, change the animation
-slightly so that rather than crossfading, we first fade in the new
-texture then fade out the old texture. This doesn't cause a whole lot of
-visual difference for two completely different textures, but removes the
-flickering when they are very similar.
-
-BUG: 463061
-BUG: 463685
----
- src/declarativeimports/core/iconitem.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
-index de1f56c69..a474a72f9 100644
---- a/src/declarativeimports/core/iconitem.cpp
-+++ b/src/declarativeimports/core/iconitem.cpp
-@@ -645,8 +645,12 @@ QSGNode *IconItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *update
-             m_textureChanged = true;
-         }
- 
--        updateSubtree(oldNode->firstChild(), 1.0 - m_animValue);
--        updateSubtree(oldNode->lastChild(), m_animValue);
-+        // Rather than doing a perfect crossfade, first fade in the new texture
-+        // then fade out the old texture. This is done to avoid the underlying
-+        // color bleeding through when both textures are at ~0.5 opacity, which
-+        // causes flickering if the two textures are very similar.
-+        updateSubtree(oldNode->firstChild(), 2.0 - m_animValue * 2.0);
-+        updateSubtree(oldNode->lastChild(), m_animValue * 2.0);
-     } else {
-         if (oldNode->childCount() == 0) {
-             oldNode->appendChildNode(createSubtree(1.0));
--- 
-GitLab
-

diff --git a/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild b/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild
deleted file mode 100644
index 4980673a1fab..000000000000
--- a/kde-frameworks/plasma/plasma-5.102.0-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="gles2-only man wayland"
-
-RESTRICT="test"
-
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5[qml]
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	x11-libs/libX11
-	x11-libs/libxcb
-	!gles2-only? ( media-libs/libglvnd[X] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-flicker-on-fade-animation.patch" # KDE-bug 463061, 463685
-	"${FILESDIR}/${P}-fix-calc-of-distance-betw-dialog-and-parent-applet.patch" # KDE-bug 464201, 464513
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package man KF5DocTools)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	ecm_src_configure
-}