diff options
Diffstat (limited to 'extra/webkit2gtk')
| -rwxr-xr-x | extra/webkit2gtk/build | 70 | ||||
| -rw-r--r-- | extra/webkit2gtk/checksums | 5 | ||||
| -rw-r--r-- | extra/webkit2gtk/depends | 17 | ||||
| -rw-r--r-- | extra/webkit2gtk/meta | 3 | ||||
| -rw-r--r-- | extra/webkit2gtk/patches/fix-musl.patch | 85 | ||||
| -rw-r--r-- | extra/webkit2gtk/sources | 4 | ||||
| -rw-r--r-- | extra/webkit2gtk/version | 2 |
7 files changed, 55 insertions, 131 deletions
diff --git a/extra/webkit2gtk/build b/extra/webkit2gtk/build index b8342697..1838acde 100755 --- a/extra/webkit2gtk/build +++ b/extra/webkit2gtk/build @@ -1,65 +1,57 @@ #!/bin/sh -e -sed_i() { - for file; do :; done - sed "$@" > _ - cat _ > "$file"; rm -f _ -} - -# Enable streaming related options if gstreamer is installed. -cpt-list gst-plugins-base >/dev/null 2>&1 && streaming=ON - -# Enable the use of openjpeg if the package is installed. -cpt-list openjpeg2 >/dev/null 2>&1 && jpeg=ON - -# Enable webcrypto if libtasn1 is installed. -cpt-list libtasn1 >/dev/null 2>&1 && libtasn=ON - -patch -p1 < fix-musl.patch +make -C unifdef # 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 +clsed 's/ngettext/printf/g' Tools/MiniBrowser/gtk/BrowserDownloadsBar.c +clsed '/po_files \*\.po/d' Source/WebCore/platform/gtk/po/CMakeLists.txt +clsed '/if.*GETTEXT_FOUND/,/^endif/d' Source/WebCore/platform/gtk/po/CMakeLists.txt +clsed '/^GETTEXT_C/d' Source/WebCore/platform/gtk/po/CMakeLists.txt + # Fix clang build. -sed -i '/LC_ALL/d' Source/JavaScriptCore/jsc.cpp -sed -i '/WTFLogAlways/d' Source/JavaScriptCore/jsc.cpp - -# Fix the latest icu build. -printf 'add_compile_definitions("U_DEFINE_FALSE_AND_TRUE=1")\n' \ - >> Source/WTF/wtf/CMakeLists.txt +clsed '/LC_ALL/d' Source/JavaScriptCore/jsc.cpp +clsed '/WTFLogAlways/d' Source/JavaScriptCore/jsc.cpp export DESTDIR="$1" +# Webkit's CMake configuration forces color output using clang-specific flags +# when using Ninja as the CMAKE_GENERATOR. We should disable them. +clsed s,-fcolor-diagnostics,, Source/cmake/WebKitCompilerFlags.cmake + cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib \ - -DPORT=GTK \ -DCMAKE_SKIP_RPATH=ON \ + -DUNIFDEF_EXECUTABLE="$PWD/unifdef/unifdef" \ + -DLIB_INSTALL_DIR=/usr/lib \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ - -DENABLE_SAMPLING_PROFILER=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_GAMEPAD=OFF \ -DENABLE_GEOLOCATION=OFF \ -DENABLE_GLES2=ON \ - -DENABLE_INTL=OFF \ -DENABLE_INTROSPECTION=OFF \ + -DENABLE_JOURNALD_LOG=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DENABLE_OPENGL=OFF \ + -DENABLE_SAMPLING_PROFILER=OFF \ -DENABLE_SPELLCHECK=OFF \ - -DENABLE_VIDEO=${streaming:-OFF} \ - -DENABLE_WEBGL=OFF \ - -DENABLE_WEB_AUDIO=${streaming:-OFF} \ + -DENABLE_WEB_CRYPTO="$(cpt l -C libtasn1 ON OFF)" \ + -DENABLE_QUARTZ_TARGET=OFF \ + -DENABLE_WAYLAND_TARGET=ON \ + -DENABLE_X11_TARGET=OFF \ + -DPORT=GTK \ + -DUSE_AVIF=OFF \ -DUSE_LIBHYPHEN=OFF \ - -DUSE_LIBNOTIFY=OFF \ + -DUSE_LIBNOTIFY="$(cpt l -C libnotify ON OFF)" \ -DUSE_LIBSECRET=OFF \ - -DUSE_SYSTEMD=OFF \ - -DUSE_OPENJPEG=${jpeg:-OFF} \ + -DUSE_OPENJPEG="$(cpt l -C openjpeg2 ON OFF)" \ + -DUSE_SOUP2=ON \ + -DUSE_GTK4=OFF \ -DUSE_WOFF2=OFF \ + -DUSE_JPEGXL=OFF \ + -DUSE_LIBBACKTRACE=OFF \ -DUSE_WPE_RENDERER=OFF \ - -DENABLE_WEB_CRYPTO=${libtasn:-OFF} \ - -DENABLE_MEDIASOURCE=${streaming:-OFF} \ - -DENABLE_WAYLAND_TARGET=OFF \ + -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \ -Wno-dev cmake --build build diff --git a/extra/webkit2gtk/checksums b/extra/webkit2gtk/checksums index 55dfdea3..6e7f88ad 100644 --- a/extra/webkit2gtk/checksums +++ b/extra/webkit2gtk/checksums @@ -1,2 +1,3 @@ -7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f webkitgtk-2.30.5.tar.xz -bca30f52651c0a890a7aa928d8524bfd22fab293761d022815f2226a13626ad1 fix-musl.patch +%BLAKE3 +521ae872abe050f237a09293b84b1822228893979c929813728cbc58ac5580b4 webkitgtk-2.46.1.tar.xz +c55349ab244ae3705c566107426f61d9b7ffdbb9fd99261986f8d54867628bcc unifdef-2.12.tar.xz diff --git a/extra/webkit2gtk/depends b/extra/webkit2gtk/depends index 6bbf47ec..845f5695 100644 --- a/extra/webkit2gtk/depends +++ b/extra/webkit2gtk/depends @@ -1,16 +1,29 @@ cairo cmake make +freetype-harfbuzz +gdk-pixbuf +glib glib-networking gperf make +gst-plugins-base +gstreamer gtk+3 harfbuzz-icu -libXslt -libXt +icu libgcrypt +libgpg-error +libjpeg-turbo +libpng libsoup libwebp +libxml2 +libxslt mesa +openjpeg2 +pango perl make python make ruby make sqlite +wayland +zlib diff --git a/extra/webkit2gtk/meta b/extra/webkit2gtk/meta new file mode 100644 index 00000000..fca00e49 --- /dev/null +++ b/extra/webkit2gtk/meta @@ -0,0 +1,3 @@ +description: GTK+3 port of the WebKit2 browser engine +license: LGPL-2.1-or-later, BSD-2-Clause +maintainer: Cem Keylan <cem@carbslinux.org> diff --git a/extra/webkit2gtk/patches/fix-musl.patch b/extra/webkit2gtk/patches/fix-musl.patch deleted file mode 100644 index c58e6269..00000000 --- a/extra/webkit2gtk/patches/fix-musl.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -u -r a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h ---- a/Source/JavaScriptCore/runtime/MachineContext.h 2020-08-12 12:17:53.000000000 +0300 -+++ b/Source/JavaScriptCore/runtime/MachineContext.h 2020-09-11 14:22:18.584077655 +0300 -@@ -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<void*&>((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) -diff -u -r a/Source/JavaScriptCore/runtime/OptionsList.h b/Source/JavaScriptCore/runtime/OptionsList.h ---- a/Source/JavaScriptCore/runtime/OptionsList.h 2020-08-12 12:17:53.000000000 +0300 -+++ b/Source/JavaScriptCore/runtime/OptionsList.h 2020-09-11 14:22:18.586077732 +0300 -@@ -90,9 +90,9 @@ - \ - v(Bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ - \ -- v(Unsigned, maxPerThreadStackUsage, 5 * 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, crashOnDisallowedVMEntry, ASSERT_ENABLED, Normal, "Forces a crash if we attempt to enter the VM when disallowed") \ - v(Bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ -diff -u -r a/Source/WebCore/xml/XPathGrammar.cpp b/Source/WebCore/xml/XPathGrammar.cpp ---- a/Source/WebCore/xml/XPathGrammar.cpp 2020-08-12 12:17:56.000000000 +0300 -+++ b/Source/WebCore/xml/XPathGrammar.cpp 2020-09-11 14:22:18.585077693 +0300 -@@ -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/extra/webkit2gtk/sources b/extra/webkit2gtk/sources index 0508d8c5..625dcc52 100644 --- a/extra/webkit2gtk/sources +++ b/extra/webkit2gtk/sources @@ -1,2 +1,2 @@ -https://webkitgtk.org/releases/webkitgtk-2.30.5.tar.xz -patches/fix-musl.patch +https://webkitgtk.org/releases/webkitgtk-2.46.1.tar.xz +https://dotat.at/prog/unifdef/unifdef-2.12.tar.xz unifdef diff --git a/extra/webkit2gtk/version b/extra/webkit2gtk/version index de7fc92a..64bde0be 100644 --- a/extra/webkit2gtk/version +++ b/extra/webkit2gtk/version @@ -1 +1 @@ -2.30.5 1 +2.46.1 1 |