gentoo auto-resync : 26:07:2022 - 14:59:07

3 files changed, 132 insertions, 0 deletions

diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 847943424896..16a47c0eae27 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,7 +1,9 @@
 AUX plasma-5.92.0-breeze-light-dark-visual-fix.patch 1689 BLAKE2B 8c15834e53bdb2dfe4707a2173bdf19fd1a98652f644256f050ce55cc57e3268f1d33a1d67901d68301749bf7458137092c71e68d50454bd8db88d962c2bcd01 SHA512 d490f815b11bbf6af35266fab33392cfd5562b2011970b433b2c3952e1e9638af56175e10258596dd863c8fff49d448f141c22bfa3d688c9194a31ca0ed2f1ee
 AUX plasma-5.92.0-fix-blurry-buttons.patch 5410 BLAKE2B 689bf20c1848fd5ac299991f6dcc1e6ee81ef2fecd68d87952967dbb2367326aee8d464588824b059f7162a1cc6092c84cce7d254ac20dbbef3da639a5eaa4e0 SHA512 facb4d4ca36f5edaad918253f8d79442d350a12d611d833d0c48684abd2160527813d7186614fc54d3d5f67171400bbaf56f64c0ffb98c2433e062ee024b180d
+AUX plasma-5.96.0-fix-crash-in-WindowShadowTile.patch 1634 BLAKE2B 80da6c10e57948875d18ee3699e092e47cef3a75e55b643438bf3d1b5d5c368ac1425aae1b49c55ec20a0f4986c228a31f22e390ffea39a9b34d4d459dd70c48 SHA512 7af67805cf73c01132a162c03dc50398b5cb4b3d5b1b1001b31c2b1ec8fa749c8e883b8185734e47d8434350426b6990315fc74bec8880c8bdc36ad8b1d5aee2
 DIST plasma-framework-5.92.0.tar.xz 3145504 BLAKE2B 4c9c4a6c585fae629d94666d312af9a2dc74242d59f93cf6b63e206f7b4656982e1969cee7e1543b5c32b4f0815d602cfa8d0b56c3416f92bd5d2d2048ee6ef4 SHA512 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c
 DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
 EBUILD plasma-5.92.0-r2.ebuild 2070 BLAKE2B 6e234e85ddc2694560bcdd46a9b12df6a9ab7ee1a3fb2f29e2a9c835a0255a981af7d73f12caf4bd4a7ef90320cb7f23d3906b083b2346e289c6e8bd092f1acb SHA512 3d9389f095b09c330f552f52fa2d7c624c968abc658f6c447bbed066e864d205573314878f8b47f207dcdf3e7273beaecf62de39984bc763a494b26e29bceac9
+EBUILD plasma-5.96.0-r1.ebuild 2051 BLAKE2B e96e556d063ec7897525d371f47d93aaff6924a95801fa0915f1507ccc2d157617ba5ff589a509fbc5cb0049b2b9c8cf4fae36d52261945bfae10e33e91455a5 SHA512 e844dec9ad63dd13d8fdd075c64aa363a757a8861e3462ae271cb4985451694519b669008018073f701cc63cf61e44642f272de72911275271f0d6bdd3bd37d6
 EBUILD plasma-5.96.0.ebuild 1966 BLAKE2B 59b813bcd2ad1f7ea60ad8faecab79ce0fa9875e0058a8f8c01b7f88fde6ea5b101585cb33fb615266296bd028e36b8c41de3c804bf9239ea5170b7646e4f8f0 SHA512 e49b18b9775bf72ffd82e8d48743a53feedc4db49134354e1c3964bcd9fa434aacc16bb79755ff88edbef5e11f1b012955779d7b60ca1c658afaabb3b060c0e1
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
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
new file mode 100644
index 000000000000..8d37a508b359
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
@@ -0,0 +1,55 @@
+From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.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
new file mode 100644
index 000000000000..401899a558a0
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
@@ -0,0 +1,75 @@
+# 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
+}