commit: 7de5d5d18ade80c661235931b6d06e14f5591032 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Wed Jul 29 20:22:04 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Aug 1 12:22:12 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7de5d5d1
net-libs/webkit-gtk: remove old Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> net-libs/webkit-gtk/Manifest | 3 - .../files/2.26.2-fix-arm-non-unified-build.patch | 27 -- net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch | 27 -- .../webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch | 59 ---- .../files/2.28.2-fix-yelp-desktopless-build.patch | 53 ---- .../files/2.28.2-use-gst-audiointerleave.patch | 55 ---- .../webkit-gtk/files/webkit-gtk-2.22.4-musl.patch | 137 ---------- .../files/webkit-gtk-2.24.4-icu-65.patch | 53 ---- .../webkit-gtk/files/webkit-gtk-2.26.2-musl.patch | 136 ---------- net-libs/webkit-gtk/metadata.xml | 5 - net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild | 287 -------------------- net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild | 290 -------------------- net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 302 --------------------- 13 files changed, 1434 deletions(-) diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 69ef7ac..e5f86c3 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,4 +1 @@ -DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112 -DIST webkitgtk-2.26.4.tar.xz 19329636 BLAKE2B 9dc88bf9e2bec4f3ccc316f4967e991595fa17151ad74781ea514e72700f2bd1f3ed32c5ee662eb1d04fa023e7c33ad1215078415b67c939ee0d4f6d55358d4a SHA512 b4d96672d0a41fb7591dd312254fc1b7a85e632923bf2d954d79d395306db96d5a6b4f85e24ea4ba0a447e45e29a41882249c26f6b2d6d572225abefcf28a474 -DIST webkitgtk-2.28.2.tar.xz 21427772 BLAKE2B 0749ffac526ae90ffb8af3fbf8f9ce87db80f229b96e2daa435f9bd6e6e985bbb8c33011976213b2e4ce286c9f1d38f0b85279507cdc9c52b95fbeb32c9f676c SHA512 c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8 DIST webkitgtk-2.28.3.tar.xz 21425556 BLAKE2B f51522c33fa97aa00dee1428bc256ef910dd8764b3731580639c79642965c60b91b8d2f5c1d3bdb60975c68706d415447e8b52520ecfa1687968f3790137234b SHA512 575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643 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 deleted file mode 100644 index 0f09599..0000000 --- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add missing headers required during non-unified build. - -Unified build happens to get them included by the other sources unified -into same source file, thus didn't fail. - -diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp ---- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp -+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp -@@ -30,6 +30,7 @@ - - #include "BuiltinNames.h" - #include "BytecodeGenerator.h" -+#include "BytecodeStructs.h" - #include "CallFrame.h" - #include "JIT.h" - #include "JSCInlines.h" -diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp ---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp -+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp -@@ -23,6 +23,7 @@ - #include "MachineStackMarker.h" - - #include "ConservativeRoots.h" -+#include "CPU.h" - #include "MachineContext.h" - #include <setjmp.h> - #include <stdlib.h> 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 deleted file mode 100644 index 85328be..0000000 --- a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this, -but it looks like it's not enough with older perl-based gtk-doc. -Keep this extra patch only until we can't depend on a newer gtk-doc version, which -should be retested whether this patch is unnecessary then. - -Upstream extra reference for the above reference commit: -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp -index 023b14c33f4..657b1febf5d 100644 ---- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp -+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp -@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass) - * WebKitSettings:enable-media: - * - * Enable or disable support for media playback on pages. This setting is enabled by -- * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have -+ * default. Disabling it means audio, track and video elements will have - * playback support disabled. - * - * Since: 2.26 --- -2.20.1 - 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 deleted file mode 100644 index 96e4d7d..0000000 --- a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 46c7d3ea88dd77223f25c48ce4a8688db71c489b Mon Sep 17 00:00:00 2001 -From: "commit-qu...@webkit.org" - <commit-qu...@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Thu, 7 May 2020 19:30:28 +0000 -Subject: [PATCH] REGRESSION(r251875): Crash in JSC::StructureIDTable::get on - ppc64le: gcSafeMemcpy broken on JSVALUE64 platforms other than x86_64 and - aarch64 https://bugs.webkit.org/show_bug.cgi?id=210685 - -Patch by Daniel Kolesa <dan...@octaforge.org> on 2020-05-07 -Reviewed by Michael Catanzaro. - -Fix gcSafeMemcpy on non-x86_64/aarch64 64-bit architectures. - -We were hitting an incorrect x86_64 assertion on values larger than -mediumCutoff on JSVALUE64 architectures other than x86_64 and aarch64, -as the control flow is wrong. - -* heap/GCMemoryOperations.h: -(JSC::gcSafeMemcpy): - -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261326 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/JavaScriptCore/heap/GCMemoryOperations.h | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Source/JavaScriptCore/heap/GCMemoryOperations.h b/Source/JavaScriptCore/heap/GCMemoryOperations.h -index f2b9e385bc9..ff66071db20 100644 ---- a/Source/JavaScriptCore/heap/GCMemoryOperations.h -+++ b/Source/JavaScriptCore/heap/GCMemoryOperations.h -@@ -53,7 +53,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes) - bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile uint64_t*>(src)[i]; - }; - --#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64) -+#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64)) - if (bytes <= smallCutoff) - slowPathForwardMemcpy(); - else if (isARM64() || bytes <= mediumCutoff) { -@@ -121,8 +121,6 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes) - : - : "d0", "d1", "memory" - ); --#else -- slowPathForwardMemcpy(); - #endif // CPU(X86_64) - } else { - RELEASE_ASSERT(isX86_64()); -@@ -139,7 +137,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes) - } - #else - slowPathForwardMemcpy(); --#endif // COMPILER(GCC_COMPATIBLE) -+#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64)) - #else - memcpy(dst, src, bytes); - #endif // USE(JSVALUE64) --- -2.20.1 - 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 deleted file mode 100644 index fdf9d7d..0000000 --- a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9cd4011a12bf658aad3776251792bacdc894643a Mon Sep 17 00:00:00 2001 -From: "be...@igalia.com" - <be...@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Mon, 27 Apr 2020 11:52:10 +0000 -Subject: [PATCH] [GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set - https://bugs.webkit.org/show_bug.cgi?id=209431 - -Reviewed by Carlos Garcia Campos. - -Don't create a PlatformDisplayLibWPE as a fallback when using -Wayland or X11. - -* platform/graphics/PlatformDisplay.cpp: -(WebCore::PlatformDisplay::createPlatformDisplay): - -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260750 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WebCore/platform/graphics/PlatformDisplay.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp -index 8bb47ca2b77..f9547b3af69 100644 ---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp -+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp -@@ -98,12 +98,6 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay() - } - #endif // PLATFORM(GTK) - --#if USE(WPE_RENDERER) -- return PlatformDisplayLibWPE::create(); --#elif PLATFORM(WIN) -- return PlatformDisplayWin::create(); --#endif -- - #if PLATFORM(WAYLAND) - if (auto platformDisplay = PlatformDisplayWayland::create()) - return platformDisplay; -@@ -121,6 +115,12 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay() - return PlatformDisplayX11::create(nullptr); - #endif - -+#if USE(WPE_RENDERER) -+ return PlatformDisplayLibWPE::create(); -+#elif PLATFORM(WIN) -+ return PlatformDisplayWin::create(); -+#endif -+ - RELEASE_ASSERT_NOT_REACHED(); - } - --- -2.20.1 - 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 deleted file mode 100644 index f4bc729..0000000 --- a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 43686247013a1230d47b46d637f928eb47c99609 Mon Sep 17 00:00:00 2001 -From: "commit-qu...@webkit.org" - <commit-qu...@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> -Date: Wed, 29 Apr 2020 08:14:06 +0000 -Subject: [PATCH] [GStreamer] Switch to audiointerleave - https://bugs.webkit.org/show_bug.cgi?id=211124 - -Patch by Philippe Normand <pnorm...@igalia.com> on 2020-04-29 -Reviewed by Xabier Rodriguez-Calvar. - -The audiointerleave element is a drop-in replacement of -interleave. It should behave a bit better in live. - -No new tests, existing webaudio tests cover this change. - -* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp: -(webKitWebAudioSrcConstructed): -(webKitWebAudioSrcChangeState): - -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260886 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - .../audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp -index 2f937f677cc..ea134b7b1b2 100644 ---- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp -+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp -@@ -211,10 +211,10 @@ static void webKitWebAudioSrcConstructed(GObject* object) - ASSERT(priv->provider); - ASSERT(priv->sampleRate); - -- priv->interleave = gst_element_factory_make("interleave", nullptr); -+ priv->interleave = gst_element_factory_make("audiointerleave", nullptr); - - if (!priv->interleave) { -- GST_ERROR_OBJECT(src, "Failed to create interleave"); -+ GST_ERROR_OBJECT(src, "Failed to create audiointerleave"); - return; - } - -@@ -398,8 +398,8 @@ static GstStateChangeReturn webKitWebAudioSrcChangeState(GstElement* element, Gs - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - if (!src->priv->interleave) { -- gst_element_post_message(element, gst_missing_element_message_new(element, "interleave")); -- GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no interleave")); -+ gst_element_post_message(element, gst_missing_element_message_new(element, "audiointerleave")); -+ GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no audiointerleave")); - return GST_STATE_CHANGE_FAILURE; - } - src->priv->numberOfSamples = 0; --- -2.20.1 - 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 deleted file mode 100644 index c829f19..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.22.4-musl.patch +++ /dev/null @@ -1,137 +0,0 @@ ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - #if CPU(X86) - return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) - ---- a/Source/JavaScriptCore/runtime/Options.h -+++ b/Source/JavaScriptCore/runtime/Options.h -@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; - \ - v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ - \ -- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ -- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -- 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).") \ -+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ -+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -+ 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).") \ - \ - v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ - v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ - ---- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp -+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp -@@ -836,7 +836,7 @@ int yydebug; - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -852,7 +852,7 @@ yystrlen (const char *yystr) - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - ---- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp -+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp -@@ -1975,7 +1975,7 @@ int yydebug; - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr) - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -710,7 +710,7 @@ - #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 - #endif - --#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) - #define HAVE_MACHINE_CONTEXT 1 - #endif - ---- a/Source/WebCore/xml/XPathGrammar.cpp -+++ b/Source/WebCore/xml/XPathGrammar.cpp -@@ -966,7 +966,7 @@ int yydebug; - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -989,7 +989,7 @@ yystrlen (yystr) - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in 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 deleted file mode 100644 index 475c985..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heire...@exherbo.org> -Date: Fri, 4 Oct 2019 22:17:11 +0200 -Subject: [PATCH] Add missing semicolons to fix build with icu 65.1 - ---- - Source/WTF/wtf/URLHelpers.cpp | 2 +- - Source/WebCore/dom/Document.cpp | 6 +++--- - 4 files changed, 25 insertions(+), 4 deletions(-) - -diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp -index 18e7f13cd61..c584f1a0cb7 100644 ---- a/Source/WTF/wtf/URLHelpers.cpp -+++ b/Source/WTF/wtf/URLHelpers.cpp -@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt - Optional<UChar32> previousCodePoint; - while (i < length) { - UChar32 c; -- U16_NEXT(buffer, i, length, c) -+ U16_NEXT(buffer, i, length, c); - UErrorCode error = U_ZERO_ERROR; - UScriptCode script = uscript_getScript(c, &error); - if (error != U_ZERO_ERROR) { -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index 0fd0fa090bf..01f76850f3d 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons - - for (unsigned i = 0; i < length; ) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) - return Exception { InvalidCharacterError }; --- -2.23.0 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 deleted file mode 100644 index 8cd73b3..0000000 --- a/net-libs/webkit-gtk/files/webkit-gtk-2.26.2-musl.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - #if CPU(X86) - return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -482,7 +482,7 @@ static inline void*& instructionPointerImpl(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -639,7 +639,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -756,7 +756,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) - ---- a/Source/JavaScriptCore/runtime/Options.h -+++ b/Source/JavaScriptCore/runtime/Options.h -@@ -138,9 +138,9 @@ constexpr bool enableWebAssemblyStreamingApi = false; - \ - v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ - \ -- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ -- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -- 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).") \ -+ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ -+ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ -+ 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).") \ - \ - v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ - v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ - ---- a/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp -+++ b/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp -@@ -1975,7 +1975,7 @@ int yydebug; - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -1991,7 +1991,7 @@ yystrlen (const char *yystr) - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -710,7 +710,7 @@ - #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 - #endif - --#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) - #define HAVE_MACHINE_CONTEXT 1 - #endif - ---- a/Source/WebCore/xml/XPathGrammar.cpp -+++ b/Source/WebCore/xml/XPathGrammar.cpp -@@ -966,7 +966,7 @@ int yydebug; - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -989,7 +989,7 @@ yystrlen (yystr) - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in ---- ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp.orig -+++ ./Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp -@@ -728,7 +728,7 @@ - #if YYERROR_VERBOSE - - # ifndef yystrlen --# if defined __GLIBC__ && defined _STRING_H -+# if defined __linux__ && defined _STRING_H - # define yystrlen strlen - # else - /* Return the length of YYSTR. */ -@@ -743,7 +743,7 @@ - # endif - - # ifndef yystpcpy --# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE - # define yystpcpy stpcpy - # else - /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml index e88c10a..24e8c4e 100644 --- a/net-libs/webkit-gtk/metadata.xml +++ b/net-libs/webkit-gtk/metadata.xml @@ -6,13 +6,8 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="coverage">Enable code coverage support</flag> <flag name="egl">Enable EGL support</flag> <flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag> - <flag name="gles2">Enable GLESv2 support</flag> - <flag name="gles2-only">Use GLES 2.0 or later instead of full OpenGL</flag> <flag name="jumbo-build">Combine source files to speed up build process</flag> - <flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag> - <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag> </use> </pkgmetadata> diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild deleted file mode 100644 index 9012463..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CMAKE_MAKEFILE_GENERATOR="ninja" -PYTHON_COMPAT=( python{3_6,3_7} ) -USE_RUBY="ruby24 ruby25 ruby26" - -inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org"; -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"; - -LICENSE="LGPL-2+ BSD" -SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="~alpha ~arm ~ppc ~amd64-linux ~x86-linux ~x86-macos" - -IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X" - -# webgl needs gstreamer, bug #560612 -# gstreamer with opengl/gles2 needs egl -REQUIRED_USE=" - geolocation? ( introspection ) - gles2? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) - nsplugin? ( X ) - webgl? ( gstreamer - || ( gles2 opengl ) ) - wayland? ( egl ) - || ( aqua wayland X ) -" - -# Tests fail to link for inexplicable reasons -# https://bugs.webkit.org/show_bug.cgi?id=148210 -RESTRICT="test" - -# Aqua support in gtk3 is untested -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Various compile-time optionals for gtk+-3.22.0 - ensure it -# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -RDEPEND=" - >=x11-libs/cairo-1.16.0:=[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-3.8.1-r1:= - virtual/jpeg:0= - >=net-libs/libsoup-2.48:2.4[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3= - sys-libs/zlib:0 - >=dev-libs/atk-2.8.0 - media-libs/libwebp:= - - >=dev-libs/glib-2.40:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - gnome-keyring? ( app-crypt/libsecret ) - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) - dev-libs/libtasn1:= - nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) - spell? ( >=app-text/enchant-0.22:= ) - gstreamer? ( - >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] - >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt ) - - libnotify? ( x11-libs/libnotify ) - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - - egl? ( media-libs/mesa[egl] ) - gles2? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) - webgl? ( - x11-libs/libXcomposite - x11-libs/libXdamage ) -" - -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.10 - >=dev-util/gperf-3.0.1 - >=sys-devel/bison-2.4.3 - || ( >=sys-devel/gcc-6.0 >=sys-devel/clang-3.3 ) - sys-devel/gettext - virtual/pkgconfig - - >=dev-lang/perl-5.10 - virtual/perl-Data-Dumper - virtual/perl-Carp - virtual/perl-JSON-PP - - doc? ( >=dev-util/gtk-doc-1.10 ) - geolocation? ( dev-util/gdbus-codegen ) -" -# test? ( -# dev-python/pygobject:3[python_targets_python2_7] -# x11-themes/hicolor-icon-theme -# jit? ( sys-apps/paxctl ) ) - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++11 ; then - die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags" - fi - - if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then - die 'The active compiler needs to be gcc 4.9 (or newer)' - fi - fi - - if ! use opengl && ! use gles2; then - ewarn - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles) completely." - ewarn "This is an unsupported configuration meant for very specific embedded" - ewarn "use cases, where there truly is no GL possible (and even that use case" - ewarn "is very unlikely to come by). If you have GL (even software-only), you" - ewarn "really really should be enabling OpenGL!" - ewarn - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}/${P}-icu-65.patch" # bug 698596 - eapply "${FILESDIR}/${P}-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 - if use elibc_musl ; then - # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=ae4a15801816b7f140076fa8f636d46247902af3 - eapply "${FILESDIR}"/${PN}-2.22.4-musl.patch - fi - cmake-utils_src_prepare - gnome2_src_prepare -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" - fi - - # We try to use gold when possible for this package -# if ! tc-ld-is-gold ; then -# append-ldflags "-Wl,--reduce-memory-overheads" -# fi - - # Multiple rendering bugs on youtube, github, etc without this, bug #547224 - append-flags $(test-flags -fno-strict-aliasing) - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - for rubyimpl in ${USE_RUBY}; do - if has_version "virtual/rubygems[ruby_targets_${rubyimpl}]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # FTL_JIT requires llvm - # - # opengl needs to be explicetly handled, bug #576634 - - local opengl_enabled - if use opengl || use gles2; then - opengl_enabled=ON - else - opengl_enabled=OFF - fi - - local mycmakeargs=( - #-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) # broken in 2.24.1 - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_API_TESTS=$(usex test) - -DENABLE_GTKDOC=$(usex doc) - -DENABLE_GEOLOCATION=$(usex geolocation) - $(cmake-utils_use_find_package gles2 OpenGLES2) - -DENABLE_GLES2=$(usex gles2) - -DENABLE_VIDEO=$(usex gstreamer) - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DENABLE_INTROSPECTION=$(usex introspection) - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_WOFF2=ON - -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin) - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DENABLE_WEBGL=$(usex webgl) - $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package opengl OpenGL) - -DENABLE_X11_TARGET=$(usex X) - -DENABLE_OPENGL=${opengl_enabled} - -DCMAKE_BUILD_TYPE=Release - -DPORT=GTK - ${ruby_interpreter} - ) - - # Allow it to use GOLD when possible as it has all the magic to - # detect when to use it and using gold for this concrete package has - # multiple advantages and is also the upstream default, bug #585788 -# if tc-ld-is-gold ; then -# mycmakeargs+=( -DUSE_LD_GOLD=ON ) -# else -# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) -# fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - # Prevents test failures on PaX systems - pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - # Prevents crashes on PaX systems, bug #522808 - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" - use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2 -} 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 deleted file mode 100644 index 5c4613e..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.26.4-r1.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CMAKE_MAKEFILE_GENERATOR="ninja" -PYTHON_COMPAT=( python{3_6,3_7} ) -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -CMAKE_MIN_VERSION=3.10 - -inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org"; -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"; - -LICENSE="LGPL-2+ BSD" -SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86" - -IUSE="aqua coverage +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X" - -# gstreamer with opengl/gles2 needs egl -REQUIRED_USE=" - gles2-only? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) - wayland? ( egl ) - || ( aqua wayland X ) -" - -# Tests fail to link for inexplicable reasons -# https://bugs.webkit.org/show_bug.cgi?id=148210 -RESTRICT="test" - -# Aqua support in gtk3 is untested -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Various compile-time optionals for gtk+-3.22.0 - ensure it -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -wpe_depend=" - >=gui-libs/libwpe-1.3.0:1.0 - >=gui-libs/wpebackend-fdo-1.3.1:1.0 -" -RDEPEND=" - >=x11-libs/cairo-1.16.0:=[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-3.8.1-r1:= - virtual/jpeg:0= - >=net-libs/libsoup-2.54:2.4[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3= - sys-libs/zlib:0 - >=dev-libs/atk-2.16.0 - media-libs/libwebp:= - - >=dev-libs/glib-2.44.0:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - gnome-keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] - gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) - >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt ) - - libnotify? ( x11-libs/libnotify ) - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - - egl? ( media-libs/mesa[egl] ) - gles2-only? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) - wayland? ( - opengl? ( ${wpe_depend} ) - gles2-only? ( ${wpe_depend} ) - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) -" -unset wpe_depend -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - dev-util/glib-utils - >=dev-util/gperf-3.0.1 - >=sys-devel/bison-2.4.3 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) - sys-devel/gettext - virtual/pkgconfig - - >=dev-lang/perl-5.10 - virtual/perl-Data-Dumper - virtual/perl-Carp - virtual/perl-JSON-PP - - gtk-doc? ( >=dev-util/gtk-doc-1.10 ) - geolocation? ( dev-util/gdbus-codegen ) -" -# test? ( -# dev-python/pygobject:3[python_targets_python2_7] -# x11-themes/hicolor-icon-theme -# jit? ( sys-apps/paxctl ) ) -RDEPEND="${RDEPEND} - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) -" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++17 ; then - die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" - fi - fi - - if ! use opengl && ! use gles2-only; then - ewarn - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles-only) completely." - ewarn "This is an unsupported configuration meant for very specific embedded" - ewarn "use cases, where there truly is no GL possible (and even that use case" - ewarn "is very unlikely to come by). If you have GL (even software-only), you" - ewarn "really really should be enabling OpenGL!" - ewarn - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 - eapply "${FILESDIR}"/2.26.2-fix-arm-non-unified-build.patch # bug 704194 - eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32 - if use elibc_musl ; then - # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=9c8441ce582f411dbec289ab698e6d0a962f62cc - eapply "${FILESDIR}/${PN}-2.26.2-musl.patch" - fi - cmake-utils_src_prepare - gnome2_src_prepare -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" - fi - - # We try to use gold when possible for this package -# if ! tc-ld-is-gold ; then -# append-ldflags "-Wl,--reduce-memory-overheads" -# fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - for rubyimpl in ${USE_RUBY}; do - if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # opengl needs to be explicetly handled, bug #576634 - - local use_wpe_renderer=OFF - local opengl_enabled - if use opengl || use gles2-only; then - opengl_enabled=ON - use wayland && use_wpe_renderer=ON - else - opengl_enabled=OFF - fi - - local mycmakeargs=( - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_API_TESTS=$(usex test) - -DENABLE_GTKDOC=$(usex gtk-doc) - -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) - $(cmake-utils_use_find_package gles2-only OpenGLES2) - -DENABLE_GLES2=$(usex gles2-only) - -DENABLE_VIDEO=$(usex gstreamer) - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DENABLE_INTROSPECTION=$(usex introspection) - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_WOFF2=ON - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland - $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package opengl OpenGL) - -DENABLE_X11_TARGET=$(usex X) - -DENABLE_OPENGL=${opengl_enabled} - -DENABLE_WEBGL=${opengl_enabled} - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DCMAKE_BUILD_TYPE=Release - -DPORT=GTK - ${ruby_interpreter} - ) - - # Allow it to use GOLD when possible as it has all the magic to - # detect when to use it and using gold for this concrete package has - # multiple advantages and is also the upstream default, bug #585788 -# if tc-ld-is-gold ; then -# mycmakeargs+=( -DUSE_LD_GOLD=ON ) -# else -# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) -# fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - # Prevents test failures on PaX systems - pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - # Prevents crashes on PaX systems, bug #522808 - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild deleted file mode 100644 index aa08359..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CMAKE_MAKEFILE_GENERATOR="ninja" -PYTHON_COMPAT=( python{3_6,3_7} ) -USE_RUBY="ruby24 ruby25 ruby26 ruby27" -CMAKE_MIN_VERSION=3.10 - -inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx - -MY_P="webkitgtk-${PV}" -DESCRIPTION="Open source web browser engine" -HOMEPAGE="https://www.webkitgtk.org"; -SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"; - -LICENSE="LGPL-2+ BSD" -SLOT="4/37" # soname version of libwebkit2gtk-4.0 -KEYWORDS="amd64 arm64 ~ppc64 ~sparc x86" - -IUSE="aqua +egl +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell wayland +X" - -# gstreamer with opengl/gles2 needs egl -REQUIRED_USE=" - gles2-only? ( egl !opengl ) - gstreamer? ( opengl? ( egl ) ) - wayland? ( egl ) - || ( aqua wayland X ) -" - -# Tests fail to link for inexplicable reasons -# https://bugs.webkit.org/show_bug.cgi?id=148210 -RESTRICT="test" - -# Aqua support in gtk3 is untested -# Dependencies found at Source/cmake/OptionsGTK.cmake -# Various compile-time optionals for gtk+-3.22.0 - ensure it -# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.26 -# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE) -wpe_depend=" - >=gui-libs/libwpe-1.3.0:1.0 - >=gui-libs/wpebackend-fdo-1.3.1:1.0 -" -# 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 -RDEPEND=" - >=x11-libs/cairo-1.16.0:=[X?] - >=media-libs/fontconfig-2.13.0:1.0 - >=media-libs/freetype-2.9.0:2 - >=dev-libs/libgcrypt-1.7.0:0= - >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] - >=media-libs/harfbuzz-1.4.2:=[icu(+)] - >=dev-libs/icu-3.8.1-r1:= - virtual/jpeg:0= - >=net-libs/libsoup-2.54:2.4[introspection?] - >=dev-libs/libxml2-2.8.0:2 - >=media-libs/libpng-1.4:0= - dev-db/sqlite:3= - sys-libs/zlib:0 - >=dev-libs/atk-2.16.0 - media-libs/libwebp:= - - >=dev-libs/glib-2.44.0:2 - >=dev-libs/libxslt-1.1.7 - media-libs/woff2 - gnome-keyring? ( app-crypt/libsecret ) - introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) - dev-libs/libtasn1:= - spell? ( >=app-text/enchant-0.22:2 ) - gstreamer? ( - >=media-libs/gstreamer-1.14:1.0 - >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?,X?] - gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) - >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 - >=media-libs/gst-plugins-bad-1.14:1.0 ) - - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXrender - x11-libs/libXt ) - - libnotify? ( x11-libs/libnotify ) - dev-libs/hyphen - jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) - - egl? ( media-libs/mesa[egl] ) - gles2-only? ( media-libs/mesa[gles2] ) - opengl? ( virtual/opengl ) - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.12 - opengl? ( ${wpe_depend} ) - gles2-only? ( ${wpe_depend} ) - ) - - seccomp? ( - >=sys-apps/bubblewrap-0.3.1 - sys-libs/libseccomp - sys-apps/xdg-dbus-proxy - ) -" -unset wpe_depend -# paxctl needed for bug #407085 -# Need real bison, not yacc -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - ${RUBY_DEPS} - >=app-accessibility/at-spi2-core-2.5.3 - dev-util/glib-utils - >=dev-util/gperf-3.0.1 - >=sys-devel/bison-2.4.3 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) - sys-devel/gettext - virtual/pkgconfig - - >=dev-lang/perl-5.10 - virtual/perl-Data-Dumper - virtual/perl-Carp - virtual/perl-JSON-PP - - gtk-doc? ( >=dev-util/gtk-doc-1.10 ) - geolocation? ( dev-util/gdbus-codegen ) -" -# test? ( -# dev-python/pygobject:3[python_targets_python2_7] -# x11-themes/hicolor-icon-theme -# jit? ( sys-apps/paxctl ) ) -RDEPEND="${RDEPEND} - geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) -" - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307 - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS" - check-reqs_pkg_pretend - fi - - if ! test-flag-CXX -std=c++17 ; then - die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags" - fi - fi - - if ! use opengl && ! use gles2-only; then - ewarn - ewarn "You are disabling OpenGL usage (USE=opengl or USE=gles2-only) completely." - ewarn "This is an unsupported configuration meant for very specific embedded" - ewarn "use cases, where there truly is no GL possible (and even that use case" - ewarn "is very unlikely to come by). If you have GL (even software-only), you" - ewarn "really really should be enabling OpenGL!" - ewarn - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - check-reqs_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054 # https://bugs.webkit.org/show_bug.cgi?id=204108 - eapply "${FILESDIR}"/2.26.3-fix-gtk-doc.patch # bug 704550 - retest without it once we can depend on >=gtk-doc-1.32 - eapply "${FILESDIR}"/${PV}-fix-yelp-desktopless-build.patch - eapply "${FILESDIR}"/${PV}-use-gst-audiointerleave.patch - eapply "${FILESDIR}"/${PV}-fix-ppc64-JSC.patch - eapply "${FILESDIR}"/${PV}-opengl-without-X-fixes.patch - eapply "${FILESDIR}"/${PV}-non-jumbo-fix.patch - if use elibc_musl ; then - # Taken from https://git.alpinelinux.org/aports/tree/community/webkit2gtk/musl-fixes.patch?id=be463923b10a7268117c27c7e5515fc32457918c - eapply "${FILESDIR}/${PN}-2.28.1-musl.patch" - eapply "${FILESDIR}/${PN}-2.28.1-lower-stack-usage.patch" - fi - cmake-utils_src_prepare - gnome2_src_prepare -} - -src_configure() { - # Respect CC, otherwise fails on prefix #395875 - tc-export CC - - # It does not compile on alpha without this in LDFLAGS - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761 - use alpha && append-ldflags "-Wl,--no-relax" - - # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504 - use ia64 && append-ldflags "-Wl,--no-as-needed" - - # Sigbuses on SPARC with mcpu and co., bug #??? - use sparc && filter-flags "-mvis" - - # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634 - use ppc64 && append-flags "-mminimal-toc" - - # Try to use less memory, bug #469942 (see Fedora .spec for reference) - # --no-keep-memory doesn't work on ia64, bug #502492 - if ! use ia64; then - append-ldflags "-Wl,--no-keep-memory" - fi - - # We try to use gold when possible for this package -# if ! tc-ld-is-gold ; then -# append-ldflags "-Wl,--reduce-memory-overheads" -# fi - - # Ruby situation is a bit complicated. See bug 513888 - local rubyimpl - local ruby_interpreter="" - for rubyimpl in ${USE_RUBY}; do - if has_version --host-root "virtual/rubygems[ruby_targets_${rubyimpl}]"; then - ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})" - fi - done - # This will rarely occur. Only a couple of corner cases could lead us to - # that failure. See bug 513888 - [[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found" - - # TODO: Check Web Audio support - # should somehow let user select between them? - # - # opengl needs to be explicetly handled, bug #576634 - - local use_wpe_renderer=OFF - local opengl_enabled - if use opengl || use gles2-only; then - opengl_enabled=ON - use wayland && use_wpe_renderer=ON - else - opengl_enabled=OFF - fi - - local mycmakeargs=( - -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build) - -DENABLE_QUARTZ_TARGET=$(usex aqua) - -DENABLE_API_TESTS=$(usex test) - -DENABLE_GTKDOC=$(usex gtk-doc) - -DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service) - $(cmake-utils_use_find_package gles2-only OpenGLES2) - -DENABLE_GLES2=$(usex gles2-only) - -DENABLE_VIDEO=$(usex gstreamer) - -DENABLE_WEB_AUDIO=$(usex gstreamer) - -DENABLE_INTROSPECTION=$(usex introspection) - -DUSE_LIBNOTIFY=$(usex libnotify) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_WOFF2=ON - -DENABLE_SPELLCHECK=$(usex spell) - -DENABLE_WAYLAND_TARGET=$(usex wayland) - -DUSE_WPE_RENDERER=${use_wpe_renderer} # WPE renderer is used to implement accelerated compositing under wayland - $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package opengl OpenGL) - -DENABLE_X11_TARGET=$(usex X) - -DENABLE_OPENGL=${opengl_enabled} - -DENABLE_WEBGL=${opengl_enabled} - -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp) - -DBWRAP_EXECUTABLE="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that - -DCMAKE_BUILD_TYPE=Release - -DPORT=GTK - ${ruby_interpreter} - ) - - if use elibc_musl ; then - mycmakeargs+=( -DENABLE_SAMPLING_PROFILER=OFF ) - fi - - # Allow it to use GOLD when possible as it has all the magic to - # detect when to use it and using gold for this concrete package has - # multiple advantages and is also the upstream default, bug #585788 -# if tc-ld-is-gold ; then -# mycmakeargs+=( -DUSE_LD_GOLD=ON ) -# else -# mycmakeargs+=( -DUSE_LD_GOLD=OFF ) -# fi - - WK_USE_CCACHE=NO cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_test() { - # Prevents test failures on PaX systems - pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test* - - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - # Prevents crashes on PaX systems, bug #522808 - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess" - pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess" -}
