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

[Andreas Sturmlechner]

commit:     9b99b376a474d29fe66880ee155012cbc4b47a60
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:13:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:20:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b99b376

kde-frameworks/plasma: drop 5.96.0-r1

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

 kde-frameworks/plasma/Manifest                     |  1 -
 ...asma-5.96.0-fix-crash-in-WindowShadowTile.patch | 55 ----------------
 kde-frameworks/plasma/plasma-5.96.0-r1.ebuild      | 75 ----------------------
 3 files changed, 131 deletions(-)

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index e2822206cd81..2fa718fa26f5 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,3 +1,2 @@
 DIST plasma-framework-5.100.0.tar.xz 3302260 BLAKE2B 7b928023475502184b9c9d804b34584e278402692a2c3a39246598618f2ee4f2780b0ebed769a4c891e6a51d82f3beb359a60814f7a3fc351df22bbfab17669b SHA512 65d52ceb6454cf3b9a1d898eb8bbd65c96d9eabaf4a0213bf72ee4b9decb0a3cf20e251140186ad96d7346e64533320fee1b8b7157d0a3260e4f4ed0aa1abdac
-DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
 DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb

diff --git a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
deleted file mode 100644
index 8d37a508b359..000000000000
--- a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@×××××××××××××××××.uk>
-Date: Thu, 14 Jul 2022 22:45:14 +0100
-Subject: [PATCH] Scope DialogShadows lifetime to application
-
-- DialogShadows own KWayland::Client::buffer objects
- - Buffer cleanup makes wayland calls
- - wayland calls after QGuiApplication has stoped will fail
-
-Q_GLOBAL_STATIC mangaged objects can outlive the QGuiApplication.
-
-BUG:443706
----
- src/plasmaquick/dialogshadows.cpp | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/plasmaquick/dialogshadows.cpp b/src/plasmaquick/dialogshadows.cpp
-index 17c9a41e2..93b9bcc0f 100644
---- a/src/plasmaquick/dialogshadows.cpp
-+++ b/src/plasmaquick/dialogshadows.cpp
-@@ -37,17 +37,6 @@ public:
-     QVector<KWindowShadowTile::Ptr> m_tiles;
- };
- 
--class DialogShadowsSingleton
--{
--public:
--    DialogShadowsSingleton()
--    {
--    }
--
--    DialogShadows self;
--};
--
--Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
- 
- DialogShadows::DialogShadows(QObject *parent, const QString &prefix)
-     : Plasma::Svg(parent)
-@@ -64,7 +53,12 @@ DialogShadows::~DialogShadows()
- 
- DialogShadows *DialogShadows::self()
- {
--    return &privateDialogShadowsSelf->self;
-+    // KF6 port to Q_APPLICATION_STATIC
-+    static DialogShadows *s_privateDialogShadowsSelf = nullptr;
-+    if (!s_privateDialogShadowsSelf) {
-+        s_privateDialogShadowsSelf = new DialogShadows(qApp);
-+    }
-+    return s_privateDialogShadowsSelf;
- }
- 
- void DialogShadows::addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders)
--- 
-GitLab
-

diff --git a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
deleted file mode 100644
index cf6319f87d3b..000000000000
--- a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 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.4
-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 X"
-
-RESTRICT="test"
-
-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
-	=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
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( media-libs/libglvnd[X?] )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/libglvnd
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-crash-in-WindowShadowTile.patch" ) # KDE-bug 443706
-
-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)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}