1 |
commit: 971f92f4f40d8ddde976457ad18eb47cf608b2d4 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Nov 29 06:32:35 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Wed Nov 29 06:32:35 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=971f92f4 |
7 |
|
8 |
dev-qt/qtcore: version bump to 5.9.2/5.9.3 |
9 |
|
10 |
dev-qt/qtcore/Manifest | 6 +- |
11 |
dev-qt/qtcore/files/qtcore-5.9.3-avx.patch | 69 ++++++++++++++++++++++ |
12 |
dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch | 12 ++++ |
13 |
dev-qt/qtcore/qtcore-4.8.7-r3.ebuild | 2 +- |
14 |
dev-qt/qtcore/qtcore-5.7.1-r3.ebuild | 2 +- |
15 |
dev-qt/qtcore/qtcore-5.9.2.ebuild | 68 ++++++++++++++++++++++ |
16 |
dev-qt/qtcore/qtcore-5.9.3.ebuild | 71 +++++++++++++++++++++++ |
17 |
7 files changed, 226 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest |
20 |
index 529c4fa..2967a23 100644 |
21 |
--- a/dev-qt/qtcore/Manifest |
22 |
+++ b/dev-qt/qtcore/Manifest |
23 |
@@ -1,2 +1,4 @@ |
24 |
-DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 |
25 |
-DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682 |
26 |
+DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 |
27 |
+DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f |
28 |
+DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 BLAKE2B 311f9fd5bea4b59988d90fad55bbaf46cbb5a77ed705f2f14d6d65ce1cd6e8c950fbcb6b6f06aad4aa3abb58892e9665cdab0a4716ac3a7f9c651dac239f04b6 SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 |
29 |
+DIST qtbase-opensource-src-5.9.3.tar.xz 45160080 BLAKE2B 234eb778c90b5867ae53129da010968563d3fa66fe87e3ad50d2d4e968ecbf41812270a66c24fce27b318a7c6b5be90e518ee1b6bb14fb11985f2269a708899c SHA512 256ffb8760e94c0f87790ed35e210d0c9613e14314ff442dd763cc93fbd5caa6c11c95f5d44b12a7687fb93c9f857878132cf6d76e5933f647ca7beb54b18c7c |
30 |
|
31 |
diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch |
32 |
new file mode 100644 |
33 |
index 0000000..be18433 |
34 |
--- /dev/null |
35 |
+++ b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch |
36 |
@@ -0,0 +1,69 @@ |
37 |
+From d813c66bfcfac1837814ec4d174d0389172f0d4c Mon Sep 17 00:00:00 2001 |
38 |
+From: Thiago Macieira <thiago.macieira@×××××.com> |
39 |
+Date: Tue, 25 Apr 2017 12:02:09 -0300 |
40 |
+Subject: Fix the build when AVX2 is enabled but __F16C__ isn't defined |
41 |
+ |
42 |
+If -mavx2 is used, __AVX2__ is defined, which enables the F16C code |
43 |
+after commit 280e321e52fd4e86545f3f0d4bd4e047786a897e, but that was |
44 |
+wrong since we aren't allowed to use the F16C intrinsics with either |
45 |
+Clang or GCC (we can only do that with GCC 4.9 and Clang 4.8, and only |
46 |
+with an __attribute__ decoration). |
47 |
+ |
48 |
+With ICC and MSVC, we are allowed to use the intrinsics, but the |
49 |
+#include was missing. |
50 |
+ |
51 |
+[ChangeLog][QtCore] Fixed a compilation issue with qfloat16 if AVX2 |
52 |
+support is enabled in the compiler. Since all processors that support |
53 |
+AVX2 also support F16C, for GCC and Clang it is recommended to either |
54 |
+add -mf16c to your build or to use the corresponding -march= switch. |
55 |
+ |
56 |
+Task-number: QTBUG-64529 |
57 |
+Change-Id: I84e363d735b443cb9beefffd14b8ac1fd4baa978 |
58 |
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@××.io> |
59 |
+--- |
60 |
+ src/corelib/global/qfloat16.h | 15 ++++++++++++--- |
61 |
+ 1 file changed, 12 insertions(+), 3 deletions(-) |
62 |
+ |
63 |
+diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h |
64 |
+index 89a62a93db..a0aa9496b4 100644 |
65 |
+--- a/src/corelib/global/qfloat16.h |
66 |
++++ b/src/corelib/global/qfloat16.h |
67 |
+@@ -44,7 +44,16 @@ |
68 |
+ #include <QtCore/qmetatype.h> |
69 |
+ #include <string.h> |
70 |
+ |
71 |
+-#if defined __F16C__ |
72 |
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) |
73 |
++// All processors that support AVX2 do support F16C too. That doesn't mean |
74 |
++// we're allowed to use the intrinsics directly, so we'll do it only for |
75 |
++// the Intel and Microsoft's compilers. |
76 |
++# if defined(Q_CC_INTEL) || defined(Q_CC_MSVC) |
77 |
++# define __F16C__ 1 |
78 |
++# endif |
79 |
++#endif |
80 |
++ |
81 |
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) |
82 |
+ #include <immintrin.h> |
83 |
+ #endif |
84 |
+ |
85 |
+@@ -116,7 +125,7 @@ QT_WARNING_DISABLE_CLANG("-Wc99-extensions") |
86 |
+ QT_WARNING_DISABLE_GCC("-Wold-style-cast") |
87 |
+ inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW |
88 |
+ { |
89 |
+-#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__)) |
90 |
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) |
91 |
+ __m128 packsingle = _mm_set_ss(f); |
92 |
+ __m128i packhalf = _mm_cvtps_ph(packsingle, 0); |
93 |
+ b16 = _mm_extract_epi16(packhalf, 0); |
94 |
+@@ -134,7 +143,7 @@ QT_WARNING_POP |
95 |
+ |
96 |
+ inline qfloat16::operator float() const Q_DECL_NOTHROW |
97 |
+ { |
98 |
+-#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__)) |
99 |
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) |
100 |
+ __m128i packhalf = _mm_cvtsi32_si128(b16); |
101 |
+ __m128 packsingle = _mm_cvtph_ps(packhalf); |
102 |
+ return _mm_cvtss_f32(packsingle); |
103 |
+-- |
104 |
+cgit v1.1-6-g87c4 |
105 |
+ |
106 |
|
107 |
diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch b/dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch |
108 |
new file mode 100644 |
109 |
index 0000000..b738f73 |
110 |
--- /dev/null |
111 |
+++ b/dev-qt/qtcore/files/qtcore-5.9.3-musl-iconv.patch |
112 |
@@ -0,0 +1,12 @@ |
113 |
+diff -Naur qtbase-opensource-src-5.9.3.orig/src/corelib/codecs/qiconvcodec.cpp qtbase-opensource-src-5.9.3/src/corelib/codecs/qiconvcodec.cpp |
114 |
+--- qtbase-opensource-src-5.9.3.orig/src/corelib/codecs/qiconvcodec.cpp 2017-11-15 21:15:28.000000000 -0800 |
115 |
++++ qtbase-opensource-src-5.9.3/src/corelib/codecs/qiconvcodec.cpp 2017-11-28 22:24:13.734884247 -0800 |
116 |
+@@ -63,7 +63,7 @@ |
117 |
+ #elif defined(Q_OS_AIX) |
118 |
+ # define NO_BOM |
119 |
+ # define UTF16 "UCS-2" |
120 |
+-#elif defined(Q_OS_FREEBSD) |
121 |
++#elif defined(Q_OS_FREEBSD) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) |
122 |
+ # define NO_BOM |
123 |
+ # if Q_BYTE_ORDER == Q_BIG_ENDIAN |
124 |
+ # define UTF16 "UTF-16BE" |
125 |
|
126 |
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild |
127 |
index 46a4ce6..0c956c2 100644 |
128 |
--- a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild |
129 |
+++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild |
130 |
@@ -7,7 +7,7 @@ inherit qt4-build-multilib |
131 |
DESCRIPTION="Cross-platform application development framework" |
132 |
|
133 |
if [[ ${QT4_BUILD_TYPE} == release ]]; then |
134 |
- KEYWORDS="amd64 arm ~mips ppc x86" |
135 |
+ KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" |
136 |
fi |
137 |
|
138 |
IUSE="+glib iconv icu libressl qt3support ssl" |
139 |
|
140 |
diff --git a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild |
141 |
index c4f32fd..a12aacd 100644 |
142 |
--- a/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild |
143 |
+++ b/dev-qt/qtcore/qtcore-5.7.1-r3.ebuild |
144 |
@@ -8,7 +8,7 @@ inherit qt5-build |
145 |
DESCRIPTION="Cross-platform application development framework" |
146 |
|
147 |
if [[ ${QT5_BUILD_TYPE} == release ]]; then |
148 |
- KEYWORDS="amd64 arm ~mips ppc x86" |
149 |
+ KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" |
150 |
fi |
151 |
|
152 |
IUSE="icu systemd" |
153 |
|
154 |
diff --git a/dev-qt/qtcore/qtcore-5.9.2.ebuild b/dev-qt/qtcore/qtcore-5.9.2.ebuild |
155 |
new file mode 100644 |
156 |
index 0000000..bd36eff |
157 |
--- /dev/null |
158 |
+++ b/dev-qt/qtcore/qtcore-5.9.2.ebuild |
159 |
@@ -0,0 +1,68 @@ |
160 |
+# Copyright 1999-2017 Gentoo Foundation |
161 |
+# Distributed under the terms of the GNU General Public License v2 |
162 |
+ |
163 |
+EAPI=6 |
164 |
+QT5_MODULE="qtbase" |
165 |
+inherit qt5-build |
166 |
+ |
167 |
+DESCRIPTION="Cross-platform application development framework" |
168 |
+ |
169 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
170 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
171 |
+fi |
172 |
+ |
173 |
+IUSE="icu systemd" |
174 |
+ |
175 |
+DEPEND=" |
176 |
+ dev-libs/double-conversion:= |
177 |
+ dev-libs/glib:2 |
178 |
+ dev-libs/libpcre2[pcre16,unicode] |
179 |
+ sys-libs/zlib |
180 |
+ icu? ( dev-libs/icu:= ) |
181 |
+ !icu? ( virtual/libiconv ) |
182 |
+ systemd? ( sys-apps/systemd:= ) |
183 |
+" |
184 |
+RDEPEND="${DEPEND}" |
185 |
+ |
186 |
+PATCHES=( "${FILESDIR}/${PN}-5.9.3-musl-iconv.patch" ) |
187 |
+ |
188 |
+QT5_TARGET_SUBDIRS=( |
189 |
+ src/tools/bootstrap |
190 |
+ src/tools/moc |
191 |
+ src/tools/rcc |
192 |
+ src/tools/qfloat16-tables |
193 |
+ src/corelib |
194 |
+ src/tools/qlalr |
195 |
+ doc |
196 |
+) |
197 |
+ |
198 |
+src_configure() { |
199 |
+ local myconf=( |
200 |
+ $(qt_use icu) |
201 |
+ $(qt_use !icu iconv) |
202 |
+ $(qt_use systemd journald) |
203 |
+ ) |
204 |
+ qt5-build_src_configure |
205 |
+} |
206 |
+ |
207 |
+src_install() { |
208 |
+ qt5-build_src_install |
209 |
+ |
210 |
+ local flags=( |
211 |
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
212 |
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
213 |
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR |
214 |
+ XFIXES XKB XRANDR XRENDER XSYNC ZLIB |
215 |
+ ) |
216 |
+ |
217 |
+ for flag in ${flags[@]}; do |
218 |
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die |
219 |
+ |
220 |
+ #if defined(QT_NO_${flag}) && defined(QT_${flag}) |
221 |
+ # undef QT_NO_${flag} |
222 |
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) |
223 |
+ # define QT_NO_${flag} |
224 |
+ #endif |
225 |
+ _EOF_ |
226 |
+ done |
227 |
+} |
228 |
|
229 |
diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild |
230 |
new file mode 100644 |
231 |
index 0000000..7c0da68 |
232 |
--- /dev/null |
233 |
+++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild |
234 |
@@ -0,0 +1,71 @@ |
235 |
+# Copyright 1999-2017 Gentoo Foundation |
236 |
+# Distributed under the terms of the GNU General Public License v2 |
237 |
+ |
238 |
+EAPI=6 |
239 |
+QT5_MODULE="qtbase" |
240 |
+inherit qt5-build |
241 |
+ |
242 |
+DESCRIPTION="Cross-platform application development framework" |
243 |
+ |
244 |
+if [[ ${QT5_BUILD_TYPE} == release ]]; then |
245 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
246 |
+fi |
247 |
+ |
248 |
+IUSE="icu systemd" |
249 |
+ |
250 |
+DEPEND=" |
251 |
+ dev-libs/double-conversion:= |
252 |
+ dev-libs/glib:2 |
253 |
+ dev-libs/libpcre2[pcre16,unicode] |
254 |
+ sys-libs/zlib |
255 |
+ icu? ( dev-libs/icu:= ) |
256 |
+ !icu? ( virtual/libiconv ) |
257 |
+ systemd? ( sys-apps/systemd:= ) |
258 |
+" |
259 |
+RDEPEND="${DEPEND}" |
260 |
+ |
261 |
+PATCHES=( |
262 |
+ "${FILESDIR}/${P}-avx.patch" |
263 |
+ "${FILESDIR}/${PN}-5.9.3-musl-iconv.patch" |
264 |
+) |
265 |
+ |
266 |
+QT5_TARGET_SUBDIRS=( |
267 |
+ src/tools/bootstrap |
268 |
+ src/tools/moc |
269 |
+ src/tools/rcc |
270 |
+ src/tools/qfloat16-tables |
271 |
+ src/corelib |
272 |
+ src/tools/qlalr |
273 |
+ doc |
274 |
+) |
275 |
+ |
276 |
+src_configure() { |
277 |
+ local myconf=( |
278 |
+ $(qt_use icu) |
279 |
+ $(qt_use !icu iconv) |
280 |
+ $(qt_use systemd journald) |
281 |
+ ) |
282 |
+ qt5-build_src_configure |
283 |
+} |
284 |
+ |
285 |
+src_install() { |
286 |
+ qt5-build_src_install |
287 |
+ |
288 |
+ local flags=( |
289 |
+ ALSA CUPS DBUS EGL EGLFS EGL_X11 EVDEV FONTCONFIG FREETYPE |
290 |
+ HARFBUZZ IMAGEFORMAT_JPEG IMAGEFORMAT_PNG LIBPROXY MITSHM |
291 |
+ OPENGL OPENSSL OPENVG PULSEAUDIO SHAPE SSL TSLIB XCURSOR |
292 |
+ XFIXES XKB XRANDR XRENDER XSYNC ZLIB |
293 |
+ ) |
294 |
+ |
295 |
+ for flag in ${flags[@]}; do |
296 |
+ cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die |
297 |
+ |
298 |
+ #if defined(QT_NO_${flag}) && defined(QT_${flag}) |
299 |
+ # undef QT_NO_${flag} |
300 |
+ #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) |
301 |
+ # define QT_NO_${flag} |
302 |
+ #endif |
303 |
+ _EOF_ |
304 |
+ done |
305 |
+} |