Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/plasma/, kde-frameworks/plasma/files/
Date: Sun, 27 Nov 2022 11:20:51
Message-Id: 1669548028.9b99b376a474d29fe66880ee155012cbc4b47a60.asturm@gentoo
1 commit: 9b99b376a474d29fe66880ee155012cbc4b47a60
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 27 11:13:57 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 11:20:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b99b376
7
8 kde-frameworks/plasma: drop 5.96.0-r1
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-frameworks/plasma/Manifest | 1 -
13 ...asma-5.96.0-fix-crash-in-WindowShadowTile.patch | 55 ----------------
14 kde-frameworks/plasma/plasma-5.96.0-r1.ebuild | 75 ----------------------
15 3 files changed, 131 deletions(-)
16
17 diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
18 index e2822206cd81..2fa718fa26f5 100644
19 --- a/kde-frameworks/plasma/Manifest
20 +++ b/kde-frameworks/plasma/Manifest
21 @@ -1,3 +1,2 @@
22 DIST plasma-framework-5.100.0.tar.xz 3302260 BLAKE2B 7b928023475502184b9c9d804b34584e278402692a2c3a39246598618f2ee4f2780b0ebed769a4c891e6a51d82f3beb359a60814f7a3fc351df22bbfab17669b SHA512 65d52ceb6454cf3b9a1d898eb8bbd65c96d9eabaf4a0213bf72ee4b9decb0a3cf20e251140186ad96d7346e64533320fee1b8b7157d0a3260e4f4ed0aa1abdac
23 -DIST plasma-framework-5.96.0.tar.xz 3145380 BLAKE2B a9190358fc454dfba03d8f5881b52e21e7e209f471823d4d4ead54818103436775f09df7f1dd42ade4d4b5b2df448f5cb1bb682ea77d32c57cdfe7c39ecab238 SHA512 9361948197c69ab8b2a1b943c1e9a2e44443588cd3bb4073eaa9ac6a4575bb4c1e6a257eb2fda6333df13eb568e09ed26a88d128fdafbe517bca705b8a8f2a5b
24 DIST plasma-framework-5.99.0.tar.xz 3141664 BLAKE2B b37534440bc1f3d8f5fc13b6b62527c1bdde4b5d5d1c88530c49da2be221c9f55afac832cd8db61eb1bb91328145bc9b4c9e7b227b1ce740b10fa1bbefd3d2ef SHA512 bcf4f33facb20b542a90f5216fc0c5778d4de51d6a0ae86abdd5a22d7d1bfd7156dfd7a7d6cdad524b8f98596a75aa064fcbb295a36161ce288d4be4f42c5abb
25
26 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
27 deleted file mode 100644
28 index 8d37a508b359..000000000000
29 --- a/kde-frameworks/plasma/files/plasma-5.96.0-fix-crash-in-WindowShadowTile.patch
30 +++ /dev/null
31 @@ -1,55 +0,0 @@
32 -From 50eaece7aef004b588a684c9fadff0f6787f2ef8 Mon Sep 17 00:00:00 2001
33 -From: David Edmundson <kde@×××××××××××××××××.uk>
34 -Date: Thu, 14 Jul 2022 22:45:14 +0100
35 -Subject: [PATCH] Scope DialogShadows lifetime to application
36 -
37 -- DialogShadows own KWayland::Client::buffer objects
38 - - Buffer cleanup makes wayland calls
39 - - wayland calls after QGuiApplication has stoped will fail
40 -
41 -Q_GLOBAL_STATIC mangaged objects can outlive the QGuiApplication.
42 -
43 -BUG:443706
44 ----
45 - src/plasmaquick/dialogshadows.cpp | 18 ++++++------------
46 - 1 file changed, 6 insertions(+), 12 deletions(-)
47 -
48 -diff --git a/src/plasmaquick/dialogshadows.cpp b/src/plasmaquick/dialogshadows.cpp
49 -index 17c9a41e2..93b9bcc0f 100644
50 ---- a/src/plasmaquick/dialogshadows.cpp
51 -+++ b/src/plasmaquick/dialogshadows.cpp
52 -@@ -37,17 +37,6 @@ public:
53 - QVector<KWindowShadowTile::Ptr> m_tiles;
54 - };
55 -
56 --class DialogShadowsSingleton
57 --{
58 --public:
59 -- DialogShadowsSingleton()
60 -- {
61 -- }
62 --
63 -- DialogShadows self;
64 --};
65 --
66 --Q_GLOBAL_STATIC(DialogShadowsSingleton, privateDialogShadowsSelf)
67 -
68 - DialogShadows::DialogShadows(QObject *parent, const QString &prefix)
69 - : Plasma::Svg(parent)
70 -@@ -64,7 +53,12 @@ DialogShadows::~DialogShadows()
71 -
72 - DialogShadows *DialogShadows::self()
73 - {
74 -- return &privateDialogShadowsSelf->self;
75 -+ // KF6 port to Q_APPLICATION_STATIC
76 -+ static DialogShadows *s_privateDialogShadowsSelf = nullptr;
77 -+ if (!s_privateDialogShadowsSelf) {
78 -+ s_privateDialogShadowsSelf = new DialogShadows(qApp);
79 -+ }
80 -+ return s_privateDialogShadowsSelf;
81 - }
82 -
83 - void DialogShadows::addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders)
84 ---
85 -GitLab
86 -
87
88 diff --git a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
89 deleted file mode 100644
90 index cf6319f87d3b..000000000000
91 --- a/kde-frameworks/plasma/plasma-5.96.0-r1.ebuild
92 +++ /dev/null
93 @@ -1,75 +0,0 @@
94 -# Copyright 1999-2022 Gentoo Authors
95 -# Distributed under the terms of the GNU General Public License v2
96 -
97 -EAPI=8
98 -
99 -KDE_ORG_NAME="${PN}-framework"
100 -PVCUT=$(ver_cut 1-2)
101 -QTMIN=5.15.4
102 -VIRTUALX_REQUIRED="test"
103 -inherit ecm frameworks.kde.org
104 -
105 -DESCRIPTION="Plasma framework"
106 -
107 -LICENSE="LGPL-2+"
108 -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
109 -IUSE="gles2-only man wayland X"
110 -
111 -RESTRICT="test"
112 -
113 -RDEPEND="
114 - >=dev-qt/qtdbus-${QTMIN}:5
115 - >=dev-qt/qtdeclarative-${QTMIN}:5
116 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X=]
117 - >=dev-qt/qtquickcontrols-${QTMIN}:5
118 - >=dev-qt/qtsql-${QTMIN}:5
119 - >=dev-qt/qtsvg-${QTMIN}:5
120 - >=dev-qt/qtwidgets-${QTMIN}:5
121 - =kde-frameworks/kactivities-${PVCUT}*:5
122 - =kde-frameworks/karchive-${PVCUT}*:5
123 - =kde-frameworks/kconfig-${PVCUT}*:5[qml]
124 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5
125 - =kde-frameworks/kcoreaddons-${PVCUT}*:5
126 - =kde-frameworks/kdeclarative-${PVCUT}*:5
127 - =kde-frameworks/kglobalaccel-${PVCUT}*:5
128 - =kde-frameworks/kguiaddons-${PVCUT}*:5
129 - =kde-frameworks/ki18n-${PVCUT}*:5
130 - =kde-frameworks/kiconthemes-${PVCUT}*:5
131 - =kde-frameworks/kio-${PVCUT}*:5
132 - =kde-frameworks/kirigami-${PVCUT}*:5
133 - =kde-frameworks/knotifications-${PVCUT}*:5
134 - =kde-frameworks/kpackage-${PVCUT}*:5
135 - =kde-frameworks/kservice-${PVCUT}*:5
136 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
137 - =kde-frameworks/kwindowsystem-${PVCUT}*:5
138 - =kde-frameworks/kxmlgui-${PVCUT}*:5
139 - !gles2-only? ( media-libs/libglvnd[X?] )
140 - wayland? (
141 - =kde-frameworks/kwayland-${PVCUT}*:5
142 - media-libs/libglvnd
143 - )
144 - X? (
145 - >=dev-qt/qtx11extras-${QTMIN}:5
146 - x11-libs/libX11
147 - x11-libs/libxcb
148 - )
149 -"
150 -DEPEND="${RDEPEND}
151 - X? ( x11-base/xorg-proto )
152 -"
153 -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
154 -
155 -PATCHES=( "${FILESDIR}/${P}-fix-crash-in-WindowShadowTile.patch" ) # KDE-bug 443706
156 -
157 -src_configure() {
158 - local mycmakeargs=(
159 - $(cmake_use_find_package !gles2-only OpenGL)
160 - $(cmake_use_find_package man KF5DocTools)
161 - $(cmake_use_find_package wayland EGL)
162 - $(cmake_use_find_package wayland KF5Wayland)
163 - $(cmake_use_find_package X X11)
164 - $(cmake_use_find_package X XCB)
165 - )
166 -
167 - ecm_src_configure
168 -}