1 |
commit: 422914ffcc108bd168d28acc68dd5693612b9825 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jul 31 17:57:23 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Jul 31 17:57:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=422914ff |
7 |
|
8 |
dev-qt/qtwebengine: bump to 5.6.2-r1/5.7.1-r2 |
9 |
|
10 |
Add gcc 7 patch. |
11 |
|
12 |
dev-qt/qtwebengine/Manifest | 7 +- |
13 |
.../files/qtwebengine-5.7.1-gcc-7.patch | 144 +++++++++++++++++++++ |
14 |
dev-qt/qtwebengine/metadata.xml | 2 +- |
15 |
...ne-5.6.2.ebuild => qtwebengine-5.6.2-r1.ebuild} | 2 +- |
16 |
...5.7.1-r1.ebuild => qtwebengine-5.7.1-r2.ebuild} | 18 ++- |
17 |
5 files changed, 162 insertions(+), 11 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest |
20 |
index 6aaa024..733cd01 100644 |
21 |
--- a/dev-qt/qtwebengine/Manifest |
22 |
+++ b/dev-qt/qtwebengine/Manifest |
23 |
@@ -13,9 +13,10 @@ AUX qtwebengine-5.7.0-musl-pthread-setname.patch 1173 SHA256 a18740a277fd9379ee5 |
24 |
AUX qtwebengine-5.7.0-musl-resolver.patch 2568 SHA256 07a3ee87d509e8dc963b8d60c5168a8dd615be7488c5aa23c1f993922ff38b96 SHA512 8913b0daf060f9f3ed7fb3e69f3108992d078394e9a3e1a02f0d7668bcbb8cb7f8df715b7b3463f2ac35765a2fafe2ae8407669ecdf84405b9a3cc90bf845891 WHIRLPOOL df4ed38e8dfe407c430ce58a2006192345b35952be209ef51fb6661070ba96f86a9b60c180ac7374beb4780546c230b2d7dbbb59cc054c2d34fb0d33f9d8b42a |
25 |
AUX qtwebengine-5.7.0-musl-sandbox.patch 3185 SHA256 b4e616a6159a237e4ee0455e45e75c95702314f1ae42bfd3068a92ba1575ac01 SHA512 80a3c5eddf29cdf9beac3cd4e0c3d450ab32d85dbe794d2055d0abe0e1242db0fc69a44df7cf250d3ecf9a93a7e1d15d460a1d2409e65ceae1ac5c189f055918 WHIRLPOOL 6d4e1b055ce739e5b9f7d0235a7b628a52aebe03014e8f09e83968b2d1ddbb614ee00e4f8ffa792c6305822e759bd24265f1b63c5fae78834da6c1dcbb123305 |
26 |
AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 SHA256 3cc298a3fdeecf4a339bad39ac9bc63201c02b87fceb32e4c06e3004a6197103 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c WHIRLPOOL 41dd2c3b574939d2a3b25f1758502cb473dd29f3046360c4ff38098246c959f95d6628ab832b318874d7cbe3a088ca119e2c03cd1dd04009fab75ec3bb1f51c0 |
27 |
+AUX qtwebengine-5.7.1-gcc-7.patch 5612 SHA256 2afa904ea3c349e4721073a4d8325a4be69ddbf39ae18a7d4456abe09920f36f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a WHIRLPOOL 015dadbcfad837710a674ebf0fd6014878f27206262c4c61fe9c054a830555e771d5e7414bc5486b1de6409bec23a4f8f4ad6b29dd4c9e8a3acfd4d6e1d3500e |
28 |
AUX qtwebengine-paxmark-mksnapshot.patch 1478 SHA256 540ab83071df14d5fc6881dcf6fc28a2daaa46584e9b0c3ad45b584c612f16af SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019 WHIRLPOOL d70127c7ef2e2262557b62aa0fd8709c90aed5e0143e43c8c53dd817378dd7accefe2dccdc9b90a740fa3d49f40a3438a4a1438f51995da86bdfba816aa319bb |
29 |
DIST qtwebengine-opensource-src-5.6.2.tar.xz 143752452 SHA256 2f0a1648e1a8b22bad0134f2b37d69d185074393c398c1a3c6a83b910ff39740 SHA512 c30a270bfb254a18d4b89af8ae28789912d6157cd58010b6838461c332c32c667c15b683d290fd14615b9f0be20aca9957bd8657c4abaa8d77c28278c58f7282 WHIRLPOOL 94e627c369cfa18a7c878f75007698839aa1cd1b10df4de8e42b2f393dcd2dedec33930c1fa41c50bfa39e63089d66c7c5d0861ea7093356b1cc2e93a605893e |
30 |
DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 SHA256 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a WHIRLPOOL cebf17fc3e5c75406789c36e12dd32b0b6e6111dad6bf8f48bb07fd5d8ea76d78cd2cc5c3ad3021c8de9b91974afd7688ea384626d7e308dedd67664f1eec104 |
31 |
-EBUILD qtwebengine-5.6.2.ebuild 2769 SHA256 b37258d0fd827741dcd440ac7e5499ac09bab5c54afc4cb8fc61538570d65281 SHA512 16b4d1bca9132e8139487ba8639d728e010822ec21dbb856648d9586323362a98e67b9432085de301ba3991054232e9c5ba97773d43a9e778e80293f16fcbcc1 WHIRLPOOL 6d9c9d8f6ea2d51d33345c19e65e75a94fe72cd6bfcb828dcd97cb3a62625dc5210f6c2c2a15b5c8b78c408ebb474ffff9ce7538c046f49daa91eddbafa12617 |
32 |
-EBUILD qtwebengine-5.7.1-r1.ebuild 3180 SHA256 c79803b89c0a813eca261ee44d605b3d99a0a3382bed45b53f1b35c329b35956 SHA512 8498888beb3d1691670e93b6149d96284c0d0c9a0c309b5939352cab582db88f4e960eb7c780f4482c1bd81d59c5d7cede109fb8598ae7da6aa4fa9e3aaad1ae WHIRLPOOL 061476907b87c5943d6691858e62209bfd3e7735133e823e0a87057974233fbc3b34a03f8e28648f8d88ab8776c44b19895c707b943fa60677349d85a02406a4 |
33 |
-MISC metadata.xml 947 SHA256 15083351c49bbcf033829248688471002ca7990644535e1228c5f29396839026 SHA512 a53fa56d2922b8abb2b10193ebc3cb61923697d9c1ddbb583f0d06886dc357604c192cbbbc2849a976be189a41473069b1931434d057b9c9d5b91c7333680224 WHIRLPOOL 7db472885a977071531059312cb171ceffe119900e68bf20a6de6aca9d90336b21067a47e71e80e2d79fc54193b0aa276d74e96b98d3001e58be3c7d0840f8a8 |
34 |
+EBUILD qtwebengine-5.6.2-r1.ebuild 2771 SHA256 cb31b7f0d2c16ecbc5071966b8816e778b0cbc0a05bc5a51e1cae94f34ea9898 SHA512 79bb304b684773e396f8466abcbe8f25b6a88ebb21ea6228e6c2bfb36ee742e2ade592951904277aac64aace45194b82096593405d5876cf98853f49fed03240 WHIRLPOOL 4090f2720258577264fe5d8122c40f522cd52cd4a0124d1bca64d3ba47d614d8a94eb1ae52e2f6d2b39e8be00a7302d8cc3478a154f2fcc8c51c50f510f2dd50 |
35 |
+EBUILD qtwebengine-5.7.1-r2.ebuild 3489 SHA256 476ee0af565e67830c0648e44fb94c46dfb6031e4d408b183968237097947c7f SHA512 ef2ba3bd658ab30dc37316fe674f08640f4f6131bec3aba3dfd6f89cb3b2d0257b9a2dc7f94630934dc937ef66d453baa9bdb5ba857cbb070abf663f90a6ec2f WHIRLPOOL d5858458636ea08f6d696a25ecc317279597213e45b8ea32c4b97259dcee2397e42742e04433e9fafc92f66f52d99e057d14aed7dbf2f56ffb58b6d6a1b7cf55 |
36 |
+MISC metadata.xml 948 SHA256 4890ca8aaf167f11623fa965dfc11f031ea777a16ce92282caa9e83a2c2f1fa4 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85 WHIRLPOOL 73f94a6f3ffc150b65a7fd3f68aaf82a536e25eeb3fde1be7f28fe601fea6674fe9b394bcd2136897fcb9cdca265280d4d085b86387714c7bd9daabde3f21e19 |
37 |
|
38 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch |
39 |
new file mode 100644 |
40 |
index 0000000..a5c3072 |
41 |
--- /dev/null |
42 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch |
43 |
@@ -0,0 +1,144 @@ |
44 |
+From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001 |
45 |
+From: Allan Sandfeld Jensen <allan.jensen@××.io> |
46 |
+Date: Wed, 29 Mar 2017 17:42:18 +0200 |
47 |
+Subject: [PATCH] Fix build with GCC 7.0 |
48 |
+MIME-Version: 1.0 |
49 |
+Content-Type: text/plain; charset=utf8 |
50 |
+Content-Transfer-Encoding: 8bit |
51 |
+ |
52 |
+Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but |
53 |
+earlier compilers did. |
54 |
+ |
55 |
+Task-number:QTBUG-59776 |
56 |
+Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3 |
57 |
+Reviewed-by: Michael Brüning <michael.bruning@××.io> |
58 |
+--- |
59 |
+ .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +- |
60 |
+ .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ |
61 |
+ chromium/v8/src/objects-body-descriptors.h | 2 +- |
62 |
+ chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++ |
63 |
+ chromium/v8/src/objects.h | 16 ++-------------- |
64 |
+ 5 files changed, 25 insertions(+), 16 deletions(-) |
65 |
+ |
66 |
+diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h |
67 |
+index 5bd29d5..c94a5ac 100644 |
68 |
+--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h |
69 |
++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h |
70 |
+@@ -34,7 +34,7 @@ class InterfacePtrInfo { |
71 |
+ |
72 |
+ InterfacePtrInfo& operator=(InterfacePtrInfo&& other) { |
73 |
+ if (this != &other) { |
74 |
+- handle_ = other.handle_.Pass(); |
75 |
++ handle_ = std::move(other.handle_); |
76 |
+ version_ = other.version_; |
77 |
+ other.version_ = 0u; |
78 |
+ } |
79 |
+-- |
80 |
+2.7.4 |
81 |
+From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001 |
82 |
+From: Allan Sandfeld Jensen <allan.jensen@××.io> |
83 |
+Date: Wed, 29 Mar 2017 15:53:00 +0200 |
84 |
+Subject: [PATCH 1/1] Fix build with GCC 7.0 |
85 |
+MIME-Version: 1.0 |
86 |
+Content-Type: text/plain; charset=utf8 |
87 |
+Content-Transfer-Encoding: 8bit |
88 |
+ |
89 |
+Fixes a few problems with using undeclared functions and ambigious |
90 |
+code. |
91 |
+ |
92 |
+Task-number: QTBUG-59776 |
93 |
+Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c |
94 |
+Reviewed-by: Michael Brüning <michael.bruning@××.io> |
95 |
+--- |
96 |
+ chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ |
97 |
+ .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++---- |
98 |
+ chromium/v8/src/objects-body-descriptors.h | 2 +- |
99 |
+ chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++ |
100 |
+ chromium/v8/src/objects.h | 16 ++-------------- |
101 |
+ 5 files changed, 27 insertions(+), 19 deletions(-) |
102 |
+ |
103 |
+diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h |
104 |
+index e85c72f..6f94cd6 100644 |
105 |
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h |
106 |
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h |
107 |
+@@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas |
108 |
+ return *this; |
109 |
+ } |
110 |
+ |
111 |
++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); |
112 |
++ |
113 |
+ template<typename T, typename U, typename V, typename W> |
114 |
+ inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) |
115 |
+ { |
116 |
+diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h |
117 |
+index 91cb888..a1c3634 100644 |
118 |
+--- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h |
119 |
++++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h |
120 |
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { |
121 |
+ |
122 |
+ template <typename StaticVisitor> |
123 |
+ static inline void IterateBody(HeapObject* obj, int object_size) { |
124 |
+- IterateBody(obj); |
125 |
++ IterateBody<StaticVisitor>(obj); |
126 |
+ } |
127 |
+ }; |
128 |
+ |
129 |
+diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h |
130 |
+index 58441d3..4c486ea 100644 |
131 |
+--- a/src/3rdparty/chromium/v8/src/objects-inl.h |
132 |
++++ b/src/3rdparty/chromium/v8/src/objects-inl.h |
133 |
+@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) { |
134 |
+ } |
135 |
+ |
136 |
+ |
137 |
++template <typename Derived, typename Shape, typename Key> |
138 |
++inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) { |
139 |
++ if (Shape::UsesSeed) { |
140 |
++ return Shape::SeededHash(key, GetHeap()->HashSeed()); |
141 |
++ } else { |
142 |
++ return Shape::Hash(key); |
143 |
++ } |
144 |
++} |
145 |
++ |
146 |
++template <typename Derived, typename Shape, typename Key> |
147 |
++inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) { |
148 |
++ if (Shape::UsesSeed) { |
149 |
++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); |
150 |
++ } else { |
151 |
++ return Shape::HashForObject(key, object); |
152 |
++ } |
153 |
++} |
154 |
++ |
155 |
+ bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) { |
156 |
+ return key->SameValue(other); |
157 |
+ } |
158 |
+diff --git a/src/3rdparty/chromium/v8/src/objects.h b/src/3rdparty/chromium/v8/src/objects.h |
159 |
+index 7d774be..42da5fa 100644 |
160 |
+--- a/src/3rdparty/chromium/v8/src/objects.h |
161 |
++++ b/src/3rdparty/chromium/v8/src/objects.h |
162 |
+@@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase { |
163 |
+ typedef Shape ShapeT; |
164 |
+ |
165 |
+ // Wrapper methods |
166 |
+- inline uint32_t Hash(Key key) { |
167 |
+- if (Shape::UsesSeed) { |
168 |
+- return Shape::SeededHash(key, GetHeap()->HashSeed()); |
169 |
+- } else { |
170 |
+- return Shape::Hash(key); |
171 |
+- } |
172 |
+- } |
173 |
++ inline uint32_t Hash(Key key); |
174 |
+ |
175 |
+- inline uint32_t HashForObject(Key key, Object* object) { |
176 |
+- if (Shape::UsesSeed) { |
177 |
+- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); |
178 |
+- } else { |
179 |
+- return Shape::HashForObject(key, object); |
180 |
+- } |
181 |
+- } |
182 |
++ inline uint32_t HashForObject(Key key, Object* object); |
183 |
+ |
184 |
+ // Returns a new HashTable object. |
185 |
+ MUST_USE_RESULT static Handle<Derived> New( |
186 |
+-- |
187 |
+2.7.4 |
188 |
|
189 |
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml |
190 |
index 9c08bb1..d93362d 100644 |
191 |
--- a/dev-qt/qtwebengine/metadata.xml |
192 |
+++ b/dev-qt/qtwebengine/metadata.xml |
193 |
@@ -17,7 +17,7 @@ |
194 |
</use> |
195 |
<upstream> |
196 |
<bugs-to>https://bugreports.qt.io/</bugs-to> |
197 |
- <doc>http://doc.qt.io/</doc> |
198 |
+ <doc>https://doc.qt.io/</doc> |
199 |
</upstream> |
200 |
<slots> |
201 |
<subslots> |
202 |
|
203 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild |
204 |
similarity index 99% |
205 |
rename from dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild |
206 |
rename to dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild |
207 |
index 8b5c4a4..3a1a505 100644 |
208 |
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild |
209 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild |
210 |
@@ -14,7 +14,7 @@ fi |
211 |
IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets" |
212 |
|
213 |
RDEPEND=" |
214 |
- app-arch/snappy |
215 |
+ app-arch/snappy:= |
216 |
dev-libs/glib:2 |
217 |
dev-libs/nspr |
218 |
dev-libs/nss |
219 |
|
220 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild |
221 |
similarity index 87% |
222 |
rename from dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild |
223 |
rename to dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild |
224 |
index 395f174..432330e 100644 |
225 |
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild |
226 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild |
227 |
@@ -3,18 +3,18 @@ |
228 |
|
229 |
EAPI=6 |
230 |
PYTHON_COMPAT=( python2_7 ) |
231 |
-inherit pax-utils python-any-r1 qt5-build |
232 |
+inherit multiprocessing pax-utils python-any-r1 qt5-build |
233 |
|
234 |
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" |
235 |
|
236 |
if [[ ${QT5_BUILD_TYPE} == release ]]; then |
237 |
- KEYWORDS="~amd64 ~x86" |
238 |
+ KEYWORDS="amd64 ~arm64 x86" |
239 |
fi |
240 |
|
241 |
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" |
242 |
|
243 |
RDEPEND=" |
244 |
- app-arch/snappy |
245 |
+ app-arch/snappy:= |
246 |
dev-libs/glib:2 |
247 |
dev-libs/nspr |
248 |
dev-libs/nss |
249 |
@@ -24,12 +24,10 @@ RDEPEND=" |
250 |
~dev-qt/qtnetwork-${PV} |
251 |
~dev-qt/qtwebchannel-${PV}[qml] |
252 |
dev-libs/expat |
253 |
- dev-libs/jsoncpp:= |
254 |
dev-libs/libevent:= |
255 |
dev-libs/libxml2 |
256 |
dev-libs/libxslt |
257 |
dev-libs/protobuf:= |
258 |
- media-libs/flac |
259 |
media-libs/fontconfig |
260 |
media-libs/freetype |
261 |
media-libs/harfbuzz:= |
262 |
@@ -38,12 +36,13 @@ RDEPEND=" |
263 |
media-libs/libwebp:= |
264 |
media-libs/mesa |
265 |
media-libs/opus |
266 |
- media-libs/speex |
267 |
net-libs/libsrtp:0= |
268 |
sys-apps/dbus |
269 |
sys-apps/pciutils |
270 |
sys-libs/libcap |
271 |
sys-libs/zlib[minizip] |
272 |
+ virtual/jpeg:0 |
273 |
+ virtual/libudev |
274 |
x11-libs/libdrm |
275 |
x11-libs/libX11 |
276 |
x11-libs/libXcomposite |
277 |
@@ -76,6 +75,7 @@ PATCHES=( |
278 |
"${FILESDIR}/${PN}-5.7.1-fix-audio-detection.patch" |
279 |
"${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch" |
280 |
"${FILESDIR}/${PN}-5.7.0-icu58.patch" |
281 |
+ "${FILESDIR}/${PN}-5.7.1-gcc-7.patch" |
282 |
|
283 |
# musl patches |
284 |
"${FILESDIR}/${PN}-5.6.0-musl-execinfo.patch" |
285 |
@@ -108,6 +108,7 @@ src_prepare() { |
286 |
|
287 |
src_configure() { |
288 |
export NINJA_PATH=/usr/bin/ninja |
289 |
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}" |
290 |
|
291 |
local myqmakeargs=( |
292 |
$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '') |
293 |
@@ -122,5 +123,10 @@ src_configure() { |
294 |
src_install() { |
295 |
qt5-build_src_install |
296 |
|
297 |
+ # bug 601472 |
298 |
+ if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then |
299 |
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" |
300 |
+ fi |
301 |
+ |
302 |
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess |
303 |
} |