1 |
commit: e9d13c50ef08300d32a2f463cb69ece1fdaae838 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 23 02:00:47 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 23 02:01:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d13c50 |
7 |
|
8 |
dev-qt/qtconcurrent: revbump for GCC 11 fix, with additional patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/764977 |
11 |
Closes: https://bugs.gentoo.org/806797 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/qtconcurrent-5.15.2-gcc11.patch | 45 ++++++++++++++++++++++ |
15 |
dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild | 30 +++++++++++++++ |
16 |
2 files changed, 75 insertions(+) |
17 |
|
18 |
diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..b27ac767b06 |
21 |
--- /dev/null |
22 |
+++ b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch |
23 |
@@ -0,0 +1,45 @@ |
24 |
+https://bugs.gentoo.org/764977 |
25 |
+https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364 |
26 |
+ |
27 |
+From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001 |
28 |
+From: Sona Kurazyan <sona.kurazyan@××.io> |
29 |
+Date: Wed, 17 Mar 2021 16:04:00 +0100 |
30 |
+Subject: [PATCH] Remove the unnecessary template parameter from the class |
31 |
+ specialization |
32 |
+MIME-Version: 1.0 |
33 |
+Content-Type: text/plain; charset=UTF-8 |
34 |
+Content-Transfer-Encoding: 8bit |
35 |
+ |
36 |
+This seems to cause errors when compiling with gcc-11. Although this is |
37 |
+most likely a compiler bug, specifiying the template parameter type in |
38 |
+this case isn't necessary. |
39 |
+ |
40 |
+Fixes: QTBUG-91909 |
41 |
+Fixes: QTBUG-90568 |
42 |
+Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53 |
43 |
+Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@××.io> |
44 |
+(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3) |
45 |
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@××××××××××.org> |
46 |
+(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8) |
47 |
+--- |
48 |
+ src/concurrent/qtconcurrentthreadengine.h | 4 ++-- |
49 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
50 |
+ |
51 |
+diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h |
52 |
+index af413707e4..a4c8548cc4 100644 |
53 |
+--- a/src/concurrent/qtconcurrentthreadengine.h |
54 |
++++ b/src/concurrent/qtconcurrentthreadengine.h |
55 |
+@@ -247,8 +247,8 @@ template <> |
56 |
+ class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void> |
57 |
+ { |
58 |
+ public: |
59 |
+- ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine) |
60 |
+- :ThreadEngineStarterBase<void>(_threadEngine) {} |
61 |
++ ThreadEngineStarter(ThreadEngine<void> *_threadEngine) |
62 |
++ : ThreadEngineStarterBase<void>(_threadEngine) {} |
63 |
+ |
64 |
+ void startBlocking() |
65 |
+ { |
66 |
+-- |
67 |
+GitLab |
68 |
+ |
69 |
|
70 |
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild |
71 |
new file mode 100644 |
72 |
index 00000000000..f0ecb6cd1f6 |
73 |
--- /dev/null |
74 |
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild |
75 |
@@ -0,0 +1,30 @@ |
76 |
+# Copyright 1999-2021 Gentoo Authors |
77 |
+# Distributed under the terms of the GNU General Public License v2 |
78 |
+ |
79 |
+EAPI=7 |
80 |
+ |
81 |
+QT5_MODULE="qtbase" |
82 |
+inherit qt5-build |
83 |
+ |
84 |
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" |
85 |
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" |
86 |
+ |
87 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
88 |
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" |
89 |
+fi |
90 |
+ |
91 |
+IUSE="" |
92 |
+ |
93 |
+DEPEND=" |
94 |
+ ~dev-qt/qtcore-${PV}:5= |
95 |
+" |
96 |
+RDEPEND="${DEPEND}" |
97 |
+ |
98 |
+QT5_TARGET_SUBDIRS=( |
99 |
+ src/concurrent |
100 |
+) |
101 |
+ |
102 |
+PATCHES=( |
103 |
+ "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 |
104 |
+ "${FILESDIR}"/${P}-gcc11.patch # bug #764977 |
105 |
+) |