From 8c0ca38ee346c863c1814587e89b65066c5e4a18 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 28 Mar 2020 01:56:25 +0300 Subject: webkit2gtk: bump to 2.28.0 --- testing/webkit2gtk/build | 39 ---------- testing/webkit2gtk/checksums | 2 - testing/webkit2gtk/depends | 15 ---- testing/webkit2gtk/patches/fix-musl.patch | 117 ------------------------------ testing/webkit2gtk/sources | 2 - testing/webkit2gtk/version | 1 - 6 files changed, 176 deletions(-) delete mode 100755 testing/webkit2gtk/build delete mode 100644 testing/webkit2gtk/checksums delete mode 100644 testing/webkit2gtk/depends delete mode 100644 testing/webkit2gtk/patches/fix-musl.patch delete mode 100644 testing/webkit2gtk/sources delete mode 100644 testing/webkit2gtk/version (limited to 'testing') diff --git a/testing/webkit2gtk/build b/testing/webkit2gtk/build deleted file mode 100755 index 05ba8c84..00000000 --- a/testing/webkit2gtk/build +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -e - -patch -p1 < fix-musl.patch - -# Remove gettext requirement. -sed -i 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c -sed -i '/po_files *.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt -sed -i '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt - -export DESTDIR="$1" - -cmake -B build \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib \ - -DPORT=GTK \ - -DCMAKE_SKIP_RPATH=ON \ - -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ - -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GLES2=ON \ - -DENABLE_INTL=OFF \ - -DENABLE_INTROSPECTION=OFF \ - -DENABLE_MINIBROWSER=OFF \ - -DENABLE_OPENGL=OFF \ - -DENABLE_SPELLCHECK=OFF \ - -DENABLE_VIDEO=OFF \ - -DENABLE_WEBGL=OFF \ - -DENABLE_WEB_AUDIO=OFF \ - -DUSE_LIBHYPHEN=OFF \ - -DUSE_LIBNOTIFY=OFF \ - -DUSE_LIBSECRET=OFF \ - -DUSE_OPENJPEG=OFF \ - -DUSE_WOFF2=OFF \ - -DUSE_WPE_RENDERER=OFF \ - -DENABLE_WEB_CRYPTO=OFF \ - -Wno-dev - -cmake --build build -cmake --install build diff --git a/testing/webkit2gtk/checksums b/testing/webkit2gtk/checksums deleted file mode 100644 index ccaa3497..00000000 --- a/testing/webkit2gtk/checksums +++ /dev/null @@ -1,2 +0,0 @@ -361f3d178f62a9c112cbadfedd46106c34455c26d57a12a28fb3b09178d20e8b webkitgtk-2.28.0.tar.xz -2a0f0dd9745bba62e8ad9eea0117b1f2acccfde838f00c1aee7e5d3278130175 fix-musl.patch diff --git a/testing/webkit2gtk/depends b/testing/webkit2gtk/depends deleted file mode 100644 index 011c7680..00000000 --- a/testing/webkit2gtk/depends +++ /dev/null @@ -1,15 +0,0 @@ -gtk+3 -glib-networking -cairo -cmake make -gperf make -harfbuzz-icu -libXslt -libgcrypt -libsoup -libwebp -mesa -perl make -python make -ruby make -sqlite diff --git a/testing/webkit2gtk/patches/fix-musl.patch b/testing/webkit2gtk/patches/fix-musl.patch deleted file mode 100644 index 470a7992..00000000 --- a/testing/webkit2gtk/patches/fix-musl.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- a/Source/JavaScriptCore/runtime/MachineContext.h -+++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -196,7 +196,7 @@ - #error Unknown Architecture - #endif - --#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) -+#elif OS(FUCHSIA) || defined(__linux__) - - #if CPU(X86) - return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -347,7 +347,7 @@ - #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) -@@ -498,7 +498,7 @@ - #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) -@@ -656,7 +656,7 @@ - #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) -@@ -773,7 +773,7 @@ - #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/OptionsList.h -+++ b/Source/JavaScriptCore/runtime/OptionsList.h -@@ -43,6 +43,16 @@ - constexpr bool enableWebAssemblyStreamingApi = false; - #endif - -+#if defined(__GLIBC__) -+constexpr unsigned jscMaxPerThreadStack = 4 * MB; -+constexpr unsigned jscSoftReservedZoneSize = 128 * KB; -+constexpr unsigned jscReservedZoneSize = 64 * KB; -+#else -+constexpr unsigned jscMaxPerThreadStack = 80 * KB; -+constexpr unsigned jscSoftReservedZoneSize = 32 * KB; -+constexpr unsigned jscReservedZoneSize = 16 * KB; -+#endif -+ - // How do JSC VM options work? - // =========================== - // The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use, ---- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp -+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.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 ---- a/Source/WTF/wtf/PlatformHave.h -+++ b/Source/WTF/wtf/PlatformHave.h -@@ -222,7 +222,7 @@ - #define HAVE_HOSTED_CORE_ANIMATION 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 @@ - #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 @@ - # 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/testing/webkit2gtk/sources b/testing/webkit2gtk/sources deleted file mode 100644 index 59eae1a6..00000000 --- a/testing/webkit2gtk/sources +++ /dev/null @@ -1,2 +0,0 @@ -https://webkitgtk.org/releases/webkitgtk-2.28.0.tar.xz -patches/fix-musl.patch diff --git a/testing/webkit2gtk/version b/testing/webkit2gtk/version deleted file mode 100644 index 10d445b6..00000000 --- a/testing/webkit2gtk/version +++ /dev/null @@ -1 +0,0 @@ - 2.28.0 1 -- cgit v1.2.3