1 |
commit: 7e3267a063daf545d6b8bfd40448bd78f4da37db |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 18 19:09:55 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 18 19:16:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3267a0 |
7 |
|
8 |
x11-themes/qtcurve: Drop 1.9.0-r1 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/759769 |
11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
x11-themes/qtcurve/Manifest | 1 - |
15 |
.../files/qtcurve-1.9.0-build_testing.patch | 44 ---------- |
16 |
x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch | 26 ------ |
17 |
.../files/qtcurve-1.9.0-libreoffice-crashfix.patch | 58 -------------- |
18 |
.../files/qtcurve-1.9.0-no-X-buildfix.patch | 54 ------------- |
19 |
.../qtcurve/files/qtcurve-1.9.0-qt-5.15.patch | 25 ------ |
20 |
x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild | 93 ---------------------- |
21 |
7 files changed, 301 deletions(-) |
22 |
|
23 |
diff --git a/x11-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest |
24 |
index 5af9bf44763..f68617ec691 100644 |
25 |
--- a/x11-themes/qtcurve/Manifest |
26 |
+++ b/x11-themes/qtcurve/Manifest |
27 |
@@ -1,2 +1 @@ |
28 |
-DIST qtcurve-1.9.0.tar.gz 801675 BLAKE2B ed8d490b6e00e527f7da62c1fb676072ed3d75e50e14ae57e7807e7a9bd37f10a7b6b29e062ac05e02507c19be13ac3d003ea240fd00cff27bc74938a216a3e0 SHA512 a158f0880a2dc657e5f14366e046b18f0fe9d9983d1e1b243417f26987f6e69612c83f8b69293ae9036361adf67833b296564750f0f4cc0f405604f628dbff66 |
29 |
DIST qtcurve-1.9.0_p20210412-be78a85b.tar.gz 805926 BLAKE2B 9a763f91bf073e341bf0517e5d3bc480eb1670f78c5d74242059cd229b9fcab72ec28255693335e74ae4cb8f154ce4390257b27d71a91d2285cb4f6db03e666a SHA512 686397cf408f436017782ce06baf80f91589f3486e01fe5cbda602a0a44fc11150c6d5dacf9d9c499ed713b04b64612e3e3dbaa72bb0e72e3dc2823f31d2291e |
30 |
|
31 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch |
32 |
deleted file mode 100644 |
33 |
index 16f7198aba8..00000000000 |
34 |
--- a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch |
35 |
+++ /dev/null |
36 |
@@ -1,44 +0,0 @@ |
37 |
-From 237912b291dcc706fcc1d9b02a8398385d19f38f Mon Sep 17 00:00:00 2001 |
38 |
-From: Andreas Sturmlechner <asturm@g.o> |
39 |
-Date: Tue, 26 Jun 2018 18:03:06 +0200 |
40 |
-Subject: [PATCH] Switch from ENABLE_TEST to the ECM/CMake standard |
41 |
- BUILD_TESTING |
42 |
- |
43 |
-Summary: |
44 |
-BUILD_TESTING is used throughout KDE projects as provided by |
45 |
-CTest and/or KDECMakeSettings. |
46 |
- |
47 |
-Reviewers: yuyichao |
48 |
- |
49 |
-Reviewed By: yuyichao |
50 |
- |
51 |
-Differential Revision: https://phabricator.kde.org/D13741 |
52 |
---- |
53 |
- CMakeLists.txt | 4 ++-- |
54 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
55 |
- |
56 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
57 |
-index 70e21b3a..15f6b177 100644 |
58 |
---- a/CMakeLists.txt |
59 |
-+++ b/CMakeLists.txt |
60 |
-@@ -52,7 +52,7 @@ qtc_option(ENABLE_QT4 "Building Qt4 theme." On) |
61 |
- qtc_option(ENABLE_QT5 "Building Qt5 theme." On) |
62 |
- qtc_option(ENABLE_GTK2 "Building Gtk2 theme." On) |
63 |
- # option(ENABLE_GTK3 "Building Gtk3 theme." On) |
64 |
--option(ENABLE_TEST "Enable testing." On) |
65 |
-+option(BUILD_TESTING "Enable testing." On) |
66 |
- option(QTC_ENABLE_X11 "Enable X11" On) |
67 |
- option(QTC_INSTALL_PO "Install translation files." On) |
68 |
- |
69 |
-@@ -247,7 +247,7 @@ if(ENABLE_GTK2) |
70 |
- add_subdirectory(gtk2) |
71 |
- endif() |
72 |
- add_subdirectory(tools) |
73 |
--if(ENABLE_TEST) |
74 |
-+if(BUILD_TESTING) |
75 |
- enable_testing() |
76 |
- add_subdirectory(test) |
77 |
- endif() |
78 |
--- |
79 |
-2.18.0 |
80 |
- |
81 |
|
82 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch |
83 |
deleted file mode 100644 |
84 |
index 56bf30b4562..00000000000 |
85 |
--- a/x11-themes/qtcurve/files/qtcurve-1.9.0-gcc9.patch |
86 |
+++ /dev/null |
87 |
@@ -1,26 +0,0 @@ |
88 |
-From ee2228ea2f18ac5da9b434ee6089381df815aa94 Mon Sep 17 00:00:00 2001 |
89 |
-From: Yichao Yu <yyc1992@×××××.com> |
90 |
-Date: Wed, 5 Jun 2019 09:03:40 -0400 |
91 |
-Subject: [utils/gtkprops] Remove unnecessary constexpr, this is not allowed in |
92 |
- C++14 |
93 |
- |
94 |
-BUG: 408286 |
95 |
---- |
96 |
- lib/utils/gtkprops.h | 2 +- |
97 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
98 |
- |
99 |
-diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h |
100 |
-index abc0675..e248255 100644 |
101 |
---- a/lib/utils/gtkprops.h |
102 |
-+++ b/lib/utils/gtkprops.h |
103 |
-@@ -74,7 +74,7 @@ class GtkWidgetProps { |
104 |
- }; |
105 |
- #define DEF_WIDGET_SIG_CONN_PROPS(name) \ |
106 |
- struct _SigConn_##name##_ObjGetter { \ |
107 |
-- constexpr inline GObject* \ |
108 |
-+ inline GObject* \ |
109 |
- operator()(SigConn<_SigConn_##name##_ObjGetter> *p) const \ |
110 |
- { \ |
111 |
- return (GObject*)qtcContainerOf(p, Props, name)->m_w; \ |
112 |
--- |
113 |
-cgit v1.1 |
114 |
|
115 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch |
116 |
deleted file mode 100644 |
117 |
index c431ab743d0..00000000000 |
118 |
--- a/x11-themes/qtcurve/files/qtcurve-1.9.0-libreoffice-crashfix.patch |
119 |
+++ /dev/null |
120 |
@@ -1,58 +0,0 @@ |
121 |
-From 293a822b2fc0572f826a819d9ad8df858c4ed1ee Mon Sep 17 00:00:00 2001 |
122 |
-From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin@×××××.com> |
123 |
-Date: Sun, 3 Feb 2019 11:14:47 +0100 |
124 |
-Subject: Fix the LibreOffice fix |
125 |
- |
126 |
-My previous commit was a bit overzealous and didn't take into account |
127 |
-the fact that there are legitimate reasons for the widget argument to |
128 |
-Style::drawPrimitive() to be NULL. |
129 |
---- |
130 |
- qt5/style/qtcurve_api.cpp | 16 +++------------- |
131 |
- 2 files changed, 15 insertions(+), 19 deletions(-) |
132 |
- |
133 |
-diff --git a/qt5/style/qtcurve_api.cpp b/qt5/style/qtcurve_api.cpp |
134 |
-index 155d159..f26c438 100644 |
135 |
---- a/qt5/style/qtcurve_api.cpp |
136 |
-+++ b/qt5/style/qtcurve_api.cpp |
137 |
-@@ -2036,6 +2036,7 @@ QPalette Style::standardPalette() const |
138 |
- |
139 |
- static bool initFontTickData(Options &opts, QFont font, const QWidget *widget=0) |
140 |
- { |
141 |
-+ Q_UNUSED(widget); |
142 |
- if (opts.onlyTicksInMenu && opts.fontTickWidth <= 0) { |
143 |
- opts.tickFont = font; |
144 |
- #ifndef Q_OS_MACOS |
145 |
-@@ -2047,8 +2048,6 @@ static bool initFontTickData(Options &opts, QFont font, const QWidget *widget=0) |
146 |
- // adjust the size so the tickmark looks just about right |
147 |
- opts.tickFont.setPointSizeF(opts.tickFont.pointSizeF() * 1.3); |
148 |
- opts.fontTickWidth = QFontMetrics(opts.tickFont).width(opts.menuTick); |
149 |
-- // qDebug() << widget << "font->tickFont:" << font.toString() << opts.tickFont.toString() << "tickMark:" << opts.menuTick |
150 |
-- // << "width=" << opts.fontTickWidth << "/" << QFontMetrics(opts.tickFont).boundingRect(opts.menuTick).width(); |
151 |
- return true; |
152 |
- } |
153 |
- return false; |
154 |
-@@ -2123,9 +2117,7 @@ Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, |
155 |
- break; |
156 |
- case PE_FrameStatusBar: |
157 |
- case PE_FrameMenu: |
158 |
-- if (widget) { |
159 |
-- initFontTickData(opts, widget->font(), widget); |
160 |
-- } |
161 |
-+ initFontTickData(opts, widget ? widget->font() : QApplication::font("QMenu"), widget); |
162 |
- drawFunc = &Style::drawPrimitiveFrameStatusBarOrMenu; |
163 |
- break; |
164 |
- case PE_FrameDockWidget: |
165 |
-@@ -2182,9 +2174,7 @@ Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, |
166 |
- drawFunc = &Style::drawPrimitivePanelTipLabel; |
167 |
- break; |
168 |
- case PE_PanelMenu: |
169 |
-- if (widget) { |
170 |
-- initFontTickData(opts, widget->font(), widget); |
171 |
-- } |
172 |
-+ initFontTickData(opts, widget ? widget->font() : QApplication::font("QMenu"), widget); |
173 |
- drawFunc = &Style::drawPrimitivePanelMenu; |
174 |
- break; |
175 |
- default: |
176 |
--- |
177 |
-cgit v1.1 |
178 |
- |
179 |
|
180 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch |
181 |
deleted file mode 100644 |
182 |
index 883a8af2435..00000000000 |
183 |
--- a/x11-themes/qtcurve/files/qtcurve-1.9.0-no-X-buildfix.patch |
184 |
+++ /dev/null |
185 |
@@ -1,54 +0,0 @@ |
186 |
-From 9aae21bb68308d9017977a53059dd75b347d7bbd Mon Sep 17 00:00:00 2001 |
187 |
-From: "R.J.V. Bertin" <rjvbertin@×××××.com> |
188 |
-Date: Tue, 3 Apr 2018 18:18:37 +0200 |
189 |
-Subject: Minor X11-related build fixes: |
190 |
- |
191 |
-- don't override QTC_ENABLE_X11 with platform conditionals |
192 |
-- use qtcX11Enabled() instead of QTC_ENABLE_X11 everywhere |
193 |
- |
194 |
-Committed from host : Portia.local |
195 |
---- |
196 |
- qt5/CMakeLists.txt | 2 +- |
197 |
- qt5/config/qtcurveconfig.cpp | 7 ++++--- |
198 |
- 2 files changed, 5 insertions(+), 4 deletions(-) |
199 |
- |
200 |
-diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt |
201 |
-index 930c919..8cff198 100644 |
202 |
---- a/qt5/CMakeLists.txt |
203 |
-+++ b/qt5/CMakeLists.txt |
204 |
-@@ -36,7 +36,7 @@ if(ENABLE_QT5) |
205 |
- set(QTC_QT5_DEFS ${QTC_QT5_DEFS} ${${QtModule}_DEFINITIONS}) |
206 |
- set(QTC_QT5_INCLUDES ${QTC_QT5_INCLUDES} ${${QtModule}_INCLUDE_DIRS}) |
207 |
- endforeach() |
208 |
-- if(NOT APPLE) |
209 |
-+ if(QTC_ENABLE_X11) |
210 |
- set(QTC_QT5_OPT_MODULES Qt5X11Extras) |
211 |
- endif() |
212 |
- foreach(QtModule ${QTC_QT5_OPT_MODULES}) |
213 |
-diff --git a/qt5/config/qtcurveconfig.cpp b/qt5/config/qtcurveconfig.cpp |
214 |
-index b320c25..a34f9bd 100644 |
215 |
---- a/qt5/config/qtcurveconfig.cpp |
216 |
-+++ b/qt5/config/qtcurveconfig.cpp |
217 |
-@@ -42,6 +42,7 @@ |
218 |
- #include <qtcurve-utils/dirs.h> |
219 |
- #include <qtcurve-utils/process.h> |
220 |
- #include <qtcurve-utils/qtutils.h> |
221 |
-+#include <qtcurve-utils/x11base.h> |
222 |
- |
223 |
- // Qt |
224 |
- #include <QCheckBox> |
225 |
-@@ -975,9 +976,9 @@ QtCurveConfig::QtCurveConfig(QWidget *parent) |
226 |
- dropShadowSize->setRange(0, 100); |
227 |
- dropShadowSize->setSingleStep(1); |
228 |
- dropShadowSize->setValue(qtcX11ShadowSize()); |
229 |
--#ifndef QTC_ENABLE_X11 |
230 |
-- dropShadowSize->setEnabled(false); |
231 |
--#endif |
232 |
-+ if (!qtcX11Enabled()) { |
233 |
-+ dropShadowSize->setEnabled(false); |
234 |
-+ } |
235 |
- |
236 |
- |
237 |
- sliderWidth->setRange(MIN_SLIDER_WIDTH, MAX_SLIDER_WIDTH); |
238 |
--- |
239 |
-cgit v0.11.2 |
240 |
|
241 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch |
242 |
deleted file mode 100644 |
243 |
index 795f94141b2..00000000000 |
244 |
--- a/x11-themes/qtcurve/files/qtcurve-1.9.0-qt-5.15.patch |
245 |
+++ /dev/null |
246 |
@@ -1,25 +0,0 @@ |
247 |
-From 44e2a35ebb164dcab0bad1a9158b1219a3ff6504 Mon Sep 17 00:00:00 2001 |
248 |
-From: Andreas Sturmlechner <asturm@g.o> |
249 |
-Date: Sun, 31 May 2020 23:33:30 +0200 |
250 |
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) |
251 |
- |
252 |
---- |
253 |
- qt5/style/qtcurve.h | 2 ++ |
254 |
- 1 file changed, 2 insertions(+) |
255 |
- |
256 |
-diff --git a/qt5/style/qtcurve.h b/qt5/style/qtcurve.h |
257 |
-index 9a50db00..00072d4e 100644 |
258 |
---- a/qt5/style/qtcurve.h |
259 |
-+++ b/qt5/style/qtcurve.h |
260 |
-@@ -31,6 +31,8 @@ |
261 |
- #include <QCache> |
262 |
- #include <QColor> |
263 |
- #include <QFont> |
264 |
-+#include <QPainter> |
265 |
-+#include <QPainterPath> |
266 |
- #include <QStyleOption> |
267 |
- #include <QtGlobal> |
268 |
- #include <QCommonStyle> |
269 |
--- |
270 |
-2.26.2 |
271 |
- |
272 |
|
273 |
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild |
274 |
deleted file mode 100644 |
275 |
index a9a99616655..00000000000 |
276 |
--- a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild |
277 |
+++ /dev/null |
278 |
@@ -1,93 +0,0 @@ |
279 |
-# Copyright 1999-2020 Gentoo Authors |
280 |
-# Distributed under the terms of the GNU General Public License v2 |
281 |
- |
282 |
-EAPI=7 |
283 |
- |
284 |
-KFMIN=5.60.0 |
285 |
-QTMIN=5.12.3 |
286 |
-inherit cmake kde.org |
287 |
- |
288 |
-DESCRIPTION="Widget styles for Qt and GTK2" |
289 |
-HOMEPAGE="https://invent.kde.org/system/qtcurve" |
290 |
- |
291 |
-LICENSE="LGPL-2+" |
292 |
-SLOT="0" |
293 |
-IUSE="gtk nls plasma +qt5 test +X" |
294 |
- |
295 |
-if [[ ${KDE_BUILD_TYPE} = release ]] ; then |
296 |
- SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" |
297 |
- KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86" |
298 |
- S="${WORKDIR}/${P/_/-}" |
299 |
-fi |
300 |
- |
301 |
-REQUIRED_USE="gtk? ( X ) |
302 |
- || ( gtk qt5 ) |
303 |
- plasma? ( qt5 ) |
304 |
-" |
305 |
- |
306 |
-BDEPEND=" |
307 |
- virtual/pkgconfig |
308 |
- nls? ( sys-devel/gettext ) |
309 |
- plasma? ( >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 ) |
310 |
-" |
311 |
-DEPEND=" |
312 |
- gtk? ( x11-libs/gtk+:2 ) |
313 |
- plasma? ( |
314 |
- >=dev-qt/qtprintsupport-${QTMIN}:5 |
315 |
- >=kde-frameworks/frameworkintegration-${KFMIN}:5 |
316 |
- >=kde-frameworks/karchive-${KFMIN}:5 |
317 |
- >=kde-frameworks/kcompletion-${KFMIN}:5 |
318 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
319 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
320 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
321 |
- >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
322 |
- >=kde-frameworks/kguiaddons-${KFMIN}:5 |
323 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
324 |
- >=kde-frameworks/kiconthemes-${KFMIN}:5 |
325 |
- >=kde-frameworks/kio-${KFMIN}:5 |
326 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
327 |
- >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
328 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
329 |
- ) |
330 |
- qt5? ( |
331 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
332 |
- >=dev-qt/qtgui-${QTMIN}:5 |
333 |
- >=dev-qt/qtsvg-${QTMIN}:5 |
334 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
335 |
- X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) |
336 |
- ) |
337 |
- X? ( |
338 |
- x11-libs/libX11 |
339 |
- x11-libs/libxcb |
340 |
- ) |
341 |
-" |
342 |
-RDEPEND="${DEPEND}" |
343 |
- |
344 |
-RESTRICT+=" test" |
345 |
- |
346 |
-DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) |
347 |
- |
348 |
-PATCHES=( |
349 |
- "${FILESDIR}/${PN}-1.9.0-build_testing.patch" |
350 |
- "${FILESDIR}/${PN}-1.9.0-no-X-buildfix.patch" |
351 |
- "${FILESDIR}/${PN}-1.9.0-gcc9.patch" |
352 |
- "${FILESDIR}/${PN}-1.9.0-libreoffice-crashfix.patch" |
353 |
- "${FILESDIR}/${PN}-1.9.0-qt-5.15.patch" |
354 |
-) |
355 |
- |
356 |
-src_configure() { |
357 |
- local mycmakeargs=( |
358 |
- -DLIB_INSTALL_DIR="$(get_libdir)" |
359 |
- -DENABLE_QT4=OFF |
360 |
- -DQTC_QT4_ENABLE_KDE=OFF |
361 |
- -DQTC_KDE4_DEFAULT_HOME=ON |
362 |
- -DENABLE_GTK2="$(usex gtk)" |
363 |
- -DENABLE_QT5="$(usex qt5)" |
364 |
- -DBUILD_TESTING="$(usex test)" |
365 |
- -DQTC_ENABLE_X11="$(usex X)" |
366 |
- -DQTC_INSTALL_PO="$(usex nls)" |
367 |
- -DQTC_QT5_ENABLE_KDE="$(usex plasma)" |
368 |
- ) |
369 |
- |
370 |
- cmake_src_configure |
371 |
-} |