webkit2gtk: remove patches
This commit is contained in:
parent
aa10a73553
commit
f951ae2f7c
14
srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
Normal file
14
srcpkgs/webkit2gtk/patches/fix-fast-memory-disabled.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp.orig 2017-09-14 10:03:40.908890971 +0200
|
||||||
|
+++ Source/JavaScriptCore/wasm/WasmFaultSignalHandler.cpp 2017-09-14 10:04:17.084859537 +0200
|
||||||
|
@@ -112,7 +112,11 @@ void unregisterCode(void* start, void* e
|
||||||
|
|
||||||
|
bool fastMemoryEnabled()
|
||||||
|
{
|
||||||
|
+#if ENABLE(WEBASSEMBLY_FAST_MEMORY)
|
||||||
|
return fastHandlerInstalled;
|
||||||
|
+#else
|
||||||
|
+ return false;
|
||||||
|
+#endif // ENABLE(WEBASSEMBLY_FAST_MEMORY)
|
||||||
|
}
|
||||||
|
|
||||||
|
void enableFastMemory()
|
@ -1,38 +0,0 @@
|
|||||||
--- Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100
|
|
||||||
+++ Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200
|
|
||||||
@@ -32,6 +32,7 @@
|
|
||||||
#include <stdbool.h>
|
|
||||||
#endif
|
|
||||||
#include <stddef.h> /* for size_t */
|
|
||||||
+#include <uchar.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
@@ -46,7 +47,7 @@
|
|
||||||
character. As with all scalar types, endianness depends on the underlying
|
|
||||||
architecture.
|
|
||||||
*/
|
|
||||||
- typedef unsigned short JSChar;
|
|
||||||
+ typedef char16_t JSChar;
|
|
||||||
#else
|
|
||||||
typedef wchar_t JSChar;
|
|
||||||
#endif
|
|
||||||
--- Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100
|
|
||||||
+++ Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
|
|
||||||
#include <WebKit/WKBase.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
+#include <uchar.h>
|
|
||||||
|
|
||||||
#ifndef __cplusplus
|
|
||||||
#include <stdbool.h>
|
|
||||||
@@ -39,7 +40,7 @@
|
|
||||||
|
|
||||||
#if !defined(WIN32) && !defined(_WIN32) \
|
|
||||||
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
|
|
||||||
- typedef unsigned short WKChar;
|
|
||||||
+ typedef char16_t WKChar;
|
|
||||||
#else
|
|
||||||
typedef wchar_t WKChar;
|
|
||||||
#endif
|
|
@ -1,40 +0,0 @@
|
|||||||
diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
|
|
||||||
index 1df2874..de8beb2 100644
|
|
||||||
--- Source/JavaScriptCore/heap/MachineStackMarker.cpp
|
|
||||||
+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
|
|
||||||
@@ -566,7 +566,7 @@
|
|
||||||
#error Unknown Architecture
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#elif defined(__GLIBC__) && ENABLE(JIT)
|
|
||||||
+#elif defined(__linux__) && ENABLE(JIT)
|
|
||||||
|
|
||||||
#if CPU(X86)
|
|
||||||
return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
|
|
||||||
@@ -645,7 +645,7 @@ void* MachineThreads::Thread::Registers::framePointer() const
|
|
||||||
#error Unknown Architecture
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#elif defined(__GLIBC__)
|
|
||||||
+#elif defined(__linux__) // glibc and musl
|
|
||||||
|
|
||||||
// The following sequence depends on glibc's sys/ucontext.h.
|
|
||||||
#if CPU(X86)
|
|
||||||
@@ -727,7 +727,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const
|
|
||||||
#error Unknown Architecture
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#elif defined(__GLIBC__)
|
|
||||||
+#elif defined(__linux__) // glibc and musl
|
|
||||||
|
|
||||||
// The following sequence depends on glibc's sys/ucontext.h.
|
|
||||||
#if CPU(X86)
|
|
||||||
@@ -818,7 +818,7 @@ void* MachineThreads::Thread::Registers::llintPC() const
|
|
||||||
#error Unknown Architecture
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#elif defined(__GLIBC__)
|
|
||||||
+#elif defined(__linux__) // glibc and musl
|
|
||||||
|
|
||||||
// The following sequence depends on glibc's sys/ucontext.h.
|
|
||||||
#if CPU(X86)
|
|
@ -4,7 +4,8 @@ version=2.18.0
|
|||||||
revision=1
|
revision=1
|
||||||
wrksrc="webkitgtk-$version"
|
wrksrc="webkitgtk-$version"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc"
|
configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc
|
||||||
|
-DUSE_GSTREAMER_GL=OFF"
|
||||||
short_desc="GTK+3 port of the WebKit2 browser engine"
|
short_desc="GTK+3 port of the WebKit2 browser engine"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||||
homepage="https://webkitgtk.org/"
|
homepage="https://webkitgtk.org/"
|
||||||
@ -30,6 +31,10 @@ armv6*) configure_args+=" -DENABLE_JIT=0" CXXFLAGS+=" -D__GCC_HAVE_SYNC_COMPARE_
|
|||||||
aarch64*) configure_args+=" -DUSE_LD_GOLD=0";;
|
aarch64*) configure_args+=" -DUSE_LD_GOLD=0";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
*-musl) configure_args+=" -DENABLE_SAMPLING_PROFILER=OFF";;
|
||||||
|
esac
|
||||||
|
|
||||||
# Package build options
|
# Package build options
|
||||||
build_options="gir wayland x11"
|
build_options="gir wayland x11"
|
||||||
# Disable gir for cross builds.
|
# Disable gir for cross builds.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user