Update to webkitgtk4-2.16.2.

This commit is contained in:
ajacoutot 2017-05-10 10:57:53 +00:00
parent a4bcc19968
commit 9e2d4636f3
4 changed files with 19 additions and 18 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2017/05/09 17:31:14 espie Exp $
# $OpenBSD: Makefile,v 1.56 2017/05/10 10:57:53 ajacoutot Exp $
# patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
# patches/patch-Source_WebKit2_webkit2gtk-web-extension_pc_in
@ -12,7 +12,7 @@ PORTROACH = limitw:1,even
COMMENT = GTK+ port of the WebKit rendering engine
V = 2.16.1
V = 2.16.2
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
EXTRACT_SUFX = .tar.xz

View File

@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.16.1.tar.xz) = 65I4MjIyjOZVtwPGQ3DtN5VmJHlxmtG0qGntRnadKUU=
SIZE (webkitgtk-2.16.1.tar.xz) = 14675996
SHA256 (webkitgtk-2.16.2.tar.xz) = XvaJogLrK3EUHvvot7UyiK3O2QeQ+fCN9uCi7BgJ8lI=
SIZE (webkitgtk-2.16.2.tar.xz) = 14650116

View File

@ -1,21 +1,22 @@
$OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.3 2017/03/29 13:25:52 ajacoutot Exp $
$OpenBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.4 2017/05/10 10:57:54 ajacoutot Exp $
XXX no mcontext_t on OpenBSD
--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig Mon Feb 27 09:03:42 2017
+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp Sun Mar 26 13:55:13 2017
@@ -87,7 +87,9 @@ static void pthreadSignalHandlerSuspendResume(int, sig
Index: Source/JavaScriptCore/heap/MachineStackMarker.cpp
--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig
+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -88,7 +88,9 @@ static void pthreadSignalHandlerSuspendResume(int, sig
}
ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
-#if CPU(PPC)
+#if OS(OPENBSD)
+ thread->suspendedMachineContext = *userContext;
+ threadData->suspendedMachineContext = *userContext;
+#elif CPU(PPC)
thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
threadData->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
#else
thread->suspendedMachineContext = userContext->uc_mcontext;
@@ -563,6 +565,24 @@ void* MachineThreads::Thread::Registers::stackPointer(
threadData->suspendedMachineContext = userContext->uc_mcontext;
@@ -577,6 +579,24 @@ void* MachineThreads::ThreadData::Registers::stackPoin
#error Unknown Architecture
#endif
@ -40,7 +41,7 @@ XXX no mcontext_t on OpenBSD
#elif defined(__GLIBC__) && ENABLE(JIT)
#if CPU(X86)
@@ -662,6 +682,24 @@ void* MachineThreads::Thread::Registers::framePointer(
@@ -676,6 +696,24 @@ void* MachineThreads::ThreadData::Registers::framePoin
#error Unknown Architecture
#endif
@ -65,7 +66,7 @@ XXX no mcontext_t on OpenBSD
#elif defined(__GLIBC__)
// The following sequence depends on glibc's sys/ucontext.h.
@@ -744,6 +782,24 @@ void* MachineThreads::Thread::Registers::instructionPo
@@ -758,6 +796,24 @@ void* MachineThreads::ThreadData::Registers::instructi
#error Unknown Architecture
#endif
@ -90,7 +91,7 @@ XXX no mcontext_t on OpenBSD
#elif defined(__GLIBC__)
// The following sequence depends on glibc's sys/ucontext.h.
@@ -831,6 +887,24 @@ void* MachineThreads::Thread::Registers::llintPC() con
@@ -846,6 +902,24 @@ void* MachineThreads::ThreadData::Registers::llintPC()
return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);
#elif CPU(MIPS)
return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.10 2017/05/09 17:31:14 espie Exp $
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.11 2017/05/10 10:57:54 ajacoutot Exp $
Our ar(1) is too old and have not support for `T'.
@ -35,7 +35,7 @@ Index: Source/cmake/OptionsCommon.cmake
if (USE_ARM_LLVM_DISASSEMBLER)
find_package(LLVM REQUIRED)
@@ -221,13 +221,13 @@ if (NOT APPLE)
@@ -224,13 +224,13 @@ if (NOT APPLE)
endif ()
# Macros for determining HAVE values.
@ -51,7 +51,7 @@ Index: Source/cmake/OptionsCommon.cmake
SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
endmacro()
@@ -254,7 +254,7 @@ _HAVE_CHECK_INCLUDE(HAVE_FEATURES_H features.h)
@@ -257,7 +257,7 @@ _HAVE_CHECK_INCLUDE(HAVE_FEATURES_H features.h)
_HAVE_CHECK_INCLUDE(HAVE_ERRNO_H errno.h)
_HAVE_CHECK_INCLUDE(HAVE_LANGINFO_H langinfo.h)
_HAVE_CHECK_INCLUDE(HAVE_MMAP sys/mman.h)