1 |
commit: 7de5d5d18ade80c661235931b6d06e14f5591032 |
2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
3 |
AuthorDate: Wed Jul 29 20:22:04 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 1 12:22:12 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7de5d5d1 |
7 |
|
8 |
net-libs/webkit-gtk: remove old |
9 |
|
10 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
net-libs/webkit-gtk/Manifest | 3 - |
14 |
.../files/2.26.2-fix-arm-non-unified-build.patch | 27 -- |
15 |
net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch | 27 -- |
16 |
.../webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch | 59 ---- |
17 |
.../files/2.28.2-fix-yelp-desktopless-build.patch | 53 ---- |
18 |
.../files/2.28.2-use-gst-audiointerleave.patch | 55 ---- |
19 |
.../webkit-gtk/files/webkit-gtk-2.22.4-musl.patch | 137 ---------- |
20 |
.../files/webkit-gtk-2.24.4-icu-65.patch | 53 ---- |
21 |
.../webkit-gtk/files/webkit-gtk-2.26.2-musl.patch | 136 ---------- |
22 |
net-libs/webkit-gtk/metadata.xml | 5 - |
23 |
net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 287 -------------------- |
24 |
net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 290 -------------------- |
25 |
net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 302 --------------------- |
26 |
13 files changed, 1434 deletions(-) |
27 |
|
28 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
29 |
index 69ef7ac..e5f86c3 100644 |
30 |
--- a/net-libs/webkit-gtk/Manifest |
31 |
+++ b/net-libs/webkit-gtk/Manifest |
32 |
@@ -1,4 +1 @@ |
33 |
-DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112 |
34 |
-DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474 |
35 |
-DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8 |
36 |
DIST webkitgtk-2.28.3.tar.xz 21425556 BLAKE2B f51522c33fa97aa00dee1428bc256ef910dd8764b3731580639c79642965c60b91b8d2f5c1d3bdb60975c68706d415447e8b52520ecfa1687968f3790137234b SHA512 575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643 |
37 |
|
38 |
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch |
39 |
deleted file mode 100644 |
40 |
index 0f09599..0000000 |
41 |
--- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch |
42 |
+++ /dev/null |
43 |
@@ -1,27 +0,0 @@ |
44 |
-Add missing headers required during non-unified build. |
45 |
- |
46 |
-Unified build happens to get them included by the other sources unified |
47 |
-into same source file, thus didn't fail. |
48 |
- |
49 |
-diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp |
50 |
---- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp |
51 |
-+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp |
52 |
-@@ -30,6 +30,7 @@ |
53 |
- |
54 |
- #include "BuiltinNames.h" |
55 |
- #include "BytecodeGenerator.h" |
56 |
-+#include "BytecodeStructs.h" |
57 |
- #include "CallFrame.h" |
58 |
- #include "JIT.h" |
59 |
- #include "JSCInlines.h" |
60 |
-diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp |
61 |
---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp |
62 |
-+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp |
63 |
-@@ -23,6 +23,7 @@ |
64 |
- #include "MachineStackMarker.h" |
65 |
- |
66 |
- #include "ConservativeRoots.h" |
67 |
-+#include "CPU.h" |
68 |
- #include "MachineContext.h" |
69 |
- #include <setjmp.h> |
70 |
- #include <stdlib.h> |
71 |
|
72 |
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch |
73 |
deleted file mode 100644 |
74 |
index 85328be..0000000 |
75 |
--- a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch |
76 |
+++ /dev/null |
77 |
@@ -1,27 +0,0 @@ |
78 |
-Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this, |
79 |
-but it looks like it's not enough with older perl-based gtk-doc. |
80 |
-Keep this extra patch only until we can't depend on a newer gtk-doc version, which |
81 |
-should be retested whether this patch is unnecessary then. |
82 |
- |
83 |
-Upstream extra reference for the above reference commit: |
84 |
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
85 |
---- |
86 |
- Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +- |
87 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
88 |
- |
89 |
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp |
90 |
-index 023b14c33f4..657b1febf5d 100644 |
91 |
---- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp |
92 |
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp |
93 |
-@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass) |
94 |
- * WebKitSettings:enable-media: |
95 |
- * |
96 |
- * Enable or disable support for media playback on pages. This setting is enabled by |
97 |
-- * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have |
98 |
-+ * default. Disabling it means audio, track and video elements will have |
99 |
- * playback support disabled. |
100 |
- * |
101 |
- * Since: 2.26 |
102 |
--- |
103 |
-2.20.1 |
104 |
- |
105 |
|
106 |
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch b/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch |
107 |
deleted file mode 100644 |
108 |
index 96e4d7d..0000000 |
109 |
--- a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch |
110 |
+++ /dev/null |
111 |
@@ -1,59 +0,0 @@ |
112 |
-From 46c7d3ea88dd77223f25c48ce4a8688db71c489b Mon Sep 17 00:00:00 2001 |
113 |
-From: "commit-queue@××××××.org" |
114 |
- <commit-queue@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
115 |
-Date: Thu, 7 May 2020 19:30:28 +0000 |
116 |
-Subject: [PATCH] REGRESSION(r251875): Crash in JSC::StructureIDTable::get on |
117 |
- ppc64le: gcSafeMemcpy broken on JSVALUE64 platforms other than x86_64 and |
118 |
- aarch64 https://bugs.webkit.org/show_bug.cgi?id=210685 |
119 |
- |
120 |
-Patch by Daniel Kolesa <daniel@×××××××××.org> on 2020-05-07 |
121 |
-Reviewed by Michael Catanzaro. |
122 |
- |
123 |
-Fix gcSafeMemcpy on non-x86_64/aarch64 64-bit architectures. |
124 |
- |
125 |
-We were hitting an incorrect x86_64 assertion on values larger than |
126 |
-mediumCutoff on JSVALUE64 architectures other than x86_64 and aarch64, |
127 |
-as the control flow is wrong. |
128 |
- |
129 |
-* heap/GCMemoryOperations.h: |
130 |
-(JSC::gcSafeMemcpy): |
131 |
- |
132 |
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261326 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
133 |
---- |
134 |
- Source/JavaScriptCore/heap/GCMemoryOperations.h | 6 ++---- |
135 |
- 1 file changed, 2 insertions(+), 4 deletions(-) |
136 |
- |
137 |
-diff --git a/Source/JavaScriptCore/heap/GCMemoryOperations.h b/Source/JavaScriptCore/heap/GCMemoryOperations.h |
138 |
-index f2b9e385bc9..ff66071db20 100644 |
139 |
---- a/Source/JavaScriptCore/heap/GCMemoryOperations.h |
140 |
-+++ b/Source/JavaScriptCore/heap/GCMemoryOperations.h |
141 |
-@@ -53,7 +53,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes) |
142 |
- bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile uint64_t*>(src)[i]; |
143 |
- }; |
144 |
- |
145 |
--#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64) |
146 |
-+#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64)) |
147 |
- if (bytes <= smallCutoff) |
148 |
- slowPathForwardMemcpy(); |
149 |
- else if (isARM64() || bytes <= mediumCutoff) { |
150 |
-@@ -121,8 +121,6 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes) |
151 |
- : |
152 |
- : "d0", "d1", "memory" |
153 |
- ); |
154 |
--#else |
155 |
-- slowPathForwardMemcpy(); |
156 |
- #endif // CPU(X86_64) |
157 |
- } else { |
158 |
- RELEASE_ASSERT(isX86_64()); |
159 |
-@@ -139,7 +137,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes) |
160 |
- } |
161 |
- #else |
162 |
- slowPathForwardMemcpy(); |
163 |
--#endif // COMPILER(GCC_COMPATIBLE) |
164 |
-+#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64)) |
165 |
- #else |
166 |
- memcpy(dst, src, bytes); |
167 |
- #endif // USE(JSVALUE64) |
168 |
--- |
169 |
-2.20.1 |
170 |
- |
171 |
|
172 |
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch b/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch |
173 |
deleted file mode 100644 |
174 |
index fdf9d7d..0000000 |
175 |
--- a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch |
176 |
+++ /dev/null |
177 |
@@ -1,53 +0,0 @@ |
178 |
-From 9cd4011a12bf658aad3776251792bacdc894643a Mon Sep 17 00:00:00 2001 |
179 |
-From: "berto@××××××.com" |
180 |
- <berto@××××××.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
181 |
-Date: Mon, 27 Apr 2020 11:52:10 +0000 |
182 |
-Subject: [PATCH] [GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set |
183 |
- https://bugs.webkit.org/show_bug.cgi?id=209431 |
184 |
- |
185 |
-Reviewed by Carlos Garcia Campos. |
186 |
- |
187 |
-Don't create a PlatformDisplayLibWPE as a fallback when using |
188 |
-Wayland or X11. |
189 |
- |
190 |
-* platform/graphics/PlatformDisplay.cpp: |
191 |
-(WebCore::PlatformDisplay::createPlatformDisplay): |
192 |
- |
193 |
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260750 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
194 |
---- |
195 |
- Source/WebCore/platform/graphics/PlatformDisplay.cpp | 12 ++++++------ |
196 |
- 1 file changed, 6 insertions(+), 6 deletions(-) |
197 |
- |
198 |
-diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp |
199 |
-index 8bb47ca2b77..f9547b3af69 100644 |
200 |
---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp |
201 |
-+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp |
202 |
-@@ -98,12 +98,6 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay() |
203 |
- } |
204 |
- #endif // PLATFORM(GTK) |
205 |
- |
206 |
--#if USE(WPE_RENDERER) |
207 |
-- return PlatformDisplayLibWPE::create(); |
208 |
--#elif PLATFORM(WIN) |
209 |
-- return PlatformDisplayWin::create(); |
210 |
--#endif |
211 |
-- |
212 |
- #if PLATFORM(WAYLAND) |
213 |
- if (auto platformDisplay = PlatformDisplayWayland::create()) |
214 |
- return platformDisplay; |
215 |
-@@ -121,6 +115,12 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay() |
216 |
- return PlatformDisplayX11::create(nullptr); |
217 |
- #endif |
218 |
- |
219 |
-+#if USE(WPE_RENDERER) |
220 |
-+ return PlatformDisplayLibWPE::create(); |
221 |
-+#elif PLATFORM(WIN) |
222 |
-+ return PlatformDisplayWin::create(); |
223 |
-+#endif |
224 |
-+ |
225 |
- RELEASE_ASSERT_NOT_REACHED(); |
226 |
- } |
227 |
- |
228 |
--- |
229 |
-2.20.1 |
230 |
- |
231 |
|
232 |
diff --git a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch b/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch |
233 |
deleted file mode 100644 |
234 |
index f4bc729..0000000 |
235 |
--- a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch |
236 |
+++ /dev/null |
237 |
@@ -1,55 +0,0 @@ |
238 |
-From 43686247013a1230d47b46d637f928eb47c99609 Mon Sep 17 00:00:00 2001 |
239 |
-From: "commit-queue@××××××.org" |
240 |
- <commit-queue@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
241 |
-Date: Wed, 29 Apr 2020 08:14:06 +0000 |
242 |
-Subject: [PATCH] [GStreamer] Switch to audiointerleave |
243 |
- https://bugs.webkit.org/show_bug.cgi?id=211124 |
244 |
- |
245 |
-Patch by Philippe Normand <pnormand@××××××.com> on 2020-04-29 |
246 |
-Reviewed by Xabier Rodriguez-Calvar. |
247 |
- |
248 |
-The audiointerleave element is a drop-in replacement of |
249 |
-interleave. It should behave a bit better in live. |
250 |
- |
251 |
-No new tests, existing webaudio tests cover this change. |
252 |
- |
253 |
-* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp: |
254 |
-(webKitWebAudioSrcConstructed): |
255 |
-(webKitWebAudioSrcChangeState): |
256 |
- |
257 |
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260886 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
258 |
---- |
259 |
- .../audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp | 8 ++++---- |
260 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
261 |
- |
262 |
-diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp |
263 |
-index 2f937f677cc..ea134b7b1b2 100644 |
264 |
---- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp |
265 |
-+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp |
266 |
-@@ -211,10 +211,10 @@ static void webKitWebAudioSrcConstructed(GObject* object) |
267 |
- ASSERT(priv->provider); |
268 |
- ASSERT(priv->sampleRate); |
269 |
- |
270 |
-- priv->interleave = gst_element_factory_make("interleave", nullptr); |
271 |
-+ priv->interleave = gst_element_factory_make("audiointerleave", nullptr); |
272 |
- |
273 |
- if (!priv->interleave) { |
274 |
-- GST_ERROR_OBJECT(src, "Failed to create interleave"); |
275 |
-+ GST_ERROR_OBJECT(src, "Failed to create audiointerleave"); |
276 |
- return; |
277 |
- } |
278 |
- |
279 |
-@@ -398,8 +398,8 @@ static GstStateChangeReturn webKitWebAudioSrcChangeState(GstElement* element, Gs |
280 |
- switch (transition) { |
281 |
- case GST_STATE_CHANGE_NULL_TO_READY: |
282 |
- if (!src->priv->interleave) { |
283 |
-- gst_element_post_message(element, gst_missing_element_message_new(element, "interleave")); |
284 |
-- GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no interleave")); |
285 |
-+ gst_element_post_message(element, gst_missing_element_message_new(element, "audiointerleave")); |
286 |
-+ GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no audiointerleave")); |
287 |
- return GST_STATE_CHANGE_FAILURE; |
288 |
- } |
289 |
- src->priv->numberOfSamples = 0; |
290 |
--- |
291 |
-2.20.1 |
292 |
- |
293 |
|
294 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch |
295 |
deleted file mode 100644 |
296 |
index c829f19..0000000 |
297 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch |
298 |
+++ /dev/null |
299 |
@@ -1,137 +0,0 @@ |
300 |
---- a/Source/JavaScriptCore/runtime/MachineContext.h |
301 |
-+++ b/Source/JavaScriptCore/runtime/MachineContext.h |
302 |
-@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) |
303 |
- #error Unknown Architecture |
304 |
- #endif |
305 |
- |
306 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
307 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
308 |
- |
309 |
- #if CPU(X86) |
310 |
- return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
311 |
-@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) |
312 |
- #error Unknown Architecture |
313 |
- #endif |
314 |
- |
315 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
316 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
317 |
- |
318 |
- // The following sequence depends on glibc's sys/ucontext.h. |
319 |
- #if CPU(X86) |
320 |
-@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) |
321 |
- #error Unknown Architecture |
322 |
- #endif |
323 |
- |
324 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
325 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
326 |
- |
327 |
- // The following sequence depends on glibc's sys/ucontext.h. |
328 |
- #if CPU(X86) |
329 |
-@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) |
330 |
- #error Unknown Architecture |
331 |
- #endif |
332 |
- |
333 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
334 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
335 |
- |
336 |
- // The following sequence depends on glibc's sys/ucontext.h. |
337 |
- #if CPU(X86) |
338 |
-@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) |
339 |
- #error Unknown Architecture |
340 |
- #endif |
341 |
- |
342 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
343 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
344 |
- |
345 |
- // The following sequence depends on glibc's sys/ucontext.h. |
346 |
- #if CPU(X86) |
347 |
- |
348 |
---- a/Source/JavaScriptCore/runtime/Options.h |
349 |
-+++ b/Source/JavaScriptCore/runtime/Options.h |
350 |
-@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; |
351 |
- \ |
352 |
- v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ |
353 |
- \ |
354 |
-- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ |
355 |
-- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
356 |
-- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
357 |
-+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ |
358 |
-+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
359 |
-+ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
360 |
- \ |
361 |
- v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ |
362 |
- v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |
363 |
- |
364 |
---- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp |
365 |
-+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp |
366 |
-@@ -836,7 +836,7 @@ int yydebug; |
367 |
- #if YYERROR_VERBOSE |
368 |
- |
369 |
- # ifndef yystrlen |
370 |
--# if defined __GLIBC__ && defined _STRING_H |
371 |
-+# if defined __linux__ && defined _STRING_H |
372 |
- # define yystrlen strlen |
373 |
- # else |
374 |
- /* Return the length of YYSTR. */ |
375 |
-@@ -852,7 +852,7 @@ yystrlen (const char *yystr) |
376 |
- # endif |
377 |
- |
378 |
- # ifndef yystpcpy |
379 |
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
380 |
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
381 |
- # define yystpcpy stpcpy |
382 |
- # else |
383 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
384 |
- |
385 |
---- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
386 |
-+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
387 |
-@@ -1975,7 +1975,7 @@ int yydebug; |
388 |
- #if YYERROR_VERBOSE |
389 |
- |
390 |
- # ifndef yystrlen |
391 |
--# if defined __GLIBC__ && defined _STRING_H |
392 |
-+# if defined __linux__ && defined _STRING_H |
393 |
- # define yystrlen strlen |
394 |
- # else |
395 |
- /* Return the length of YYSTR. */ |
396 |
-@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr) |
397 |
- # endif |
398 |
- |
399 |
- # ifndef yystpcpy |
400 |
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
401 |
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
402 |
- # define yystpcpy stpcpy |
403 |
- # else |
404 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
405 |
- |
406 |
---- a/Source/WTF/wtf/Platform.h |
407 |
-+++ b/Source/WTF/wtf/Platform.h |
408 |
-@@ -710,7 +710,7 @@ |
409 |
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 |
410 |
- #endif |
411 |
- |
412 |
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
413 |
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
414 |
- #define HAVE_MACHINE_CONTEXT 1 |
415 |
- #endif |
416 |
- |
417 |
---- a/Source/WebCore/xml/XPathGrammar.cpp |
418 |
-+++ b/Source/WebCore/xml/XPathGrammar.cpp |
419 |
-@@ -966,7 +966,7 @@ int yydebug; |
420 |
- #if YYERROR_VERBOSE |
421 |
- |
422 |
- # ifndef yystrlen |
423 |
--# if defined __GLIBC__ && defined _STRING_H |
424 |
-+# if defined __linux__ && defined _STRING_H |
425 |
- # define yystrlen strlen |
426 |
- # else |
427 |
- /* Return the length of YYSTR. */ |
428 |
-@@ -989,7 +989,7 @@ yystrlen (yystr) |
429 |
- # endif |
430 |
- |
431 |
- # ifndef yystpcpy |
432 |
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
433 |
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
434 |
- # define yystpcpy stpcpy |
435 |
- # else |
436 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
437 |
|
438 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch |
439 |
deleted file mode 100644 |
440 |
index 475c985..0000000 |
441 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch |
442 |
+++ /dev/null |
443 |
@@ -1,53 +0,0 @@ |
444 |
-From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001 |
445 |
-From: Heiko Becker <heirecka@×××××××.org> |
446 |
-Date: Fri, 4 Oct 2019 22:17:11 +0200 |
447 |
-Subject: [PATCH] Add missing semicolons to fix build with icu 65.1 |
448 |
- |
449 |
---- |
450 |
- Source/WTF/wtf/URLHelpers.cpp | 2 +- |
451 |
- Source/WebCore/dom/Document.cpp | 6 +++--- |
452 |
- 4 files changed, 25 insertions(+), 4 deletions(-) |
453 |
- |
454 |
-diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp |
455 |
-index 18e7f13cd61..c584f1a0cb7 100644 |
456 |
---- a/Source/WTF/wtf/URLHelpers.cpp |
457 |
-+++ b/Source/WTF/wtf/URLHelpers.cpp |
458 |
-@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt |
459 |
- Optional<UChar32> previousCodePoint; |
460 |
- while (i < length) { |
461 |
- UChar32 c; |
462 |
-- U16_NEXT(buffer, i, length, c) |
463 |
-+ U16_NEXT(buffer, i, length, c); |
464 |
- UErrorCode error = U_ZERO_ERROR; |
465 |
- UScriptCode script = uscript_getScript(c, &error); |
466 |
- if (error != U_ZERO_ERROR) { |
467 |
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp |
468 |
-index 0fd0fa090bf..01f76850f3d 100644 |
469 |
---- a/Source/WebCore/dom/Document.cpp |
470 |
-+++ b/Source/WebCore/dom/Document.cpp |
471 |
-@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) |
472 |
- unsigned i = 0; |
473 |
- |
474 |
- UChar32 c; |
475 |
-- U16_NEXT(characters, i, length, c) |
476 |
-+ U16_NEXT(characters, i, length, c); |
477 |
- if (!isValidNameStart(c)) |
478 |
- return false; |
479 |
- |
480 |
- while (i < length) { |
481 |
-- U16_NEXT(characters, i, length, c) |
482 |
-+ U16_NEXT(characters, i, length, c); |
483 |
- if (!isValidNamePart(c)) |
484 |
- return false; |
485 |
- } |
486 |
-@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons |
487 |
- |
488 |
- for (unsigned i = 0; i < length; ) { |
489 |
- UChar32 c; |
490 |
-- U16_NEXT(qualifiedName, i, length, c) |
491 |
-+ U16_NEXT(qualifiedName, i, length, c); |
492 |
- if (c == ':') { |
493 |
- if (sawColon) |
494 |
- return Exception { InvalidCharacterError }; |
495 |
--- |
496 |
-2.23.0 |
497 |
|
498 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch |
499 |
deleted file mode 100644 |
500 |
index 8cd73b3..0000000 |
501 |
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch |
502 |
+++ /dev/null |
503 |
@@ -1,136 +0,0 @@ |
504 |
---- a/Source/JavaScriptCore/runtime/MachineContext.h |
505 |
-+++ b/Source/JavaScriptCore/runtime/MachineContext.h |
506 |
-@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) |
507 |
- #error Unknown Architecture |
508 |
- #endif |
509 |
- |
510 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
511 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
512 |
- |
513 |
- #if CPU(X86) |
514 |
- return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
515 |
-@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) |
516 |
- #error Unknown Architecture |
517 |
- #endif |
518 |
- |
519 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
520 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
521 |
- |
522 |
- // The following sequence depends on glibc's sys/ucontext.h. |
523 |
- #if CPU(X86) |
524 |
-@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) |
525 |
- #error Unknown Architecture |
526 |
- #endif |
527 |
- |
528 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
529 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
530 |
- |
531 |
- // The following sequence depends on glibc's sys/ucontext.h. |
532 |
- #if CPU(X86) |
533 |
-@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) |
534 |
- #error Unknown Architecture |
535 |
- #endif |
536 |
- |
537 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
538 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
539 |
- |
540 |
- // The following sequence depends on glibc's sys/ucontext.h. |
541 |
- #if CPU(X86) |
542 |
-@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) |
543 |
- #error Unknown Architecture |
544 |
- #endif |
545 |
- |
546 |
--#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) |
547 |
-+#elif OS(FUCHSIA) || defined(__linux__) |
548 |
- |
549 |
- // The following sequence depends on glibc's sys/ucontext.h. |
550 |
- #if CPU(X86) |
551 |
- |
552 |
---- a/Source/JavaScriptCore/runtime/Options.h |
553 |
-+++ b/Source/JavaScriptCore/runtime/Options.h |
554 |
-@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; |
555 |
- \ |
556 |
- v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ |
557 |
- \ |
558 |
-- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ |
559 |
-- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
560 |
-- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
561 |
-+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ |
562 |
-+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
563 |
-+ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
564 |
- \ |
565 |
- v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ |
566 |
- v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |
567 |
- |
568 |
---- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
569 |
-+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp |
570 |
-@@ -1975,7 +1975,7 @@ int yydebug; |
571 |
- #if YYERROR_VERBOSE |
572 |
- |
573 |
- # ifndef yystrlen |
574 |
--# if defined __GLIBC__ && defined _STRING_H |
575 |
-+# if defined __linux__ && defined _STRING_H |
576 |
- # define yystrlen strlen |
577 |
- # else |
578 |
- /* Return the length of YYSTR. */ |
579 |
-@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr) |
580 |
- # endif |
581 |
- |
582 |
- # ifndef yystpcpy |
583 |
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
584 |
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
585 |
- # define yystpcpy stpcpy |
586 |
- # else |
587 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
588 |
- |
589 |
---- a/Source/WTF/wtf/Platform.h |
590 |
-+++ b/Source/WTF/wtf/Platform.h |
591 |
-@@ -710,7 +710,7 @@ |
592 |
- #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 |
593 |
- #endif |
594 |
- |
595 |
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
596 |
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) |
597 |
- #define HAVE_MACHINE_CONTEXT 1 |
598 |
- #endif |
599 |
- |
600 |
---- a/Source/WebCore/xml/XPathGrammar.cpp |
601 |
-+++ b/Source/WebCore/xml/XPathGrammar.cpp |
602 |
-@@ -966,7 +966,7 @@ int yydebug; |
603 |
- #if YYERROR_VERBOSE |
604 |
- |
605 |
- # ifndef yystrlen |
606 |
--# if defined __GLIBC__ && defined _STRING_H |
607 |
-+# if defined __linux__ && defined _STRING_H |
608 |
- # define yystrlen strlen |
609 |
- # else |
610 |
- /* Return the length of YYSTR. */ |
611 |
-@@ -989,7 +989,7 @@ yystrlen (yystr) |
612 |
- # endif |
613 |
- |
614 |
- # ifndef yystpcpy |
615 |
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
616 |
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
617 |
- # define yystpcpy stpcpy |
618 |
- # else |
619 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
620 |
---- ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.orig |
621 |
-+++ ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp |
622 |
-@@ -728,7 +728,7 @@ |
623 |
- #if YYERROR_VERBOSE |
624 |
- |
625 |
- # ifndef yystrlen |
626 |
--# if defined __GLIBC__ && defined _STRING_H |
627 |
-+# if defined __linux__ && defined _STRING_H |
628 |
- # define yystrlen strlen |
629 |
- # else |
630 |
- /* Return the length of YYSTR. */ |
631 |
-@@ -743,7 +743,7 @@ |
632 |
- # endif |
633 |
- |
634 |
- # ifndef yystpcpy |
635 |
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE |
636 |
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE |
637 |
- # define yystpcpy stpcpy |
638 |
- # else |
639 |
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |
640 |
|
641 |
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml |
642 |
index e88c10a..24e8c4e 100644 |
643 |
--- a/net-libs/webkit-gtk/metadata.xml |
644 |
+++ b/net-libs/webkit-gtk/metadata.xml |
645 |
@@ -6,13 +6,8 @@ |
646 |
<name>Gentoo GNOME Desktop</name> |
647 |
</maintainer> |
648 |
<use> |
649 |
- <flag name="coverage">Enable code coverage support</flag> |
650 |
<flag name="egl">Enable EGL support</flag> |
651 |
<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag> |
652 |
- <flag name="gles2">Enable GLESv2 support</flag> |
653 |
- <flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL</flag> |
654 |
<flag name="jumbo-build">Combine source files to speed up build process</flag> |
655 |
- <flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag> |
656 |
- <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag> |
657 |
</use> |
658 |
</pkgmetadata> |
659 |
|
660 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild |
661 |
deleted file mode 100644 |
662 |
index 9012463..0000000 |
663 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild |
664 |
+++ /dev/null |
665 |
@@ -1,287 +0,0 @@ |
666 |
-# Copyright 1999-2020 Gentoo Authors |
667 |
-# Distributed under the terms of the GNU General Public License v2 |
668 |
- |
669 |
-EAPI=6 |
670 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
671 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
672 |
-USE_RUBY="ruby24 ruby25 ruby26" |
673 |
- |
674 |
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx |
675 |
- |
676 |
-MY_P="webkitgtk-${PV}" |
677 |
-DESCRIPTION="Open source web browser engine" |
678 |
-HOMEPAGE="https://www.webkitgtk.org" |
679 |
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
680 |
- |
681 |
-LICENSE="LGPL-2+ BSD" |
682 |
-SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
683 |
-KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos" |
684 |
- |
685 |
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X" |
686 |
- |
687 |
-# webgl needs gstreamer, bug #560612 |
688 |
-# gstreamer with opengl/gles2 needs egl |
689 |
-REQUIRED_USE=" |
690 |
- geolocation? ( introspection ) |
691 |
- gles2? ( egl !opengl ) |
692 |
- gstreamer? ( opengl? ( egl ) ) |
693 |
- nsplugin? ( X ) |
694 |
- webgl? ( gstreamer |
695 |
- || ( gles2 opengl ) ) |
696 |
- wayland? ( egl ) |
697 |
- || ( aqua wayland X ) |
698 |
-" |
699 |
- |
700 |
-# Tests fail to link for inexplicable reasons |
701 |
-# https://bugs.webkit.org/show_bug.cgi?id=148210 |
702 |
-RESTRICT="test" |
703 |
- |
704 |
-# Aqua support in gtk3 is untested |
705 |
-# Dependencies found at Source/cmake/OptionsGTK.cmake |
706 |
-# Various compile-time optionals for gtk+-3.22.0 - ensure it |
707 |
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) |
708 |
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) |
709 |
-RDEPEND=" |
710 |
- >=x11-libs/cairo-1.16.0:=[X?] |
711 |
- >=media-libs/fontconfig-2.13.0:1.0 |
712 |
- >=media-libs/freetype-2.9.0:2 |
713 |
- >=dev-libs/libgcrypt-1.7.0:0= |
714 |
- >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] |
715 |
- >=media-libs/harfbuzz-1.4.2:=[icu(+)] |
716 |
- >=dev-libs/icu-3.8.1-r1:= |
717 |
- virtual/jpeg:0= |
718 |
- >=net-libs/libsoup-2.48:2.4[introspection?] |
719 |
- >=dev-libs/libxml2-2.8.0:2 |
720 |
- >=media-libs/libpng-1.4:0= |
721 |
- dev-db/sqlite:3= |
722 |
- sys-libs/zlib:0 |
723 |
- >=dev-libs/atk-2.8.0 |
724 |
- media-libs/libwebp:= |
725 |
- |
726 |
- >=dev-libs/glib-2.40:2 |
727 |
- >=dev-libs/libxslt-1.1.7 |
728 |
- media-libs/woff2 |
729 |
- gnome-keyring? ( app-crypt/libsecret ) |
730 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
731 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
732 |
- dev-libs/libtasn1:= |
733 |
- nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) |
734 |
- spell? ( >=app-text/enchant-0.22:= ) |
735 |
- gstreamer? ( |
736 |
- >=media-libs/gstreamer-1.14:1.0 |
737 |
- >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] |
738 |
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 |
739 |
- >=media-libs/gst-plugins-bad-1.14:1.0 ) |
740 |
- |
741 |
- X? ( |
742 |
- x11-libs/libX11 |
743 |
- x11-libs/libXcomposite |
744 |
- x11-libs/libXdamage |
745 |
- x11-libs/libXrender |
746 |
- x11-libs/libXt ) |
747 |
- |
748 |
- libnotify? ( x11-libs/libnotify ) |
749 |
- dev-libs/hyphen |
750 |
- jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) |
751 |
- |
752 |
- egl? ( media-libs/mesa[egl] ) |
753 |
- gles2? ( media-libs/mesa[gles2] ) |
754 |
- opengl? ( virtual/opengl ) |
755 |
- webgl? ( |
756 |
- x11-libs/libXcomposite |
757 |
- x11-libs/libXdamage ) |
758 |
-" |
759 |
- |
760 |
-# paxctl needed for bug #407085 |
761 |
-# Need real bison, not yacc |
762 |
-DEPEND="${RDEPEND} |
763 |
- ${PYTHON_DEPS} |
764 |
- ${RUBY_DEPS} |
765 |
- >=app-accessibility/at-spi2-core-2.5.3 |
766 |
- dev-util/glib-utils |
767 |
- >=dev-util/gtk-doc-am-1.10 |
768 |
- >=dev-util/gperf-3.0.1 |
769 |
- >=sys-devel/bison-2.4.3 |
770 |
- || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) |
771 |
- sys-devel/gettext |
772 |
- virtual/pkgconfig |
773 |
- |
774 |
- >=dev-lang/perl-5.10 |
775 |
- virtual/perl-Data-Dumper |
776 |
- virtual/perl-Carp |
777 |
- virtual/perl-JSON-PP |
778 |
- |
779 |
- doc? ( >=dev-util/gtk-doc-1.10 ) |
780 |
- geolocation? ( dev-util/gdbus-codegen ) |
781 |
-" |
782 |
-# test? ( |
783 |
-# dev-python/pygobject:3[python_targets_python2_7] |
784 |
-# x11-themes/hicolor-icon-theme |
785 |
-# jit? ( sys-apps/paxctl ) ) |
786 |
- |
787 |
-S="${WORKDIR}/${MY_P}" |
788 |
- |
789 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
790 |
- |
791 |
-pkg_pretend() { |
792 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
793 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
794 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
795 |
- check-reqs_pkg_pretend |
796 |
- fi |
797 |
- |
798 |
- if ! test-flag-CXX -std=c++11 ; then |
799 |
- die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" |
800 |
- fi |
801 |
- |
802 |
- if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then |
803 |
- die 'The active compiler needs to be gcc 4.9 (or newer)' |
804 |
- fi |
805 |
- fi |
806 |
- |
807 |
- if ! use opengl && ! use gles2; then |
808 |
- ewarn |
809 |
- ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely." |
810 |
- ewarn "This is an unsupported configuration meant for very specific embedded" |
811 |
- ewarn "use cases, where there truly is no GL possible (and even that use case" |
812 |
- ewarn "is very unlikely to come by). If you have GL (even software-only), you" |
813 |
- ewarn "really really should be enabling OpenGL!" |
814 |
- ewarn |
815 |
- fi |
816 |
-} |
817 |
- |
818 |
-pkg_setup() { |
819 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
820 |
- check-reqs_pkg_setup |
821 |
- fi |
822 |
- |
823 |
- python-any-r1_pkg_setup |
824 |
-} |
825 |
- |
826 |
-src_prepare() { |
827 |
- eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596 |
828 |
- eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 |
829 |
- if use elibc_musl ; then |
830 |
- # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=ae4a15801816b7f140076fa8f636d46247902af3 |
831 |
- eapply "${FILESDIR}"/${PN}-2.22.4-musl.patch |
832 |
- fi |
833 |
- cmake-utils_src_prepare |
834 |
- gnome2_src_prepare |
835 |
-} |
836 |
- |
837 |
-src_configure() { |
838 |
- # Respect CC, otherwise fails on prefix #395875 |
839 |
- tc-export CC |
840 |
- |
841 |
- # It does not compile on alpha without this in LDFLAGS |
842 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
843 |
- use alpha && append-ldflags "-Wl,--no-relax" |
844 |
- |
845 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
846 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
847 |
- |
848 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
849 |
- use sparc && filter-flags "-mvis" |
850 |
- |
851 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
852 |
- use ppc64 && append-flags "-mminimal-toc" |
853 |
- |
854 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
855 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
856 |
- if ! use ia64; then |
857 |
- append-ldflags "-Wl,--no-keep-memory" |
858 |
- fi |
859 |
- |
860 |
- # We try to use gold when possible for this package |
861 |
-# if ! tc-ld-is-gold ; then |
862 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
863 |
-# fi |
864 |
- |
865 |
- # Multiple rendering bugs on youtube, github, etc without this, bug #547224 |
866 |
- append-flags $(test-flags -fno-strict-aliasing) |
867 |
- |
868 |
- # Ruby situation is a bit complicated. See bug 513888 |
869 |
- local rubyimpl |
870 |
- local ruby_interpreter="" |
871 |
- for rubyimpl in ${USE_RUBY}; do |
872 |
- if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then |
873 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" |
874 |
- fi |
875 |
- done |
876 |
- # This will rarely occur. Only a couple of corner cases could lead us to |
877 |
- # that failure. See bug 513888 |
878 |
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" |
879 |
- |
880 |
- # TODO: Check Web Audio support |
881 |
- # should somehow let user select between them? |
882 |
- # |
883 |
- # FTL_JIT requires llvm |
884 |
- # |
885 |
- # opengl needs to be explicetly handled, bug #576634 |
886 |
- |
887 |
- local opengl_enabled |
888 |
- if use opengl || use gles2; then |
889 |
- opengl_enabled=ON |
890 |
- else |
891 |
- opengl_enabled=OFF |
892 |
- fi |
893 |
- |
894 |
- local mycmakeargs=( |
895 |
- #-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1 |
896 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
897 |
- -DENABLE_API_TESTS=$(usex test) |
898 |
- -DENABLE_GTKDOC=$(usex doc) |
899 |
- -DENABLE_GEOLOCATION=$(usex geolocation) |
900 |
- $(cmake-utils_use_find_package gles2 OpenGLES2) |
901 |
- -DENABLE_GLES2=$(usex gles2) |
902 |
- -DENABLE_VIDEO=$(usex gstreamer) |
903 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
904 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
905 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
906 |
- -DUSE_LIBSECRET=$(usex gnome-keyring) |
907 |
- -DUSE_OPENJPEG=$(usex jpeg2k) |
908 |
- -DUSE_WOFF2=ON |
909 |
- -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) |
910 |
- -DENABLE_SPELLCHECK=$(usex spell) |
911 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
912 |
- -DENABLE_WEBGL=$(usex webgl) |
913 |
- $(cmake-utils_use_find_package egl EGL) |
914 |
- $(cmake-utils_use_find_package opengl OpenGL) |
915 |
- -DENABLE_X11_TARGET=$(usex X) |
916 |
- -DENABLE_OPENGL=${opengl_enabled} |
917 |
- -DCMAKE_BUILD_TYPE=Release |
918 |
- -DPORT=GTK |
919 |
- ${ruby_interpreter} |
920 |
- ) |
921 |
- |
922 |
- # Allow it to use GOLD when possible as it has all the magic to |
923 |
- # detect when to use it and using gold for this concrete package has |
924 |
- # multiple advantages and is also the upstream default, bug #585788 |
925 |
-# if tc-ld-is-gold ; then |
926 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
927 |
-# else |
928 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
929 |
-# fi |
930 |
- |
931 |
- cmake-utils_src_configure |
932 |
-} |
933 |
- |
934 |
-src_compile() { |
935 |
- cmake-utils_src_compile |
936 |
-} |
937 |
- |
938 |
-src_test() { |
939 |
- # Prevents test failures on PaX systems |
940 |
- pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
941 |
- |
942 |
- cmake-utils_src_test |
943 |
-} |
944 |
- |
945 |
-src_install() { |
946 |
- cmake-utils_src_install |
947 |
- |
948 |
- # Prevents crashes on PaX systems, bug #522808 |
949 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
950 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
951 |
- use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 |
952 |
-} |
953 |
|
954 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild |
955 |
deleted file mode 100644 |
956 |
index 5c4613e..0000000 |
957 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild |
958 |
+++ /dev/null |
959 |
@@ -1,290 +0,0 @@ |
960 |
-# Copyright 1999-2020 Gentoo Authors |
961 |
-# Distributed under the terms of the GNU General Public License v2 |
962 |
- |
963 |
-EAPI=6 |
964 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
965 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
966 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
967 |
-CMAKE_MIN_VERSION=3.10 |
968 |
- |
969 |
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx |
970 |
- |
971 |
-MY_P="webkitgtk-${PV}" |
972 |
-DESCRIPTION="Open source web browser engine" |
973 |
-HOMEPAGE="https://www.webkitgtk.org" |
974 |
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
975 |
- |
976 |
-LICENSE="LGPL-2+ BSD" |
977 |
-SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
978 |
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86" |
979 |
- |
980 |
-IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X" |
981 |
- |
982 |
-# gstreamer with opengl/gles2 needs egl |
983 |
-REQUIRED_USE=" |
984 |
- gles2-only? ( egl !opengl ) |
985 |
- gstreamer? ( opengl? ( egl ) ) |
986 |
- wayland? ( egl ) |
987 |
- || ( aqua wayland X ) |
988 |
-" |
989 |
- |
990 |
-# Tests fail to link for inexplicable reasons |
991 |
-# https://bugs.webkit.org/show_bug.cgi?id=148210 |
992 |
-RESTRICT="test" |
993 |
- |
994 |
-# Aqua support in gtk3 is untested |
995 |
-# Dependencies found at Source/cmake/OptionsGTK.cmake |
996 |
-# Various compile-time optionals for gtk+-3.22.0 - ensure it |
997 |
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26 |
998 |
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) |
999 |
-wpe_depend=" |
1000 |
- >=gui-libs/libwpe-1.3.0:1.0 |
1001 |
- >=gui-libs/wpebackend-fdo-1.3.1:1.0 |
1002 |
-" |
1003 |
-RDEPEND=" |
1004 |
- >=x11-libs/cairo-1.16.0:=[X?] |
1005 |
- >=media-libs/fontconfig-2.13.0:1.0 |
1006 |
- >=media-libs/freetype-2.9.0:2 |
1007 |
- >=dev-libs/libgcrypt-1.7.0:0= |
1008 |
- >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] |
1009 |
- >=media-libs/harfbuzz-1.4.2:=[icu(+)] |
1010 |
- >=dev-libs/icu-3.8.1-r1:= |
1011 |
- virtual/jpeg:0= |
1012 |
- >=net-libs/libsoup-2.54:2.4[introspection?] |
1013 |
- >=dev-libs/libxml2-2.8.0:2 |
1014 |
- >=media-libs/libpng-1.4:0= |
1015 |
- dev-db/sqlite:3= |
1016 |
- sys-libs/zlib:0 |
1017 |
- >=dev-libs/atk-2.16.0 |
1018 |
- media-libs/libwebp:= |
1019 |
- |
1020 |
- >=dev-libs/glib-2.44.0:2 |
1021 |
- >=dev-libs/libxslt-1.1.7 |
1022 |
- media-libs/woff2 |
1023 |
- gnome-keyring? ( app-crypt/libsecret ) |
1024 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
1025 |
- dev-libs/libtasn1:= |
1026 |
- spell? ( >=app-text/enchant-0.22:2 ) |
1027 |
- gstreamer? ( |
1028 |
- >=media-libs/gstreamer-1.14:1.0 |
1029 |
- >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] |
1030 |
- gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) |
1031 |
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 |
1032 |
- >=media-libs/gst-plugins-bad-1.14:1.0 ) |
1033 |
- |
1034 |
- X? ( |
1035 |
- x11-libs/libX11 |
1036 |
- x11-libs/libXcomposite |
1037 |
- x11-libs/libXdamage |
1038 |
- x11-libs/libXrender |
1039 |
- x11-libs/libXt ) |
1040 |
- |
1041 |
- libnotify? ( x11-libs/libnotify ) |
1042 |
- dev-libs/hyphen |
1043 |
- jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) |
1044 |
- |
1045 |
- egl? ( media-libs/mesa[egl] ) |
1046 |
- gles2-only? ( media-libs/mesa[gles2] ) |
1047 |
- opengl? ( virtual/opengl ) |
1048 |
- wayland? ( |
1049 |
- opengl? ( ${wpe_depend} ) |
1050 |
- gles2-only? ( ${wpe_depend} ) |
1051 |
- ) |
1052 |
- |
1053 |
- seccomp? ( |
1054 |
- >=sys-apps/bubblewrap-0.3.1 |
1055 |
- sys-libs/libseccomp |
1056 |
- sys-apps/xdg-dbus-proxy |
1057 |
- ) |
1058 |
-" |
1059 |
-unset wpe_depend |
1060 |
-# paxctl needed for bug #407085 |
1061 |
-# Need real bison, not yacc |
1062 |
-DEPEND="${RDEPEND} |
1063 |
- ${PYTHON_DEPS} |
1064 |
- ${RUBY_DEPS} |
1065 |
- >=app-accessibility/at-spi2-core-2.5.3 |
1066 |
- dev-util/glib-utils |
1067 |
- >=dev-util/gperf-3.0.1 |
1068 |
- >=sys-devel/bison-2.4.3 |
1069 |
- || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) |
1070 |
- sys-devel/gettext |
1071 |
- virtual/pkgconfig |
1072 |
- |
1073 |
- >=dev-lang/perl-5.10 |
1074 |
- virtual/perl-Data-Dumper |
1075 |
- virtual/perl-Carp |
1076 |
- virtual/perl-JSON-PP |
1077 |
- |
1078 |
- gtk-doc? ( >=dev-util/gtk-doc-1.10 ) |
1079 |
- geolocation? ( dev-util/gdbus-codegen ) |
1080 |
-" |
1081 |
-# test? ( |
1082 |
-# dev-python/pygobject:3[python_targets_python2_7] |
1083 |
-# x11-themes/hicolor-icon-theme |
1084 |
-# jit? ( sys-apps/paxctl ) ) |
1085 |
-RDEPEND="${RDEPEND} |
1086 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
1087 |
-" |
1088 |
- |
1089 |
-S="${WORKDIR}/${MY_P}" |
1090 |
- |
1091 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
1092 |
- |
1093 |
-pkg_pretend() { |
1094 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
1095 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
1096 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
1097 |
- check-reqs_pkg_pretend |
1098 |
- fi |
1099 |
- |
1100 |
- if ! test-flag-CXX -std=c++17 ; then |
1101 |
- die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" |
1102 |
- fi |
1103 |
- fi |
1104 |
- |
1105 |
- if ! use opengl && ! use gles2-only; then |
1106 |
- ewarn |
1107 |
- ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely." |
1108 |
- ewarn "This is an unsupported configuration meant for very specific embedded" |
1109 |
- ewarn "use cases, where there truly is no GL possible (and even that use case" |
1110 |
- ewarn "is very unlikely to come by). If you have GL (even software-only), you" |
1111 |
- ewarn "really really should be enabling OpenGL!" |
1112 |
- ewarn |
1113 |
- fi |
1114 |
-} |
1115 |
- |
1116 |
-pkg_setup() { |
1117 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
1118 |
- check-reqs_pkg_setup |
1119 |
- fi |
1120 |
- |
1121 |
- python-any-r1_pkg_setup |
1122 |
-} |
1123 |
- |
1124 |
-src_prepare() { |
1125 |
- eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 |
1126 |
- eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194 |
1127 |
- eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32 |
1128 |
- if use elibc_musl ; then |
1129 |
- # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=9c8441ce582f411dbec289ab698e6d0a962f62cc |
1130 |
- eapply "${FILESDIR}/${PN}-2.26.2-musl.patch" |
1131 |
- fi |
1132 |
- cmake-utils_src_prepare |
1133 |
- gnome2_src_prepare |
1134 |
-} |
1135 |
- |
1136 |
-src_configure() { |
1137 |
- # Respect CC, otherwise fails on prefix #395875 |
1138 |
- tc-export CC |
1139 |
- |
1140 |
- # It does not compile on alpha without this in LDFLAGS |
1141 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
1142 |
- use alpha && append-ldflags "-Wl,--no-relax" |
1143 |
- |
1144 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
1145 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
1146 |
- |
1147 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
1148 |
- use sparc && filter-flags "-mvis" |
1149 |
- |
1150 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
1151 |
- use ppc64 && append-flags "-mminimal-toc" |
1152 |
- |
1153 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
1154 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
1155 |
- if ! use ia64; then |
1156 |
- append-ldflags "-Wl,--no-keep-memory" |
1157 |
- fi |
1158 |
- |
1159 |
- # We try to use gold when possible for this package |
1160 |
-# if ! tc-ld-is-gold ; then |
1161 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
1162 |
-# fi |
1163 |
- |
1164 |
- # Ruby situation is a bit complicated. See bug 513888 |
1165 |
- local rubyimpl |
1166 |
- local ruby_interpreter="" |
1167 |
- for rubyimpl in ${USE_RUBY}; do |
1168 |
- if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then |
1169 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" |
1170 |
- fi |
1171 |
- done |
1172 |
- # This will rarely occur. Only a couple of corner cases could lead us to |
1173 |
- # that failure. See bug 513888 |
1174 |
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" |
1175 |
- |
1176 |
- # TODO: Check Web Audio support |
1177 |
- # should somehow let user select between them? |
1178 |
- # |
1179 |
- # opengl needs to be explicetly handled, bug #576634 |
1180 |
- |
1181 |
- local use_wpe_renderer=OFF |
1182 |
- local opengl_enabled |
1183 |
- if use opengl || use gles2-only; then |
1184 |
- opengl_enabled=ON |
1185 |
- use wayland && use_wpe_renderer=ON |
1186 |
- else |
1187 |
- opengl_enabled=OFF |
1188 |
- fi |
1189 |
- |
1190 |
- local mycmakeargs=( |
1191 |
- -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) |
1192 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
1193 |
- -DENABLE_API_TESTS=$(usex test) |
1194 |
- -DENABLE_GTKDOC=$(usex gtk-doc) |
1195 |
- -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) |
1196 |
- $(cmake-utils_use_find_package gles2-only OpenGLES2) |
1197 |
- -DENABLE_GLES2=$(usex gles2-only) |
1198 |
- -DENABLE_VIDEO=$(usex gstreamer) |
1199 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
1200 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
1201 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
1202 |
- -DUSE_LIBSECRET=$(usex gnome-keyring) |
1203 |
- -DUSE_OPENJPEG=$(usex jpeg2k) |
1204 |
- -DUSE_WOFF2=ON |
1205 |
- -DENABLE_SPELLCHECK=$(usex spell) |
1206 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
1207 |
- -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland |
1208 |
- $(cmake-utils_use_find_package egl EGL) |
1209 |
- $(cmake-utils_use_find_package opengl OpenGL) |
1210 |
- -DENABLE_X11_TARGET=$(usex X) |
1211 |
- -DENABLE_OPENGL=${opengl_enabled} |
1212 |
- -DENABLE_WEBGL=${opengl_enabled} |
1213 |
- -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) |
1214 |
- -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that |
1215 |
- -DCMAKE_BUILD_TYPE=Release |
1216 |
- -DPORT=GTK |
1217 |
- ${ruby_interpreter} |
1218 |
- ) |
1219 |
- |
1220 |
- # Allow it to use GOLD when possible as it has all the magic to |
1221 |
- # detect when to use it and using gold for this concrete package has |
1222 |
- # multiple advantages and is also the upstream default, bug #585788 |
1223 |
-# if tc-ld-is-gold ; then |
1224 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
1225 |
-# else |
1226 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
1227 |
-# fi |
1228 |
- |
1229 |
- cmake-utils_src_configure |
1230 |
-} |
1231 |
- |
1232 |
-src_compile() { |
1233 |
- cmake-utils_src_compile |
1234 |
-} |
1235 |
- |
1236 |
-src_test() { |
1237 |
- # Prevents test failures on PaX systems |
1238 |
- pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
1239 |
- |
1240 |
- cmake-utils_src_test |
1241 |
-} |
1242 |
- |
1243 |
-src_install() { |
1244 |
- cmake-utils_src_install |
1245 |
- |
1246 |
- # Prevents crashes on PaX systems, bug #522808 |
1247 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
1248 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
1249 |
-} |
1250 |
|
1251 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild |
1252 |
deleted file mode 100644 |
1253 |
index aa08359..0000000 |
1254 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild |
1255 |
+++ /dev/null |
1256 |
@@ -1,302 +0,0 @@ |
1257 |
-# Copyright 1999-2020 Gentoo Authors |
1258 |
-# Distributed under the terms of the GNU General Public License v2 |
1259 |
- |
1260 |
-EAPI=6 |
1261 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
1262 |
-PYTHON_COMPAT=( python{3_6,3_7} ) |
1263 |
-USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
1264 |
-CMAKE_MIN_VERSION=3.10 |
1265 |
- |
1266 |
-inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx |
1267 |
- |
1268 |
-MY_P="webkitgtk-${PV}" |
1269 |
-DESCRIPTION="Open source web browser engine" |
1270 |
-HOMEPAGE="https://www.webkitgtk.org" |
1271 |
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
1272 |
- |
1273 |
-LICENSE="LGPL-2+ BSD" |
1274 |
-SLOT="4/37" # soname version of libwebkit2gtk-4.0 |
1275 |
-KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86" |
1276 |
- |
1277 |
-IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X" |
1278 |
- |
1279 |
-# gstreamer with opengl/gles2 needs egl |
1280 |
-REQUIRED_USE=" |
1281 |
- gles2-only? ( egl !opengl ) |
1282 |
- gstreamer? ( opengl? ( egl ) ) |
1283 |
- wayland? ( egl ) |
1284 |
- || ( aqua wayland X ) |
1285 |
-" |
1286 |
- |
1287 |
-# Tests fail to link for inexplicable reasons |
1288 |
-# https://bugs.webkit.org/show_bug.cgi?id=148210 |
1289 |
-RESTRICT="test" |
1290 |
- |
1291 |
-# Aqua support in gtk3 is untested |
1292 |
-# Dependencies found at Source/cmake/OptionsGTK.cmake |
1293 |
-# Various compile-time optionals for gtk+-3.22.0 - ensure it |
1294 |
-# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26 |
1295 |
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) |
1296 |
-wpe_depend=" |
1297 |
- >=gui-libs/libwpe-1.3.0:1.0 |
1298 |
- >=gui-libs/wpebackend-fdo-1.3.1:1.0 |
1299 |
-" |
1300 |
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix |
1301 |
-RDEPEND=" |
1302 |
- >=x11-libs/cairo-1.16.0:=[X?] |
1303 |
- >=media-libs/fontconfig-2.13.0:1.0 |
1304 |
- >=media-libs/freetype-2.9.0:2 |
1305 |
- >=dev-libs/libgcrypt-1.7.0:0= |
1306 |
- >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] |
1307 |
- >=media-libs/harfbuzz-1.4.2:=[icu(+)] |
1308 |
- >=dev-libs/icu-3.8.1-r1:= |
1309 |
- virtual/jpeg:0= |
1310 |
- >=net-libs/libsoup-2.54:2.4[introspection?] |
1311 |
- >=dev-libs/libxml2-2.8.0:2 |
1312 |
- >=media-libs/libpng-1.4:0= |
1313 |
- dev-db/sqlite:3= |
1314 |
- sys-libs/zlib:0 |
1315 |
- >=dev-libs/atk-2.16.0 |
1316 |
- media-libs/libwebp:= |
1317 |
- |
1318 |
- >=dev-libs/glib-2.44.0:2 |
1319 |
- >=dev-libs/libxslt-1.1.7 |
1320 |
- media-libs/woff2 |
1321 |
- gnome-keyring? ( app-crypt/libsecret ) |
1322 |
- introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) |
1323 |
- dev-libs/libtasn1:= |
1324 |
- spell? ( >=app-text/enchant-0.22:2 ) |
1325 |
- gstreamer? ( |
1326 |
- >=media-libs/gstreamer-1.14:1.0 |
1327 |
- >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] |
1328 |
- gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) |
1329 |
- >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 |
1330 |
- >=media-libs/gst-plugins-bad-1.14:1.0 ) |
1331 |
- |
1332 |
- X? ( |
1333 |
- x11-libs/libX11 |
1334 |
- x11-libs/libXcomposite |
1335 |
- x11-libs/libXdamage |
1336 |
- x11-libs/libXrender |
1337 |
- x11-libs/libXt ) |
1338 |
- |
1339 |
- libnotify? ( x11-libs/libnotify ) |
1340 |
- dev-libs/hyphen |
1341 |
- jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) |
1342 |
- |
1343 |
- egl? ( media-libs/mesa[egl] ) |
1344 |
- gles2-only? ( media-libs/mesa[gles2] ) |
1345 |
- opengl? ( virtual/opengl ) |
1346 |
- wayland? ( |
1347 |
- dev-libs/wayland |
1348 |
- >=dev-libs/wayland-protocols-1.12 |
1349 |
- opengl? ( ${wpe_depend} ) |
1350 |
- gles2-only? ( ${wpe_depend} ) |
1351 |
- ) |
1352 |
- |
1353 |
- seccomp? ( |
1354 |
- >=sys-apps/bubblewrap-0.3.1 |
1355 |
- sys-libs/libseccomp |
1356 |
- sys-apps/xdg-dbus-proxy |
1357 |
- ) |
1358 |
-" |
1359 |
-unset wpe_depend |
1360 |
-# paxctl needed for bug #407085 |
1361 |
-# Need real bison, not yacc |
1362 |
-DEPEND="${RDEPEND} |
1363 |
- ${PYTHON_DEPS} |
1364 |
- ${RUBY_DEPS} |
1365 |
- >=app-accessibility/at-spi2-core-2.5.3 |
1366 |
- dev-util/glib-utils |
1367 |
- >=dev-util/gperf-3.0.1 |
1368 |
- >=sys-devel/bison-2.4.3 |
1369 |
- || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) |
1370 |
- sys-devel/gettext |
1371 |
- virtual/pkgconfig |
1372 |
- |
1373 |
- >=dev-lang/perl-5.10 |
1374 |
- virtual/perl-Data-Dumper |
1375 |
- virtual/perl-Carp |
1376 |
- virtual/perl-JSON-PP |
1377 |
- |
1378 |
- gtk-doc? ( >=dev-util/gtk-doc-1.10 ) |
1379 |
- geolocation? ( dev-util/gdbus-codegen ) |
1380 |
-" |
1381 |
-# test? ( |
1382 |
-# dev-python/pygobject:3[python_targets_python2_7] |
1383 |
-# x11-themes/hicolor-icon-theme |
1384 |
-# jit? ( sys-apps/paxctl ) ) |
1385 |
-RDEPEND="${RDEPEND} |
1386 |
- geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) |
1387 |
-" |
1388 |
- |
1389 |
-S="${WORKDIR}/${MY_P}" |
1390 |
- |
1391 |
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 |
1392 |
- |
1393 |
-pkg_pretend() { |
1394 |
- if [[ ${MERGE_TYPE} != "binary" ]] ; then |
1395 |
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then |
1396 |
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" |
1397 |
- check-reqs_pkg_pretend |
1398 |
- fi |
1399 |
- |
1400 |
- if ! test-flag-CXX -std=c++17 ; then |
1401 |
- die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" |
1402 |
- fi |
1403 |
- fi |
1404 |
- |
1405 |
- if ! use opengl && ! use gles2-only; then |
1406 |
- ewarn |
1407 |
- ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely." |
1408 |
- ewarn "This is an unsupported configuration meant for very specific embedded" |
1409 |
- ewarn "use cases, where there truly is no GL possible (and even that use case" |
1410 |
- ewarn "is very unlikely to come by). If you have GL (even software-only), you" |
1411 |
- ewarn "really really should be enabling OpenGL!" |
1412 |
- ewarn |
1413 |
- fi |
1414 |
-} |
1415 |
- |
1416 |
-pkg_setup() { |
1417 |
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then |
1418 |
- check-reqs_pkg_setup |
1419 |
- fi |
1420 |
- |
1421 |
- python-any-r1_pkg_setup |
1422 |
-} |
1423 |
- |
1424 |
-src_prepare() { |
1425 |
- eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 |
1426 |
- eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32 |
1427 |
- eapply "${FILESDIR}"/${PV}-fix-yelp-desktopless-build.patch |
1428 |
- eapply "${FILESDIR}"/${PV}-use-gst-audiointerleave.patch |
1429 |
- eapply "${FILESDIR}"/${PV}-fix-ppc64-JSC.patch |
1430 |
- eapply "${FILESDIR}"/${PV}-opengl-without-X-fixes.patch |
1431 |
- eapply "${FILESDIR}"/${PV}-non-jumbo-fix.patch |
1432 |
- if use elibc_musl ; then |
1433 |
- # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=be463923b10a7268117c27c7e5515fc32457918c |
1434 |
- eapply "${FILESDIR}/${PN}-2.28.1-musl.patch" |
1435 |
- eapply "${FILESDIR}/${PN}-2.28.1-lower-stack-usage.patch" |
1436 |
- fi |
1437 |
- cmake-utils_src_prepare |
1438 |
- gnome2_src_prepare |
1439 |
-} |
1440 |
- |
1441 |
-src_configure() { |
1442 |
- # Respect CC, otherwise fails on prefix #395875 |
1443 |
- tc-export CC |
1444 |
- |
1445 |
- # It does not compile on alpha without this in LDFLAGS |
1446 |
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 |
1447 |
- use alpha && append-ldflags "-Wl,--no-relax" |
1448 |
- |
1449 |
- # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 |
1450 |
- use ia64 && append-ldflags "-Wl,--no-as-needed" |
1451 |
- |
1452 |
- # Sigbuses on SPARC with mcpu and co., bug #??? |
1453 |
- use sparc && filter-flags "-mvis" |
1454 |
- |
1455 |
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 |
1456 |
- use ppc64 && append-flags "-mminimal-toc" |
1457 |
- |
1458 |
- # Try to use less memory, bug #469942 (see Fedora .spec for reference) |
1459 |
- # --no-keep-memory doesn't work on ia64, bug #502492 |
1460 |
- if ! use ia64; then |
1461 |
- append-ldflags "-Wl,--no-keep-memory" |
1462 |
- fi |
1463 |
- |
1464 |
- # We try to use gold when possible for this package |
1465 |
-# if ! tc-ld-is-gold ; then |
1466 |
-# append-ldflags "-Wl,--reduce-memory-overheads" |
1467 |
-# fi |
1468 |
- |
1469 |
- # Ruby situation is a bit complicated. See bug 513888 |
1470 |
- local rubyimpl |
1471 |
- local ruby_interpreter="" |
1472 |
- for rubyimpl in ${USE_RUBY}; do |
1473 |
- if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then |
1474 |
- ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" |
1475 |
- fi |
1476 |
- done |
1477 |
- # This will rarely occur. Only a couple of corner cases could lead us to |
1478 |
- # that failure. See bug 513888 |
1479 |
- [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" |
1480 |
- |
1481 |
- # TODO: Check Web Audio support |
1482 |
- # should somehow let user select between them? |
1483 |
- # |
1484 |
- # opengl needs to be explicetly handled, bug #576634 |
1485 |
- |
1486 |
- local use_wpe_renderer=OFF |
1487 |
- local opengl_enabled |
1488 |
- if use opengl || use gles2-only; then |
1489 |
- opengl_enabled=ON |
1490 |
- use wayland && use_wpe_renderer=ON |
1491 |
- else |
1492 |
- opengl_enabled=OFF |
1493 |
- fi |
1494 |
- |
1495 |
- local mycmakeargs=( |
1496 |
- -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) |
1497 |
- -DENABLE_QUARTZ_TARGET=$(usex aqua) |
1498 |
- -DENABLE_API_TESTS=$(usex test) |
1499 |
- -DENABLE_GTKDOC=$(usex gtk-doc) |
1500 |
- -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) |
1501 |
- $(cmake-utils_use_find_package gles2-only OpenGLES2) |
1502 |
- -DENABLE_GLES2=$(usex gles2-only) |
1503 |
- -DENABLE_VIDEO=$(usex gstreamer) |
1504 |
- -DENABLE_WEB_AUDIO=$(usex gstreamer) |
1505 |
- -DENABLE_INTROSPECTION=$(usex introspection) |
1506 |
- -DUSE_LIBNOTIFY=$(usex libnotify) |
1507 |
- -DUSE_LIBSECRET=$(usex gnome-keyring) |
1508 |
- -DUSE_OPENJPEG=$(usex jpeg2k) |
1509 |
- -DUSE_WOFF2=ON |
1510 |
- -DENABLE_SPELLCHECK=$(usex spell) |
1511 |
- -DENABLE_WAYLAND_TARGET=$(usex wayland) |
1512 |
- -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland |
1513 |
- $(cmake-utils_use_find_package egl EGL) |
1514 |
- $(cmake-utils_use_find_package opengl OpenGL) |
1515 |
- -DENABLE_X11_TARGET=$(usex X) |
1516 |
- -DENABLE_OPENGL=${opengl_enabled} |
1517 |
- -DENABLE_WEBGL=${opengl_enabled} |
1518 |
- -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) |
1519 |
- -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that |
1520 |
- -DCMAKE_BUILD_TYPE=Release |
1521 |
- -DPORT=GTK |
1522 |
- ${ruby_interpreter} |
1523 |
- ) |
1524 |
- |
1525 |
- if use elibc_musl ; then |
1526 |
- mycmakeargs+=( -DENABLE_SAMPLING_PROFILER=OFF ) |
1527 |
- fi |
1528 |
- |
1529 |
- # Allow it to use GOLD when possible as it has all the magic to |
1530 |
- # detect when to use it and using gold for this concrete package has |
1531 |
- # multiple advantages and is also the upstream default, bug #585788 |
1532 |
-# if tc-ld-is-gold ; then |
1533 |
-# mycmakeargs+=( -DUSE_LD_GOLD=ON ) |
1534 |
-# else |
1535 |
-# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) |
1536 |
-# fi |
1537 |
- |
1538 |
- WK_USE_CCACHE=NO cmake-utils_src_configure |
1539 |
-} |
1540 |
- |
1541 |
-src_compile() { |
1542 |
- cmake-utils_src_compile |
1543 |
-} |
1544 |
- |
1545 |
-src_test() { |
1546 |
- # Prevents test failures on PaX systems |
1547 |
- pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* |
1548 |
- |
1549 |
- cmake-utils_src_test |
1550 |
-} |
1551 |
- |
1552 |
-src_install() { |
1553 |
- cmake-utils_src_install |
1554 |
- |
1555 |
- # Prevents crashes on PaX systems, bug #522808 |
1556 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" |
1557 |
- pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" |
1558 |
-} |