Attachment #225472 for bug #255528




# Created by: Michael Johnson <ahze@FreeBSD.org>

PORTNAME=	webkit
DISTVERSION=	2.32.1
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	https://webkitgtk.org/releases/
PKGNAMESUFFIX=	2-gtk3

		libsoup-2.4.so:devel/libsoup \
		libgcrypt.so:security/libgcrypt \
		libtasn1.so:security/libtasn1 \
		libwoff2dec.so:devel/woff2 \
		libsysinfo.so:devel/libsysinfo

PORTSCOUT=	limitw:1,even

USES=		bison cmake compiler:c++14-lang gettext gl gnome gperf \
		jpeg localbase:ldflags perl5 pkgconfig python:build \
		sqlite tar:xz
USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
USE_GL=		egl glesv2
USE_LDCONFIG=	yes
USE_PERL5=	build
USE_RUBY=	yes
RUBY_NO_RUN_DEPENDS=	yes
USE_XORG=	x11 xcomposite xdamage xext xrender xt ice

BINARY_ALIAS=		python=${PYTHON_CMD}
CXXFLAGS+=		-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
CXXFLAGS_powerpc=	-DENABLE_YARR_JIT=0
CXXFLAGS_powerpc64=	-DENABLE_YARR_JIT=0
LDFLAGS+=		-lsysinfo
CMAKE_ARGS=		-DPORT=GTK
CMAKE_OFF=		ENABLE_GAMEPAD \
			USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
			USE_SYSTEMD
CMAKE_ON=		ENABLE_MINIBROWSER \
			USE_SYSTEM_MALLOC


BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3

OPTIONS_DEFINE=		DEBUG GEOIP GSTREAMER WAYLAND X11
OPTIONS_DEFAULT=	GEOIP GSTREAMER WAYLAND X11
OPTIONS_SUB=		yes

# Building WebKit with debugging symbols requires ar and ld with

			libwpe-1.0.so:www/libwpe \
			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo

X11_CMAKE_BOOL=		ENABLE_X11_TARGET
X11_USES=		xorg
X11_USE=		XORG=x11,xcomposite,xdamage,xext,xrender,xt,ice
X11_VARS=		USE_GL+=gl

pre-configure:
# .if !exists() evaluates too early before cairo has a chance to be installed

Lines 1-3 Link Here

(-)b/www/webkit2-gtk3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613230723	1	TIMESTAMP = 1622464825
2	SHA256 (gnome/webkitgtk-2.30.5.tar.xz) = 7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f	2	SHA256 (gnome/webkitgtk-2.32.1.tar.xz) = 136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
3	SIZE (gnome/webkitgtk-2.30.5.tar.xz) = 22311832	3	SIZE (gnome/webkitgtk-2.32.1.tar.xz) = 23321600




--- CMakeLists.txt.orig	2020-08-12 09:17:37 UTC
+++ CMakeLists.txt
@@ -109,9 +109,9 @@ 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")
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
     set(WTF_CPU_PPC64 1)
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
     set(WTF_CPU_PPC64LE 1)

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (-2 / +2 lines)
1	--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2020-08-12 09:17:52 UTC	1	--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2021-02-26 09:57:05 UTC
2	+++ Source/JavaScriptCore/assembler/ARM64Assembler.h	2	+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
3	@@ -2825,6 +2825,8 @@ class ARM64Assembler { (public)	3	@@ -2859,6 +2859,8 @@ class ARM64Assembler { (public)
4	{	4	{
5	#if OS(DARWIN)	5	#if OS(DARWIN)
6	sys_cache_control(kCacheFunctionPrepareForExecution, code, size);	6	sys_cache_control(kCacheFunctionPrepareForExecution, code, size);

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h (-1 / +1 lines)
1	--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2020-08-12 09:17:52 UTC	1	--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2021-02-26 09:57:05 UTC
2	+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h	2	+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
3	@@ -2396,6 +2396,8 @@ class ARMv7Assembler { (public)	3	@@ -2396,6 +2396,8 @@ class ARMv7Assembler { (public)
4	{	4	{

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp (-2 / +2 lines)
1	--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-02-07 10:45:05 UTC	1	--- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-02-26 09:57:05 UTC
2	+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp	2	+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp
3	@@ -76,7 +76,7 @@ namespace JSC {	3	@@ -88,7 +88,7 @@ namespace JSC {
4		4
5	using namespace WTF;	5	using namespace WTF;
6		6

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp (-2 / +2 lines)
1	--- Source/JavaScriptCore/jsc.cpp.orig 2020-08-12 09:17:53 UTC	1	--- Source/JavaScriptCore/jsc.cpp.orig 2021-02-26 09:57:05 UTC
2	+++ Source/JavaScriptCore/jsc.cpp	2	+++ Source/JavaScriptCore/jsc.cpp
3	@@ -94,6 +94,9 @@	3	@@ -96,6 +96,9 @@
4	#else	4	#else
5	#include <unistd.h>	5	#include <unistd.h>
6	#endif	6	#endif

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb (-2 / +2 lines)
1	--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2020-08-12 09:17:53 UTC	1	--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2021-02-26 09:57:05 UTC
2	+++ Source/JavaScriptCore/offlineasm/arm64.rb	2	+++ Source/JavaScriptCore/offlineasm/arm64.rb
3	@@ -1098,7 +1098,7 @@ class Instruction	3	@@ -1127,7 +1127,7 @@ class Instruction
4	$asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"	4	$asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]"
5		5
6	# On Linux, use ELF GOT relocation specifiers.	6	# On Linux, use ELF GOT relocation specifiers.

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp (-2 / +2 lines)
1	--- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-02-15 20:45:27 UTC	1	--- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-02-26 09:57:05 UTC
2	+++ Source/JavaScriptCore/runtime/NativeExecutable.cpp	2	+++ Source/JavaScriptCore/runtime/NativeExecutable.cpp
3	@@ -24,6 +24,7 @@	3	@@ -24,6 +24,7 @@
4	*/	4	*/
Lines 7-10 Link Here
7	+#include "ExecutableBaseInlines.h"	7	+#include "ExecutableBaseInlines.h"
8	#include "NativeExecutable.h"	8	#include "NativeExecutable.h"
9		9
10	#include "JSCInlines.h"	10	#include "ExecutableBaseInlines.h"

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_PlatformCPU.h (-1 / +1 lines)
1	--- Source/WTF/wtf/PlatformCPU.h.orig 2020-08-12 09:17:54 UTC	1	--- Source/WTF/wtf/PlatformCPU.h.orig 2021-02-26 09:57:08 UTC
2	+++ Source/WTF/wtf/PlatformCPU.h	2	+++ Source/WTF/wtf/PlatformCPU.h
3	@@ -155,6 +155,7 @@	3	@@ -155,6 +155,7 @@
4	#elif defined(__ARM_ARCH_6__) \	4	#elif defined(__ARM_ARCH_6__) \




--- Source/WTF/wtf/RAMSize.cpp.orig	2021-02-26 09:57:08 UTC
+++ Source/WTF/wtf/RAMSize.cpp
@@ -31,7 +31,7 @@
 #if OS(WINDOWS)
 #include <windows.h>
 #elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
-#if OS(LINUX)
+#if OS(LINUX) || OS(FREEBSD)
 #include <sys/sysinfo.h>
 #elif OS(UNIX)
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
 #else
 #include <bmalloc/bmalloc.h>
 #endif
@@ -54,10 +58,18 @@ static size_t computeRAMSize()
         return ramSizeGuess;
     return status.ullTotalPhys;
 #elif USE(SYSTEM_MALLOC)
-#if OS(LINUX) || OS(FREEBSD)
+#if OS(LINUX)
     struct sysinfo si;
     sysinfo(&si);
     return si.totalram * si.mem_unit;
+#elif OS(FREEBSD)
+    size_t physmem, len;
+    int mib[2] = { CTL_HW, HW_PHYSMEM };
+    if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0
+        && len == sizeof(physmem))
+        return physmem;
+    else
+        return 512 * MB; // guess
 #else
 #error "Missing a platform specific way of determining the available RAM"
 #endif // OS(LINUX) || OS(FREEBSD)

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp (-1 / +1 lines)
1	--- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2020-08-12 09:17:54 UTC	1	--- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2021-02-26 09:57:08 UTC
2	+++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp	2	+++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,7 @@
4	#include "config.h"	4	#include "config.h"

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp (-1 / +1 lines)
1	--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig 2018-05-07 07:58:18 UTC	1	--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig 2021-02-26 09:57:13 UTC
2	+++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp	2	+++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
3	@@ -35,7 +35,7 @@ namespace WebCore {	3	@@ -35,7 +35,7 @@ namespace WebCore {
4	// ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D	4	// ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D

Removed Link Here

(-)a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp (-11 lines)
1	--- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig 2018-07-25 11:56:31 UTC
2	+++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
3	@@ -45,6 +45,8 @@
4	#include "OpenGLShims.h"
5	#endif
6
7	+#include <X11/Xlib.h>
8	+
9	#if ENABLE(ACCELERATED_2D_CANVAS)
10	// cairo-gl.h includes some definitions from GLX that conflict with
11	// the ones provided by us. Since GLContextEGL doesn't use any GLX

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h (-1 / +1 lines)
1	--- Source/WebCore/platform/network/DNS.h.orig 2020-09-30 07:03:48 UTC	1	--- Source/WebCore/platform/network/DNS.h.orig 2021-02-26 09:57:13 UTC
2	+++ Source/WebCore/platform/network/DNS.h	2	+++ Source/WebCore/platform/network/DNS.h
3	@@ -29,6 +29,7 @@	3	@@ -29,6 +29,7 @@
4	#include <winsock2.h>	4	#include <winsock2.h>

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp (-1 / +1 lines)
1	--- Source/WebCore/platform/text/TextCodec.cpp.orig 2019-02-16 10:10:59 UTC	1	--- Source/WebCore/platform/text/TextCodec.cpp.orig 2021-02-26 09:57:14 UTC
2	+++ Source/WebCore/platform/text/TextCodec.cpp	2	+++ Source/WebCore/platform/text/TextCodec.cpp
3	@@ -24,6 +24,8 @@	3	@@ -24,6 +24,8 @@
4	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	4	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Lines 1-4 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake (-1 / +1 lines)
1	--- Source/WebDriver/PlatformGTK.cmake.orig 2018-02-19 07:45:32 UTC	1	--- Source/WebDriver/PlatformGTK.cmake.orig 2021-02-26 09:57:15 UTC
2	+++ Source/WebDriver/PlatformGTK.cmake	2	+++ Source/WebDriver/PlatformGTK.cmake
3	@@ -5,6 +5,7 @@ add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIB	3	@@ -5,6 +5,7 @@ add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIB
4	list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES	4	list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h (-2 / +2 lines)
1	--- Source/bmalloc/bmalloc/BPlatform.h.orig 2020-08-12 09:17:57 UTC	1	--- Source/bmalloc/bmalloc/BPlatform.h.orig 2021-02-26 09:57:17 UTC
2	+++ Source/bmalloc/bmalloc/BPlatform.h	2	+++ Source/bmalloc/bmalloc/BPlatform.h
3	@@ -159,6 +159,7 @@	3	@@ -163,6 +163,7 @@
4	#elif defined(__ARM_ARCH_6__) \	4	#elif defined(__ARM_ARCH_6__) \
5	\|\| defined(__ARM_ARCH_6J__) \	5	\|\| defined(__ARM_ARCH_6J__) \
6	\|\| defined(__ARM_ARCH_6K__) \	6	\|\| defined(__ARM_ARCH_6K__) \

Lines 1-6 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_cmake_OptionsCommon.cmake (-3 / +3 lines)
1	--- Source/cmake/OptionsCommon.cmake.orig 2020-03-01 08:15:43.203077000 +1300	1	--- Source/cmake/OptionsCommon.cmake.orig 2021-02-26 09:57:17 UTC
2	+++ Source/cmake/OptionsCommon.cmake 2020-03-01 08:14:23.672978000 +1300	2	+++ Source/cmake/OptionsCommon.cmake
3	@@ -155,7 +155,7 @@	3	@@ -144,7 +144,7 @@ WEBKIT_CHECK_HAVE_FUNCTION(HAVE_VASPRINTF vasprintf)
4	# Check for symbols	4	# Check for symbols
5	WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h)	5	WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h)
6	if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))	6	if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin"))




--- Source/cmake/WebKitCommon.cmake.orig	2021-02-26 09:57:17 UTC
+++ Source/cmake/WebKitCommon.cmake
@@ -102,11 +102,11 @@ 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")
+    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
         set(WTF_CPU_PPC64 1)
-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64le|powerpc64le)")
         set(WTF_CPU_PPC64LE 1)
     else ()
         set(WTF_CPU_UNKNOWN 1)




include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h

lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
lib/libjavascriptcoregtk-4.0.so
lib/libjavascriptcoregtk-4.0.so.18
lib/libjavascriptcoregtk-4.0.so.18.18.5
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
lib/libwebkit2gtk-4.0.so.37.53.2
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-4.0.pc
libdata/pkgconfig/webkit2gtk-4.0.pc
libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
libexec/webkit2gtk-4.0/MiniBrowser
libexec/webkit2gtk-4.0/WebKitNetworkProcess
libexec/webkit2gtk-4.0/WebKitPluginProcess
libexec/webkit2gtk-4.0/WebKitWebProcess
libexec/webkit2gtk-4.0/jsc
share/gir-1.0/JavaScriptCore-4.0.gir
- 

Return to bug 255528

Lines 1-8 Link Here

(-)b/www/webkit2-gtk3/Makefile (-13 / +14 lines)
1	# Created by: Michael Johnson <ahze@FreeBSD.org>	1	# Created by: Michael Johnson <ahze@FreeBSD.org>
2		2
3	PORTNAME= webkit	3	PORTNAME= webkit
4	DISTVERSION= 2.30.5	4	DISTVERSION= 2.32.1
5	PORTREVISION= 1
6	CATEGORIES= www	5	CATEGORIES= www
7	MASTER_SITES= https://webkitgtk.org/releases/	6	MASTER_SITES= https://webkitgtk.org/releases/
8	PKGNAMESUFFIX= 2-gtk3	7	PKGNAMESUFFIX= 2-gtk3
Lines 32-59 LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \ Link Here
32	libsoup-2.4.so:devel/libsoup \	31	libsoup-2.4.so:devel/libsoup \
33	libgcrypt.so:security/libgcrypt \	32	libgcrypt.so:security/libgcrypt \
34	libtasn1.so:security/libtasn1 \	33	libtasn1.so:security/libtasn1 \
35	libwoff2dec.so:devel/woff2	34	libwoff2dec.so:devel/woff2 \
		35	libsysinfo.so:devel/libsysinfo
36		36
37	PORTSCOUT= limitw:1,even	37	PORTSCOUT= limitw:1,even
38		38
39	USES= bison cmake compiler:c++14-lang gettext gl gnome gperf \	39	USES= bison cmake compiler:c++14-lang gettext gl gnome gperf \
40	jpeg localbase:ldflags perl5 pkgconfig python:build \	40	jpeg localbase:ldflags perl5 pkgconfig python:build \
41	sqlite tar:xz xorg	41	sqlite tar:xz
42	USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt	42	USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
43	USE_GL= gl egl glesv2	43	USE_GL= egl glesv2
44	USE_LDCONFIG= yes	44	USE_LDCONFIG= yes
45	USE_PERL5= build	45	USE_PERL5= build
46	USE_RUBY= yes	46	USE_RUBY= yes
47	RUBY_NO_RUN_DEPENDS= yes	47	RUBY_NO_RUN_DEPENDS= yes
48	USE_XORG= x11 xcomposite xdamage xext xrender xt ice
49		48
50	BINARY_ALIAS= python=${PYTHON_CMD}	49	BINARY_ALIAS= python=${PYTHON_CMD}
51	CXXFLAGS+= -DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32	50	CXXFLAGS+= -DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
52	CXXFLAGS_powerpc= -DENABLE_YARR_JIT=0	51	CXXFLAGS_powerpc= -DENABLE_YARR_JIT=0
53	CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0	52	CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0
		53	LDFLAGS+= -lsysinfo
54	CMAKE_ARGS= -DPORT=GTK	54	CMAKE_ARGS= -DPORT=GTK
55	CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \	55	CMAKE_OFF= ENABLE_GAMEPAD \
56	ENABLE_GLES2 \	56	USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
57	USE_SYSTEMD	57	USE_SYSTEMD
58	CMAKE_ON= ENABLE_MINIBROWSER \	58	CMAKE_ON= ENABLE_MINIBROWSER \
59	USE_SYSTEM_MALLOC	59	USE_SYSTEM_MALLOC
Lines 66-73 INSTALL_TARGET= install Link Here
66		66
67	BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3	67	BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
68		68
69	OPTIONS_DEFINE= DEBUG GEOIP GSTREAMER WAYLAND	69	OPTIONS_DEFINE= DEBUG GEOIP GSTREAMER WAYLAND X11
70	OPTIONS_DEFAULT= GEOIP GSTREAMER WAYLAND	70	OPTIONS_DEFAULT= GEOIP GSTREAMER WAYLAND X11
71	OPTIONS_SUB= yes	71	OPTIONS_SUB= yes
72		72
73	# Building WebKit with debugging symbols requires ar and ld with	73	# Building WebKit with debugging symbols requires ar and ld with
Lines 96-104 WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ Link Here
96	libwpe-1.0.so:www/libwpe \	96	libwpe-1.0.so:www/libwpe \
97	libWPEBackend-fdo-1.0.so:www/wpebackend-fdo	97	libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
98		98
99	post-patch:	99	X11_CMAKE_BOOL= ENABLE_X11_TARGET
100	@${REINPLACE_CMD} -e 's\|/usr/lib/browser/plugins\|${BROWSER_PLUGINS_DIR}\|' \	100	X11_USES= xorg
101	${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp	101	X11_USE= XORG=x11,xcomposite,xdamage,xext,xrender,xt,ice
		102	X11_VARS= USE_GL+=gl
102		103
103	pre-configure:	104	pre-configure:
104	# .if !exists() evaluates too early before cairo has a chance to be installed	105	# .if !exists() evaluates too early before cairo has a chance to be installed

Removed Link Here

(-)a/www/webkit2-gtk3/files/patch-CMakeLists.txt (-14 lines)
1	--- CMakeLists.txt.orig 2020-08-12 09:17:37 UTC
2	+++ CMakeLists.txt
3	@@ -109,9 +109,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
4	endif ()
5	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86\|x86)")
6	set(WTF_CPU_X86 1)
7	-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
8	+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc\|powerpc)")
9	set(WTF_CPU_PPC 1)
10	-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
11	+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64\|powerpc64)")
12	set(WTF_CPU_PPC64 1)
13	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
14	set(WTF_CPU_PPC64LE 1)

Lines 1-33 Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp (-31 / +9 lines)
1	--- Source/WTF/wtf/RAMSize.cpp.orig 2020-08-12 09:17:54 UTC	1	--- Source/WTF/wtf/RAMSize.cpp.orig 2021-02-26 09:57:08 UTC
2	+++ Source/WTF/wtf/RAMSize.cpp	2	+++ Source/WTF/wtf/RAMSize.cpp
3	@@ -34,6 +34,10 @@	3	@@ -31,7 +31,7 @@
4	#if OS(LINUX)	4	#if OS(WINDOWS)
		5	#include <windows.h>
		6	#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
		7	-#if OS(LINUX)
		8	+#if OS(LINUX) \|\| OS(FREEBSD)
5	#include <sys/sysinfo.h>	9	#include <sys/sysinfo.h>
6	#endif // OS(LINUX)	10	#elif OS(UNIX)
7	+#if OS(FREEBSD)	11	#include <unistd.h>
8	+#include <sys/types.h>
9	+#include <sys/sysctl.h>
10	+#endif
11	#else
12	#include <bmalloc/bmalloc.h>
13	#endif
14	@@ -54,10 +58,18 @@ static size_t computeRAMSize()
15	return ramSizeGuess;
16	return status.ullTotalPhys;
17	#elif USE(SYSTEM_MALLOC)
18	-#if OS(LINUX) \|\| OS(FREEBSD)
19	+#if OS(LINUX)
20	struct sysinfo si;
21	sysinfo(&si);
22	return si.totalram * si.mem_unit;
23	+#elif OS(FREEBSD)
24	+ size_t physmem, len;
25	+ int mib[2] = { CTL_HW, HW_PHYSMEM };
26	+ if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0
27	+ && len == sizeof(physmem))
28	+ return physmem;
29	+ else
30	+ return 512 * MB; // guess
31	#else
32	#error "Missing a platform specific way of determining the available RAM"
33	#endif // OS(LINUX) \|\| OS(FREEBSD)

Added Link Here

(-)b/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake (+17 lines)
1	--- Source/cmake/WebKitCommon.cmake.orig 2021-02-26 09:57:17 UTC
2	+++ Source/cmake/WebKitCommon.cmake
3	@@ -102,11 +102,11 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
4	endif ()
5	elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86\|x86)")
6	set(WTF_CPU_X86 1)
7	- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
8	+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc\|powerpc)")
9	set(WTF_CPU_PPC 1)
10	- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
11	+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64\|powerpc64)")
12	set(WTF_CPU_PPC64 1)
13	- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
14	+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64le\|powerpc64le)")
15	set(WTF_CPU_PPC64LE 1)
16	else ()
17	set(WTF_CPU_UNKNOWN 1)

Lines 52-57 include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h Link Here

(-)b/www/webkit2-gtk3/pkg-plist (-4 / +3 lines)
52	include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h	52	include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
53	include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h	53	include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
54	include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h	54	include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
		55	include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
55	include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h	56	include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
56	include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h	57	include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
57	include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h	58	include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
Lines 219-235 lib/girepository-1.0/WebKit2-4.0.typelib Link Here
219	lib/girepository-1.0/WebKit2WebExtension-4.0.typelib	220	lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
220	lib/libjavascriptcoregtk-4.0.so	221	lib/libjavascriptcoregtk-4.0.so
221	lib/libjavascriptcoregtk-4.0.so.18	222	lib/libjavascriptcoregtk-4.0.so.18
222	lib/libjavascriptcoregtk-4.0.so.18.17.13	223	lib/libjavascriptcoregtk-4.0.so.18.18.5
223	lib/libwebkit2gtk-4.0.so	224	lib/libwebkit2gtk-4.0.so
224	lib/libwebkit2gtk-4.0.so.37	225	lib/libwebkit2gtk-4.0.so.37
225	lib/libwebkit2gtk-4.0.so.37.49.9	226	lib/libwebkit2gtk-4.0.so.37.53.2
226	lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so	227	lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
227	libdata/pkgconfig/javascriptcoregtk-4.0.pc	228	libdata/pkgconfig/javascriptcoregtk-4.0.pc
228	libdata/pkgconfig/webkit2gtk-4.0.pc	229	libdata/pkgconfig/webkit2gtk-4.0.pc
229	libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc	230	libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
230	libexec/webkit2gtk-4.0/MiniBrowser	231	libexec/webkit2gtk-4.0/MiniBrowser
231	libexec/webkit2gtk-4.0/WebKitNetworkProcess	232	libexec/webkit2gtk-4.0/WebKitNetworkProcess
232	libexec/webkit2gtk-4.0/WebKitPluginProcess
233	libexec/webkit2gtk-4.0/WebKitWebProcess	233	libexec/webkit2gtk-4.0/WebKitWebProcess
234	libexec/webkit2gtk-4.0/jsc	234	libexec/webkit2gtk-4.0/jsc
235	share/gir-1.0/JavaScriptCore-4.0.gir	235	share/gir-1.0/JavaScriptCore-4.0.gir
236	-