cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to webkitgtk4-2.32.0.

Browse Source
This commit is contained in:
ajacoutot 2021-03-28 07:26:33 +00:00
parent df7550d71a
commit 3d4849cb4e
20 changed files with 72 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/webkitgtk4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.137 2021/03/18 15:54:25 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.138 2021/03/28 07:26:33 ajacoutot Exp $
# patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in # patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
# patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in # patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
@ -13,7 +13,7 @@ PORTROACH = limitw:1,even
COMMENT = GTK+ port of the WebKit rendering engine COMMENT = GTK+ port of the WebKit rendering engine
V = 2.30.6 V = 2.32.0
DISTNAME = webkitgtk-${V} DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V} PKGNAME = webkitgtk4-${V}
EXTRACT_SUFX = .tar.xz EXTRACT_SUFX = .tar.xz
@ -21,8 +21,8 @@ API = 4.0
SUBST_VARS = API SUBST_VARS = API
DPB_PROPERTIES = parallel DPB_PROPERTIES = parallel
SHARED_LIBS += javascriptcoregtk-${API} 3.3 # 18.13.3 SHARED_LIBS += javascriptcoregtk-${API} 3.4 # 18.13.3
SHARED_LIBS += webkit2gtk-${API} 3.3 # 37.37.2 SHARED_LIBS += webkit2gtk-${API} 3.4 # 37.37.2
CATEGORIES = www CATEGORIES = www
@ -89,10 +89,17 @@ LIB_DEPENDS = archivers/woff2 \
CONFIGURE_ENV = WK_USE_CCACHE=NO CONFIGURE_ENV = WK_USE_CCACHE=NO
CONFIGURE_ARGS = -DPORT=GTK \ CONFIGURE_ARGS = -DPORT=GTK \
-DENABLE_MINIBROWSER=ON \
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \ -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
-DUSE_SYSTEMD=OFF -DUSE_SYSTEMD=OFF
# needs Wayland (libwpe -> WPEBackend-fdo -> Wayland)
CONFIGURE_ARGS += -DUSE_WPE_RENDERER=OFF
# Needs GUdev
CONFIGURE_ARGS += -DENABLE_GAMEPAD=OFF
# sync with Source/JavaScriptCore/assembler/MacroAssembler.h # sync with Source/JavaScriptCore/assembler/MacroAssembler.h
.if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_ARCH} != "amd64" && \ .if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_ARCH} != "amd64" && \
${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "i386" && \ ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "i386" && \
@ -125,7 +132,6 @@ post-extract:
ln -sf ${RUBY} ${WRKDIR}/bin/ruby ln -sf ${RUBY} ${WRKDIR}/bin/ruby
pre-configure: pre-configure:
${SUBST_CMD} ${WRKSRC}/Source/cmake/WebKitCommon.cmake \ ${SUBST_CMD} ${WRKSRC}/Source/cmake/WebKitCommon.cmake
${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
.include <bsd.port.mk> .include <bsd.port.mk>

4
www/webkitgtk4/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (webkitgtk-2.30.6.tar.xz) = UHNux6kXcLWTnXFRluX+cgm5Pvze70JbJNxR+46dfB4= SHA256 (webkitgtk-2.32.0.tar.xz) = nX302umtojlCV1ZazCporOkwjExhw/zAARHcHxEHa/A=
SIZE (webkitgtk-2.30.6.tar.xz) = 22311524 SIZE (webkitgtk-2.32.0.tar.xz) = 23315936

21
www/webkitgtk4/patches/patch-CMakeLists_txt
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.17 2020/09/13 10:28:44 ajacoutot Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -109,12 +109,14 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
endif ()
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
set(WTF_CPU_PPC 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
set(WTF_CPU_PPC64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
set(WTF_CPU_PPC64LE 1)
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
+ set(WTF_CPU_SPARC64 1)
else ()
set(WTF_CPU_UNKNOWN 1)
endif ()

4
www/webkitgtk4/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.7 2020/09/13 10:28:44 ajacoutot Exp $ $OpenBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler_h,v 1.8 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/JavaScriptCore/assembler/ARM64Assembler.h Index: Source/JavaScriptCore/assembler/ARM64Assembler.h
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig --- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig
+++ Source/JavaScriptCore/assembler/ARM64Assembler.h +++ Source/JavaScriptCore/assembler/ARM64Assembler.h
@@ -2825,6 +2825,8 @@ class ARM64Assembler { (public) @@ -2859,6 +2859,8 @@ class ARM64Assembler { (public)
{ {
#if OS(DARWIN) #if OS(DARWIN)
sys_cache_control(kCacheFunctionPrepareForExecution, code, size); sys_cache_control(kCacheFunctionPrepareForExecution, code, size);

4
www/webkitgtk4/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.6 2020/09/13 10:28:44 ajacoutot Exp $ $OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_cpp,v 1.7 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/JavaScriptCore/jit/ExecutableAllocator.cpp Index: Source/JavaScriptCore/jit/ExecutableAllocator.cpp
--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig --- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig
+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp +++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -93,7 +93,8 @@ static constexpr size_t maxIslandsPerRegion = islandRe @@ -105,7 +105,8 @@ static constexpr size_t maxIslandsPerRegion = islandRe
#else #else
static constexpr size_t fixedExecutableMemoryPoolSize = 128 * MB; static constexpr size_t fixedExecutableMemoryPoolSize = 128 * MB;
#endif #endif

4
www/webkitgtk4/patches/patch-Source_JavaScriptCore_jsc_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_JavaScriptCore_jsc_cpp,v 1.1 2020/09/13 10:28:44 ajacoutot Exp $ $OpenBSD: patch-Source_JavaScriptCore_jsc_cpp,v 1.2 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/JavaScriptCore/jsc.cpp Index: Source/JavaScriptCore/jsc.cpp
--- Source/JavaScriptCore/jsc.cpp.orig --- Source/JavaScriptCore/jsc.cpp.orig
+++ Source/JavaScriptCore/jsc.cpp +++ Source/JavaScriptCore/jsc.cpp
@@ -69,6 +69,7 @@ @@ -71,6 +71,7 @@
#include "WasmCapabilities.h" #include "WasmCapabilities.h"
#include "WasmFaultSignalHandler.h" #include "WasmFaultSignalHandler.h"
#include "WasmMemory.h" #include "WasmMemory.h"

4
www/webkitgtk4/patches/patch-Source_JavaScriptCore_offlineasm_arm64_rb
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.6 2020/09/13 10:28:44 ajacoutot Exp $ $OpenBSD: patch-Source_JavaScriptCore_offlineasm_arm64_rb,v 1.7 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/JavaScriptCore/offlineasm/arm64.rb Index: Source/JavaScriptCore/offlineasm/arm64.rb
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig --- Source/JavaScriptCore/offlineasm/arm64.rb.orig
+++ Source/JavaScriptCore/offlineasm/arm64.rb +++ Source/JavaScriptCore/offlineasm/arm64.rb
@@ -1098,7 +1098,7 @@ class Instruction @@ -1127,7 +1127,7 @@ class Instruction
$asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]" $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
# On Linux, use ELF GOT relocation specifiers. # On Linux, use ELF GOT relocation specifiers.

6
www/webkitgtk4/patches/patch-Source_JavaScriptCore_runtime_Options_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_JavaScriptCore_runtime_Options_cpp,v 1.5 2020/09/13 10:28:44 ajacoutot Exp $ $OpenBSD: patch-Source_JavaScriptCore_runtime_Options_cpp,v 1.6 2021/03/28 07:26:33 ajacoutot Exp $
powerpc and i386 fix for: powerpc and i386 fix for:
undefined reference to `WTF::Optional<unsigned long> undefined reference to `WTF::Optional<unsigned long>
@ -7,7 +7,7 @@ JSC::parse<unsigned long>(char const*)'
Index: Source/JavaScriptCore/runtime/Options.cpp Index: Source/JavaScriptCore/runtime/Options.cpp
--- Source/JavaScriptCore/runtime/Options.cpp.orig --- Source/JavaScriptCore/runtime/Options.cpp.orig
+++ Source/JavaScriptCore/runtime/Options.cpp +++ Source/JavaScriptCore/runtime/Options.cpp
@@ -83,7 +83,7 @@ Optional<OptionsStorage::Unsigned> parse(const char* s @@ -89,7 +89,7 @@ Optional<OptionsStorage::Unsigned> parse(const char* s
return WTF::nullopt; return WTF::nullopt;
} }
@ -16,7 +16,7 @@ Index: Source/JavaScriptCore/runtime/Options.cpp
template<> template<>
Optional<OptionsStorage::Size> parse(const char* string) Optional<OptionsStorage::Size> parse(const char* string)
{ {
@@ -92,7 +92,7 @@ Optional<OptionsStorage::Size> parse(const char* strin @@ -98,7 +98,7 @@ Optional<OptionsStorage::Size> parse(const char* strin
return value; return value;
return WTF::nullopt; return WTF::nullopt;
} }

4
www/webkitgtk4/patches/patch-Source_WTF_wtf_PlatformEnable_h
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Source_WTF_wtf_PlatformEnable_h,v 1.3 2021/02/11 13:22:59 ajacoutot Exp $ $OpenBSD: patch-Source_WTF_wtf_PlatformEnable_h,v 1.4 2021/03/28 07:26:33 ajacoutot Exp $
https://bugs.webkit.org/show_bug.cgi?id=129963 https://bugs.webkit.org/show_bug.cgi?id=129963
Index: Source/WTF/wtf/PlatformEnable.h Index: Source/WTF/wtf/PlatformEnable.h
--- Source/WTF/wtf/PlatformEnable.h.orig --- Source/WTF/wtf/PlatformEnable.h.orig
+++ Source/WTF/wtf/PlatformEnable.h +++ Source/WTF/wtf/PlatformEnable.h
@@ -628,7 +628,7 @@ @@ -629,7 +629,7 @@
#if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
/* Enable the DFG JIT on X86 and X86_64. */ /* Enable the DFG JIT on X86 and X86_64. */

4
www/webkitgtk4/patches/patch-Source_WTF_wtf_PlatformHave_h
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Source_WTF_wtf_PlatformHave_h,v 1.2 2020/09/13 10:28:45 ajacoutot Exp $ $OpenBSD: patch-Source_WTF_wtf_PlatformHave_h,v 1.3 2021/03/28 07:26:33 ajacoutot Exp $
https://bugs.webkit.org/show_bug.cgi?id=129963 https://bugs.webkit.org/show_bug.cgi?id=129963
Index: Source/WTF/wtf/PlatformHave.h Index: Source/WTF/wtf/PlatformHave.h
--- Source/WTF/wtf/PlatformHave.h.orig --- Source/WTF/wtf/PlatformHave.h.orig
+++ Source/WTF/wtf/PlatformHave.h +++ Source/WTF/wtf/PlatformHave.h
@@ -202,7 +202,7 @@ @@ -206,7 +206,7 @@
#define HAVE_HOSTED_CORE_ANIMATION 1 #define HAVE_HOSTED_CORE_ANIMATION 1
#endif #endif

20
www/webkitgtk4/patches/patch-Source_WTF_wtf_RAMSize_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.5 2020/09/13 10:28:45 ajacoutot Exp $ $OpenBSD: patch-Source_WTF_wtf_RAMSize_cpp,v 1.6 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/WTF/wtf/RAMSize.cpp Index: Source/WTF/wtf/RAMSize.cpp
--- Source/WTF/wtf/RAMSize.cpp.orig --- Source/WTF/wtf/RAMSize.cpp.orig
@ -12,19 +12,5 @@ Index: Source/WTF/wtf/RAMSize.cpp
+#include <sys/sysctl.h> +#include <sys/sysctl.h>
+#elif OS(LINUX) +#elif OS(LINUX)
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#endif // OS(LINUX) #elif OS(UNIX)
#else #include <unistd.h>
@@ -58,6 +60,13 @@ static size_t computeRAMSize()
struct sysinfo si;
sysinfo(&si);
return si.totalram * si.mem_unit;
+#elif OS(OPENBSD)
+ int mib[] = { CTL_HW, HW_USERMEM64 };
+ int64_t mem;
+ size_t len = sizeof(mem);
+ if (sysctl(mib, 2, &mem, &len, NULL, 0) == -1)
+ return 512 * MB; // guess
+ return mem;
#else
#error "Missing a platform specific way of determining the available RAM"
#endif // OS(LINUX) || OS(FREEBSD)

17
www/webkitgtk4/patches/patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-Source_WebCore_platform_graphics_x11_PlatformDisplayX11_cpp,v 1.1 2020/11/11 21:27:03 cwen Exp $
Missing include for XVisualInfo(3), this code is only trigerred when
`-DENABLE_GRAPHICS_CONTEXT_GL=OFF' is given to CONFIGURE_ARGS, currently
only needed on powerpc.
Index: Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
--- Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp.orig
+++ Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp
@@ -32,6 +32,7 @@
#include <X11/Xlib.h>
#include <X11/extensions/Xcomposite.h>
#if PLATFORM(GTK)
+#include <X11/Xutil.h>
#include <X11/extensions/Xdamage.h>
#endif

14
www/webkitgtk4/patches/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath_cpp,v 1.4 2019/09/24 06:56:43 ajacoutot Exp $
Index: Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
--- Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp.orig
+++ Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
@@ -48,7 +48,7 @@ Vector<String> pluginsDirectories()
result.append(FileSystem::homeDirectoryPath() + "/.mozilla/plugins");
result.append(FileSystem::homeDirectoryPath() + "/.netscape/plugins");
result.append("/usr/lib/browser/plugins");
- result.append("/usr/local/lib/mozilla/plugins");
+ result.append("${LOCALBASE}/lib/mozilla/plugins");
result.append("/usr/lib/firefox/plugins");
result.append("/usr/lib64/browser-plugins");
result.append("/usr/lib/browser-plugins");

4
www/webkitgtk4/patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $ $OpenBSD: patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in,v 1.4 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/WebKit/gtk/webkit2gtk-web-extension.pc.in Index: Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
--- Source/WebKit/gtk/webkit2gtk-web-extension.pc.in.orig --- Source/WebKit/gtk/webkit2gtk-web-extension.pc.in.orig
@ -6,7 +6,7 @@ Index: Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
@@ -8,5 +8,5 @@ Description: Web content engine for GTK - web process @@ -8,5 +8,5 @@ Description: Web content engine for GTK - web process
URL: https://webkitgtk.org URL: https://webkitgtk.org
Version: @PROJECT_VERSION@ Version: @PROJECT_VERSION@
Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ Requires: glib-2.0 @GTK_PC_NAME@ libsoup-@SOUP_API_VERSION@ javascriptcoregtk-@WEBKITGTK_API_VERSION@
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@ -Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@ -Wl,-z,wxneeded +Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@ -Wl,-z,wxneeded
Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@ Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@

4
www/webkitgtk4/patches/patch-Source_WebKit_gtk_webkit2gtk_pc_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_WebKit_gtk_webkit2gtk_pc_in,v 1.3 2019/03/14 09:48:28 ajacoutot Exp $ $OpenBSD: patch-Source_WebKit_gtk_webkit2gtk_pc_in,v 1.4 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/WebKit/gtk/webkit2gtk.pc.in Index: Source/WebKit/gtk/webkit2gtk.pc.in
--- Source/WebKit/gtk/webkit2gtk.pc.in.orig --- Source/WebKit/gtk/webkit2gtk.pc.in.orig
@ -6,7 +6,7 @@ Index: Source/WebKit/gtk/webkit2gtk.pc.in
@@ -8,5 +8,5 @@ Description: Web content engine for GTK @@ -8,5 +8,5 @@ Description: Web content engine for GTK
URL: https://webkitgtk.org URL: https://webkitgtk.org
Version: @PROJECT_VERSION@ Version: @PROJECT_VERSION@
Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ Requires: glib-2.0 @GTK_PC_NAME@ libsoup-@SOUP_API_VERSION@ javascriptcoregtk-@WEBKITGTK_API_VERSION@
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@ -Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
+Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@ -Wl,-z,wxneeded +Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@ -Wl,-z,wxneeded
Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@ Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@

15
www/webkitgtk4/patches/patch-Source_cmake_OptionsCommon_cmake
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.17 2020/09/13 10:28:45 ajacoutot Exp $ $OpenBSD: patch-Source_cmake_OptionsCommon_cmake,v 1.18 2021/03/28 07:26:33 ajacoutot Exp $
Our ar(1) is too old and have not support for `T'. Our ar(1) is too old and have not support for `T'.
Put the internal library path first so that we can Put the internal library path first so that we can
@ -7,10 +7,10 @@ build with an older webkitgtk4 package installed.
Index: Source/cmake/OptionsCommon.cmake Index: Source/cmake/OptionsCommon.cmake
--- Source/cmake/OptionsCommon.cmake.orig --- Source/cmake/OptionsCommon.cmake.orig
+++ Source/cmake/OptionsCommon.cmake +++ Source/cmake/OptionsCommon.cmake
@@ -9,10 +9,10 @@ option(USE_THIN_ARCHIVES "Produce all static libraries @@ -14,10 +14,10 @@ if (USE_THIN_ARCHIVES)
if (USE_THIN_ARCHIVES) elseif ("${AR_ERROR}")
execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION) message(WARNING "Error from `ar`: ${AR_ERROR}")
if ("${AR_VERSION}" MATCHES "^GNU ar") elseif ("${AR_VERSION}" MATCHES "^GNU ar")
- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>") - set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
@ -22,10 +22,13 @@ Index: Source/cmake/OptionsCommon.cmake
endif () endif ()
endif () endif ()
@@ -153,3 +153,6 @@ check_type_size("__int128_t" INT128_VALUE) @@ -160,6 +160,9 @@ check_type_size("__int128_t" INT128_VALUE)
if (HAVE_INT128_VALUE) if (HAVE_INT128_VALUE)
SET_AND_EXPOSE_TO_BUILD(HAVE_INT128_T INT128_VALUE) SET_AND_EXPOSE_TO_BUILD(HAVE_INT128_T INT128_VALUE)
endif () endif ()
+ +
+# make sure that the internal library dir is the first in the path +# make sure that the internal library dir is the first in the path
+link_directories("${CMAKE_BINARY_DIR}/lib") +link_directories("${CMAKE_BINARY_DIR}/lib")
# Check whether experimental/filesystem is the filesystem impl available
if (STD_EXPERIMENTAL_FILESYSTEM_IS_AVAILABLE)

22
www/webkitgtk4/patches/patch-Source_cmake_WebKitCommon_cmake
View File

@ -1,9 +1,25 @@
$OpenBSD: patch-Source_cmake_WebKitCommon_cmake,v 1.5 2019/03/14 09:48:28 ajacoutot Exp $ $OpenBSD: patch-Source_cmake_WebKitCommon_cmake,v 1.6 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/cmake/WebKitCommon.cmake Index: Source/cmake/WebKitCommon.cmake
--- Source/cmake/WebKitCommon.cmake.orig --- Source/cmake/WebKitCommon.cmake.orig
+++ Source/cmake/WebKitCommon.cmake +++ Source/cmake/WebKitCommon.cmake
@@ -23,9 +23,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON) @@ -102,12 +102,14 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
endif ()
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
set(WTF_CPU_PPC 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
set(WTF_CPU_PPC64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
set(WTF_CPU_PPC64LE 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
+ set(WTF_CPU_SPARC64 1)
else ()
set(WTF_CPU_UNKNOWN 1)
endif ()
@@ -177,9 +179,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
# We cannot check for RUBY_FOUND because it is set only when the full package is installed and # We cannot check for RUBY_FOUND because it is set only when the full package is installed and
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro # the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
# for finding only the Ruby interpreter. # for finding only the Ruby interpreter.
@ -16,7 +32,7 @@ Index: Source/cmake/WebKitCommon.cmake
endif () endif ()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -37,7 +37,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON) @@ -191,7 +193,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
include(CheckFunctionExists) include(CheckFunctionExists)

6
www/webkitgtk4/patches/patch-Source_cmake_WebKitCompilerFlags_cmake
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.7 2020/03/12 09:17:40 ajacoutot Exp $ $OpenBSD: patch-Source_cmake_WebKitCompilerFlags_cmake,v 1.8 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/cmake/WebKitCompilerFlags.cmake Index: Source/cmake/WebKitCompilerFlags.cmake
--- Source/cmake/WebKitCompilerFlags.cmake.orig --- Source/cmake/WebKitCompilerFlags.cmake.orig
+++ Source/cmake/WebKitCompilerFlags.cmake +++ Source/cmake/WebKitCompilerFlags.cmake
@@ -232,9 +232,9 @@ if (NOT MSVC) @@ -235,9 +235,9 @@ if (NOT MSVC)
string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS}) string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS})
endif () endif ()
@ -15,4 +15,4 @@ Index: Source/cmake/WebKitCompilerFlags.cmake
+#endif () +#endif ()
# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0. Since this if (MSVC)

4
www/webkitgtk4/patches/patch-Source_cmake_WebKitFeatures_cmake
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_cmake_WebKitFeatures_cmake,v 1.8 2020/11/21 10:46:40 ajacoutot Exp $ $OpenBSD: patch-Source_cmake_WebKitFeatures_cmake,v 1.9 2021/03/28 07:26:33 ajacoutot Exp $
Index: Source/cmake/WebKitFeatures.cmake Index: Source/cmake/WebKitFeatures.cmake
--- Source/cmake/WebKitFeatures.cmake.orig --- Source/cmake/WebKitFeatures.cmake.orig
+++ Source/cmake/WebKitFeatures.cmake +++ Source/cmake/WebKitFeatures.cmake
@@ -432,7 +432,7 @@ macro(CREATE_CONFIGURATION_HEADER) @@ -428,7 +428,7 @@ macro(CREATE_CONFIGURATION_HEADER)
endmacro() endmacro()
macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header) macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header)

5
www/webkitgtk4/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.20 2021/02/11 13:22:59 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.21 2021/03/28 07:26:33 ajacoutot Exp $
@bin bin/WebKitWebDriver @bin bin/WebKitWebDriver
include/webkitgtk-${API}/ include/webkitgtk-${API}/
include/webkitgtk-${API}/JavaScriptCore/ include/webkitgtk-${API}/JavaScriptCore/
@ -55,6 +55,7 @@ include/webkitgtk-${API}/webkit2/WebKitHitTestResult.h
include/webkitgtk-${API}/webkit2/WebKitInputMethodContext.h include/webkitgtk-${API}/webkit2/WebKitInputMethodContext.h
include/webkitgtk-${API}/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h include/webkitgtk-${API}/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
include/webkitgtk-${API}/webkit2/WebKitJavascriptResult.h include/webkitgtk-${API}/webkit2/WebKitJavascriptResult.h
include/webkitgtk-${API}/webkit2/WebKitMediaKeySystemPermissionRequest.h
include/webkitgtk-${API}/webkit2/WebKitMimeInfo.h include/webkitgtk-${API}/webkit2/WebKitMimeInfo.h
include/webkitgtk-${API}/webkit2/WebKitNavigationAction.h include/webkitgtk-${API}/webkit2/WebKitNavigationAction.h
include/webkitgtk-${API}/webkit2/WebKitNavigationPolicyDecision.h include/webkitgtk-${API}/webkit2/WebKitNavigationPolicyDecision.h
@ -230,8 +231,8 @@ lib/webkit2gtk-${API}/
lib/webkit2gtk-${API}/injected-bundle/ lib/webkit2gtk-${API}/injected-bundle/
@so lib/webkit2gtk-${API}/injected-bundle/libwebkit2gtkinjectedbundle.so @so lib/webkit2gtk-${API}/injected-bundle/libwebkit2gtkinjectedbundle.so
libexec/webkit2gtk-${API}/ libexec/webkit2gtk-${API}/
@bin libexec/webkit2gtk-${API}/MiniBrowser
@bin libexec/webkit2gtk-${API}/WebKitNetworkProcess @bin libexec/webkit2gtk-${API}/WebKitNetworkProcess
@bin libexec/webkit2gtk-${API}/WebKitPluginProcess
@bin libexec/webkit2gtk-${API}/WebKitWebProcess @bin libexec/webkit2gtk-${API}/WebKitWebProcess
@bin libexec/webkit2gtk-${API}/jsc @bin libexec/webkit2gtk-${API}/jsc
share/gir-1.0/JavaScriptCore-${API}.gir share/gir-1.0/JavaScriptCore-${API}.gir