From 0b116a73bce0d9ebe5f1e2ad4e922bd558b2d65a Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Fri, 7 Sep 2018 23:14:06 +0200 Subject: [PATCH] webkit2gtk: update to 2.22.0. --- .../patches/fix-glibc-js-and-alloc.patch | 137 ------------------ srcpkgs/webkit2gtk/template | 29 ++-- 2 files changed, 14 insertions(+), 152 deletions(-) delete mode 100644 srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch diff --git a/srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch b/srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch deleted file mode 100644 index dfefcb6d46b..00000000000 --- a/srcpkgs/webkit2gtk/patches/fix-glibc-js-and-alloc.patch +++ /dev/null @@ -1,137 +0,0 @@ ---- Source/JavaScriptCore/runtime/MachineContext.h -+++ Source/JavaScriptCore/runtime/MachineContext.h -@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - #if CPU(X86) - return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -354,7 +354,7 @@ inline void*& instructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -466,7 +466,7 @@ inline void*& argumentPointer<1>(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) -@@ -583,7 +583,7 @@ inline void*& llintInstructionPointer(mcontext_t& machineContext) - #error Unknown Architecture - #endif - --#elif defined(__GLIBC__) || defined(__BIONIC__) -+#elif defined(__linux__) - - // The following sequence depends on glibc's sys/ucontext.h. - #if CPU(X86) - ---- Source/JavaScriptCore/runtime/Options.h -+++ Source/JavaScriptCore/runtime/Options.h -@@ -126,9 +126,9 @@ - \ - 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.)") \ - ---- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp -+++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp -@@ -836,7 +836,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. */ -@@ -852,7 +852,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 - ---- Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp -+++ Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp -@@ -1975,7 +1975,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. */ -@@ -1991,7 +1991,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 - ---- Source/WTF/wtf/Platform.h -+++ Source/WTF/wtf/Platform.h -@@ -679,7 +679,7 @@ - #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 - #endif - --#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__) || defined(__BIONIC__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) -+#if OS(DARWIN) || ((OS(FREEBSD) || defined(__linux__)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS))) - #define HAVE_MACHINE_CONTEXT 1 - #endif - ---- Source/WebCore/xml/XPathGrammar.cpp -+++ Source/WebCore/xml/XPathGrammar.cpp -@@ -967,7 +967,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. */ -@@ -990,7 +990,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/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 16527839d1d..977ad8ab49b 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,7 +1,7 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.20.5 -revision=2 +version=2.22.0 +revision=1 wrksrc="webkitgtk-${version}" build_style=cmake configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc @@ -13,7 +13,7 @@ maintainer="Enno Boland " homepage="https://webkitgtk.org/" license="LGPL-2.1, BSD-2-Clause" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990 +checksum=fa42b54a98831405c8a3e7f40371eec3f0bd5cdbb124813a5e329e7a9f8c6f2a # ETOOHUGE nodebug=1 @@ -23,10 +23,10 @@ CXXFLAGS="-Wno-expansion-to-defined" hostmakedepends="perl python pkg-config intltool gperf flex ruby glib-devel geoclue2" makedepends=" at-spi2-core-devel libjpeg-turbo-devel libpng-devel sqlite-devel - harfbuzz-devel gst-plugins-base1-devel libsoup-devel libxslt-devel - gnutls-devel icu-devel enchant-devel dbus-glib-devel libwebp-devel - gtk+-devel gtk+3-devel libgudev-devel libsecret-devel ruby-devel - geoclue2-devel libnotify-devel hyphen-devel" + harfbuzz-devel gst-plugins-base1-devel gst-plugins-bad1-devel + libsoup-devel libxslt-devel gnutls-devel icu-devel enchant-devel + dbus-glib-devel libwebp-devel gtk+-devel gtk+3-devel libgudev-devel + libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel" case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) configure_args+=" -DENABLE_JIT=0" @@ -47,32 +47,31 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" else # Make cmake detect Ruby headers in cross base - configure_args+=" -DRUBY_VERSION=2.4 -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.4.0" + configure_args+=" -DRUBY_VERSION=2.5 -DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/ruby-2.5.0" # Fix non-working target CPU detection configure_args+=" -DCMAKE_SYSTEM_PROCESSOR=${XBPS_TARGET_MACHINE%-musl}" fi if [ "$build_option_gir" ]; then - configure_args+=" --enable-introspection" + configure_args+=" -DENABLE_INTROSPECTION=1" hostmakedepends+=" gobject-introspection" else - configure_args+=" --disable-introspection" configure_args+=" -DENABLE_INTROSPECTION=0" fi if [ "$build_option_wayland" ]; then - configure_args+=" --enable-wayland-target" + configure_args+=" -DENABLE_WAYLAND_TARGET=1" hostmakedepends+=" wayland-devel" - makedepends+=" MesaLib-devel libxkbcommon-devel wayland-devel" + makedepends+=" MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols" else - configure_args+=" --disable-wayland-target" + configure_args+=" -DENABLE_WAYLAND_TARGET=0" fi if [ "$build_option_x11" ]; then - configure_args+=" --enable-x11-target" + configure_args+=" -DENABLE_X11_TARGET=1" makedepends+=" libXt-devel" else - configure_args+=" --disable-x11-target" + configure_args+=" -DENABLE_X11_TARGET=0" fi pre_configure() {