[Midnightbsd-cvs] mports [24686] trunk/www/webkit2-gtk3: Update webkit2 gtk3 to 2..20.5

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Nov 22 16:43:26 EST 2018 

Revision: 24686
          http://svnweb.midnightbsd.org/mports/?rev=24686
Author:   laffer1
Date:     2018-11-22 16:43:25 -0500 (Thu, 22 Nov 2018)
Log Message:
-----------
Update webkit2 gtk3 to 2..20.5

Modified Paths:
--------------
    trunk/www/webkit2-gtk3/Makefile
    trunk/www/webkit2-gtk3/distinfo
    trunk/www/webkit2-gtk3/files/patch-CMakeLists.txt
    trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
    trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h
    trunk/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
    trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
    trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp
    trunk/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h
    trunk/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
    trunk/www/webkit2-gtk3/pkg-plist

Removed Paths:
-------------
    trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_PlatformGTK.cmake
    trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
    trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp
    trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake
    trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp

Modified: trunk/www/webkit2-gtk3/Makefile
===================================================================
--- trunk/www/webkit2-gtk3/Makefile	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/Makefile	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.16.6
-PORTREVISION=	3
+PORTVERSION=	2.20.5
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
@@ -14,7 +13,8 @@
 LICENSE=	gpl2 bsd2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libenchant.so:textproc/enchant \
+LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
+		libfribidi.so:converters/fribidi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libwebp.so:graphics/webp \
@@ -27,51 +27,58 @@
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libsoup-2.4.so:devel/libsoup \
 		libgcrypt.so:security/libgcrypt \
-		libgnutls.so:security/gnutls
+		libtasn1.so:security/libtasn1 \
+		libwoff2dec.so:devel/woff2
 
 PORTSCOUT=	limitw:1,even
 
+USES=		bison cmake:outsource compiler:c++14-lang gettext gnome gperf \
+		jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \
+		sqlite tar:xz
+USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
+USE_GL=		gl egl glesv2
 USE_GSTREAMER1=	bad gl
+USE_LDCONFIG=	yes
+USE_PERL5=	build
+USE_RUBY=	yes
+RUBY_NO_RUN_DEPENDS=	yes
 USE_XORG=	x11 xcomposite xdamage xext xrender xt ice
-USES=		bison cmake compiler:c++14-lang gettext gnome gperf \
-		jpeg perl5 pkgconfig python:2.7,build sqlite tar:xz
-USE_RUBY=	yes
-RUBY_NO_RUN_DEPENDS=yes
-USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
-USE_GL=		gl egl
-USE_PERL5=	build
-USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install
 
-CMAKE_ARGS+=	-DPORT=GTK \
-		-DENABLE_WAYLAND_TARGET:BOOL=OFF \
-		-DENABLE_MINIBROWSER:BOOL=ON \
-		-DENABLE_GLES2:BOOL=OFF \
-		-DENABLE_ACCELERATED_2D_CANVAS=ON \
-		-DUSE_LD_GOLD:BOOL=OFF \
-		-DENABLE_WEBKIT:BOOL=OFF
-CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
+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 \
+			-mminimal-toc
+CMAKE_ARGS=		-DPORT=GTK
+CMAKE_OFF=		USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U}
+CMAKE_ON=		ENABLE_GLES2 ENABLE_MINIBROWSER
+CMAKE_OFF_armv6=	ENABLE_JIT
+CMAKE_OFF_armv7=	ENABLE_JIT
+CMAKE_OFF_powerpc=	ENABLE_JIT
+CMAKE_OFF_powerpc64=	ENABLE_JIT
+CONFIGURE_ENV=		XDG_CACHE_HOME=${WRKDIR}
+INSTALL_TARGET=		install
 
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
-#_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
 
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DEBUG GEOIP NPAPI
-OPTIONS_DEFAULT=GEOIP
+OPTIONS_DEFINE=		DEBUG GEOIP NPAPI WAYLAND
+OPTIONS_DEFAULT=	GEOIP
 OPTIONS_DEFAULT_i386=	NPAPI
 OPTIONS_DEFAULT_amd64=	NPAPI
+OPTIONS_SUB=		yes
 
+NPAPI_DESC=		Support gtk2 (NPAPI) based plugins (like flash)
+
+# Building WebKit with debugging symbols requires ar and ld with
+# support for thin archives.  Also see
+# https://bugs.webkit.org/show_bug.cgi?id=140384
 DEBUG_BUILD_DEPENDS=	binutils>=0:devel/binutils
-DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug \
-			-DCMAKE_AR=${LOCALBASE}/bin/ar \
+DEBUG_CMAKE_ON=		-DCMAKE_AR=${LOCALBASE}/bin/ar \
 			-DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \
 			-DCMAKE_LINKER=${LOCALBASE}/bin/ld
 DEBUG_CXXFLAGS=		-B${LOCALBASE}/bin
 
-DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE:STRING=Release \
-			-DCMAKE_AR=/usr/bin/ar \
+DEBUG_CMAKE_OFF=	-DCMAKE_AR=/usr/bin/ar \
 			-DCMAKE_RANLIB=/usr/bin/ranlib \
 			-DCMAKE_LINKER=/usr/bin/ld
 DEBUG_CXXFLAGS_OFF=	-B/usr/bin
@@ -78,31 +85,18 @@
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 
 GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
-GEOIP_BUILD_DEPENDS+=	geoclue>=2.4.3:net/geoclue
-GEOIP_RUN_DEPENDS+=	geoclue>=2.4.3:net/geoclue
+GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
+GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 
-NPAPI_DESC=	Support gtk2 (NPAPI) based plugins (like flash)
 NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
-NPAPI_USE=	GNOME=gtk20
+NPAPI_USE=		GNOME=gtk20
 
-.include <bsd.mport.options.mk>
+WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
+WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 
-.if ${ARCH} == armv6
-CMAKE_ARGS+=	-DENABLE_JIT:BOOL=OFF
-.endif
-
-.if ${ARCH} == powerpc || ${ARCH} == powerpc64
-CMAKE_ARGS+=	-DENABLE_JIT:BOOL=OFF
-CFLAGS+=	-DENABLE_YARR_JIT=0
-.endif
-
-.if ${ARCH} == powerpc64
-CFLAGS+=	-mminimal-toc
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
-		${WRKSRC}/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
+	@${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \
+		${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
 
 pre-configure:
 # .if !exists() evaluates too early before cairo has a chance to be installed
@@ -112,10 +106,15 @@
 	fi
 
 post-install:
-	@${LN} -sf ../libexec/webkit2gtk-4.0/jsc ${STAGEDIR}${PREFIX}/bin/jsc-4
-	@${LN} -sf ../libexec/webkit2gtk-4.0/MiniBrowser ${STAGEDIR}${PREFIX}/bin/MiniBrowser-4
+	${MKDIR} ${PREFIX}/libdata/pkgconfig
+	${CP} ${PREFIX}/lib/pkgconfig/*.pc ${PREFIX}/libdata/pkgconfig/
+	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/jsc \
+		${STAGEDIR}${PREFIX}/bin/jsc-4
+	@${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/MiniBrowser \
+		${STAGEDIR}${PREFIX}/bin/MiniBrowser-4
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver
 
 .include <bsd.port.mk>

Modified: trunk/www/webkit2-gtk3/distinfo
===================================================================
--- trunk/www/webkit2-gtk3/distinfo	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/distinfo	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500907942
-SHA256 (webkitgtk-2.16.6.tar.xz) = fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21
-SIZE (webkitgtk-2.16.6.tar.xz) = 14658120
+TIMESTAMP = 1534713029
+SHA256 (webkitgtk-2.20.5.tar.xz) = 15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990
+SIZE (webkitgtk-2.20.5.tar.xz) = 16625200

Modified: trunk/www/webkit2-gtk3/files/patch-CMakeLists.txt
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-CMakeLists.txt	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-CMakeLists.txt	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-05-06 21:35:44.417942000 +0200
-+++ CMakeLists.txt	2017-05-06 21:36:47.317895000 +0200
-@@ -60,9 +60,9 @@
+--- CMakeLists.txt.orig	2018-02-19 07:44:43 UTC
++++ CMakeLists.txt
+@@ -93,9 +93,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
      set(WTF_CPU_X86_64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)

Deleted: trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_PlatformGTK.cmake
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_PlatformGTK.cmake	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_PlatformGTK.cmake	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,11 +0,0 @@
---- Source/JavaScriptCore/PlatformGTK.cmake.orig	2014-12-25 20:19:12.049673483 +0100
-+++ Source/JavaScriptCore/PlatformGTK.cmake	2014-12-25 20:20:42.328667491 +0100
-@@ -10,7 +10,7 @@
- ADD_TYPELIB(${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib)
- 
- install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc"
--        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
-+        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"
- )
- 
- install(FILES API/JavaScript.h

Modified: trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,6 +1,6 @@
---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2015-08-06 08:21:27 UTC
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2018-03-05 09:28:05 UTC
 +++ Source/JavaScriptCore/assembler/ARM64Assembler.h
-@@ -2862,6 +2862,8 @@ public:
+@@ -2856,6 +2856,8 @@ class ARM64Assembler { (public)
      {
  #if OS(IOS)
          sys_cache_control(kCacheFunctionPrepareForExecution, code, size);

Deleted: trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.1 2013/04/13 09:11:02 landry Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=61137
-
---- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	2016-02-04 11:16:16 UTC
-+++ Source/JavaScriptCore/jit/ExecutableAllocator.h
-@@ -78,7 +78,7 @@ class DemandExecutableAllocator;
- static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
- #elif CPU(ARM64)
- static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
--#elif CPU(X86_64)
-+#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
- #else
- static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;

Deleted: trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_NumberOfCores.cpp	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,10 +0,0 @@
---- Source/WTF/wtf/NumberOfCores.cpp.orig	2017-04-11 20:08:02.949675000 +0200
-+++ Source/WTF/wtf/NumberOfCores.cpp	2017-04-11 20:08:43.723709000 +0200
-@@ -33,6 +33,7 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #elif OS(LINUX) || OS(AIX) || OS(SOLARIS) || OS(OPENBSD) || OS(NETBSD) || OS(FREEBSD)
-+#include <stdio.h> // sscanf()
- #include <unistd.h>
- #elif OS(WINDOWS)
- #include <windows.h>

Modified: trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,6 +1,6 @@
---- Source/WTF/wtf/Platform.h.orig	2016-07-20 UTC
+--- Source/WTF/wtf/Platform.h.orig	2018-02-20 09:12:50 UTC
 +++ Source/WTF/wtf/Platform.h
-@@ -218,6 +218,7 @@
+@@ -182,6 +182,7 @@
  #elif defined(__ARM_ARCH_6__) \
      || defined(__ARM_ARCH_6J__) \
      || defined(__ARM_ARCH_6K__) \
@@ -8,7 +8,7 @@
      || defined(__ARM_ARCH_6Z__) \
      || defined(__ARM_ARCH_6ZK__) \
      || defined(__ARM_ARCH_6T2__) \
-@@ -264,6 +265,7 @@
+@@ -229,6 +230,7 @@
  
  #elif defined(__ARM_ARCH_6J__) \
      || defined(__ARM_ARCH_6K__) \

Modified: trunk/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,10 +1,9 @@
---- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig	2017-04-17 15:36:57.688080000 +0200
-+++ Source/WebCore/PAL/pal/PlatformGTK.cmake	2017-04-17 15:39:47.928689000 +0200
-@@ -1,3 +1,11 @@
- list(APPEND PAL_SOURCES
-     crypto/gcrypt/CryptoDigestGCrypt.cpp
+--- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig	2018-02-19 07:45:31 UTC
++++ Source/WebCore/PAL/pal/PlatformGTK.cmake
+@@ -12,6 +12,13 @@ list(APPEND PAL_SOURCES
+     unix/LoggingUnix.cpp
  )
-+
+ 
 +list(APPEND PAL_INCLUDE_DIRECTORIES
 +    ${LIBGCRYPT_INCLUDE_DIRS}
 +)
@@ -12,3 +11,6 @@
 +    ${LIBGCRYPT_LIBRARIES}
 +)
 +
+ if (ENABLE_SUBTLE_CRYPTO)
+     list(APPEND PAL_SOURCES
+         crypto/tasn1/Utilities.cpp

Modified: trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,4 +1,4 @@
---- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2016-04-10 06:48:37 UTC
+--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig	2018-02-19 07:45:32 UTC
 +++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp
 @@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL
      "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL

Modified: trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_egl_GLContextEGL.cpp	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,8 +1,8 @@
---- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig	2015-07-10 13:10:10.413595000 +0200
-+++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp	2015-07-10 13:10:48.159246000 +0200
-@@ -42,6 +42,8 @@
+--- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp.orig	2018-02-19 07:45:32 UTC
++++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
+@@ -44,6 +44,8 @@
+ #include "OpenGLShims.h"
  #endif
- #endif
  
 +#include <X11/Xlib.h>
 +

Deleted: trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,11 +0,0 @@
---- Source/WebKit2/PlatformGTK.cmake.orig	2014-12-25 20:23:07.749658406 +0100
-+++ Source/WebKit2/PlatformGTK.cmake	2014-12-25 20:23:43.409739634 +0100
-@@ -837,7 +837,7 @@
- )
- install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
-               "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
--        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
-+        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"
- )
- install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
-               ${WebKit2WebExtension_INSTALLED_HEADERS}

Deleted: trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,10 +0,0 @@
---- Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.orig	2016-01-28 08:55:09 UTC
-+++ Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
-@@ -50,6 +50,7 @@ Vector<String> pluginsDirectories()
- 
-     result.append(homeDirectoryPath() + "/.mozilla/plugins");
-     result.append(homeDirectoryPath() + "/.netscape/plugins");
-+    result.append("%%BROWSER_PLUGINS_DIR%%");
-     result.append("/usr/lib/browser/plugins");
-     result.append("/usr/local/lib/mozilla/plugins");
-     result.append("/usr/lib/firefox/plugins");

Modified: trunk/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,6 +1,6 @@
---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2014-12-02 14:49:22.000000000 +0100
-+++ Source/JavaScriptCore/assembler/ARMAssembler.h	2014-12-26 10:35:15.394821543 +0100
-@@ -1104,6 +1104,8 @@
+--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2018-02-19 07:45:14 UTC
++++ Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -1202,6 +1202,8 @@ namespace JSC {
                  linuxPageFlush(current, current + page);
  
              linuxPageFlush(current, end);

Modified: trunk/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
===================================================================
--- trunk/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,6 +1,6 @@
---- Source/bmalloc/bmalloc/BPlatform.h.orig	2017-05-24 07:01:14 UTC
+--- Source/bmalloc/bmalloc/BPlatform.h.orig	2018-02-19 08:53:21 UTC
 +++ Source/bmalloc/bmalloc/BPlatform.h
-@@ -108,6 +108,7 @@
+@@ -139,6 +139,7 @@
  #elif defined(__ARM_ARCH_6__) \
  || defined(__ARM_ARCH_6J__) \
  || defined(__ARM_ARCH_6K__) \

Modified: trunk/www/webkit2-gtk3/pkg-plist
===================================================================
--- trunk/www/webkit2-gtk3/pkg-plist	2018-11-22 21:20:58 UTC (rev 24685)
+++ trunk/www/webkit2-gtk3/pkg-plist	2018-11-22 21:43:25 UTC (rev 24686)
@@ -1,4 +1,5 @@
 bin/MiniBrowser-4
+bin/WebKitWebDriver
 bin/jsc-4
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -8,8 +9,10 @@
 include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
+include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
+include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
 include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
 include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
@@ -41,6 +44,8 @@
 include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
 include/webkitgtk-4.0/webkit2/WebKitNotification.h
 include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
+include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
+include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
 include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitPlugin.h
 include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
@@ -66,6 +71,7 @@
 include/webkitgtk-4.0/webkit2/WebKitWebHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitWebInspector.h
 include/webkitgtk-4.0/webkit2/WebKitWebPage.h
+include/webkitgtk-4.0/webkit2/WebKitWebProcessEnumTypes.h
 include/webkitgtk-4.0/webkit2/WebKitWebResource.h
 include/webkitgtk-4.0/webkit2/WebKitWebView.h
 include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
@@ -84,6 +90,8 @@
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
+include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
+include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
 include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
@@ -191,19 +199,19 @@
 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.5.13
+lib/libjavascriptcoregtk-4.0.so.18.7.13
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.19.9
+lib/libwebkit2gtk-4.0.so.37.28.5
 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/WebKitDatabaseProcess
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess
 %%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
+libexec/webkit2gtk-4.0/WebKitStorageProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 share/gir-1.0/JavaScriptCore-4.0.gir

More information about the Midnightbsd-cvs mailing list