Attachment 188095 Details for Bug 223733 – webkit2-gtk3.patch

[patch] webkit2-gtk3.patch

webkit2-gtk3.patch (text/plain), 12.46 KB, created by Val Packett on 2017-11-18 14:43:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2017-11-18 14:43:53 UTC

Size: 12.46 KB

patch

obsolete

>diff --git c/www/webkit2-gtk3/Makefile i/www/webkit2-gtk3/Makefile
>index b13ffbd775b8..0d8919f8c167 100644
>--- c/www/webkit2-gtk3/Makefile
>+++ i/www/webkit2-gtk3/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	webkit
>-PORTVERSION=	2.16.6
>+PORTVERSION=	2.18.3
> PORTREVISION=	3
> CATEGORIES=	www
> MASTER_SITES=	http://webkitgtk.org/releases/
>@@ -28,7 +28,8 @@ LIB_DEPENDS=	libenchant.so:textproc/enchant \
> 		libharfbuzz-icu.so:print/harfbuzz-icu \
> 		libsoup-2.4.so:devel/libsoup \
> 		libgcrypt.so:security/libgcrypt \
>-		libgnutls.so:security/gnutls
>+		libgnutls.so:security/gnutls \
>+		libtasn1.so:security/libtasn1
> 
> PORTSCOUT=	limitw:1,even
> 
>@@ -39,28 +40,25 @@ USES=		bison cmake compiler:c++14-lang gettext gnome gperf \
> USE_RUBY=	yes
> RUBY_NO_RUN_DEPENDS=yes
> USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
>-USE_GL=		gl egl
>+USE_GL=		gl egl glesv2
> USE_PERL5=	build
> USE_LDCONFIG=	yes
>+CFLAGS+=	-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
> 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
>+		-DENABLE_GLES2:BOOL=ON \
>+		-DUSE_LD_GOLD:BOOL=OFF
> CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
> 
> 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 WAYLAND
> OPTIONS_DEFAULT_i386=	NPAPI
> OPTIONS_DEFAULT_amd64=	NPAPI
> 
>@@ -86,6 +84,12 @@ NPAPI_DESC=	Support gtk2 (NPAPI) based plugins (like flash)
> NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
> NPAPI_USE=	GNOME=gtk20
> 
>+WAYLAND_DESC=	Support Wayland render backend
>+WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
>+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
>+	libwayland-server.so:graphics/wayland \
>+	libwayland-egl.so:graphics/mesa-libs
>+
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == armv6
>@@ -103,7 +107,7 @@ CFLAGS+=	-mminimal-toc
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
>-		${WRKSRC}/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
>+		${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
> 
> pre-configure:
> # .if !exists() evaluates too early before cairo has a chance to be installed
>@@ -114,9 +118,9 @@ pre-configure:
> 
> 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
> 	@${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>
>diff --git c/www/webkit2-gtk3/distinfo i/www/webkit2-gtk3/distinfo
>index f53e48cfdaf3..c6267fe04855 100644
>--- c/www/webkit2-gtk3/distinfo
>+++ i/www/webkit2-gtk3/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1500907942
>-SHA256 (webkitgtk-2.16.6.tar.xz) = fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21
>-SIZE (webkitgtk-2.16.6.tar.xz) = 14658120
>+TIMESTAMP = 1511005431
>+SHA256 (webkitgtk-2.18.3.tar.xz) = e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e
>+SIZE (webkitgtk-2.18.3.tar.xz) = 14824668
>diff --git c/www/webkit2-gtk3/files/patch-CMakeLists.txt i/www/webkit2-gtk3/files/patch-CMakeLists.txt
>index 52a36fb945d5..cf26490f8ce6 100644
>--- c/www/webkit2-gtk3/files/patch-CMakeLists.txt
>+++ i/www/webkit2-gtk3/files/patch-CMakeLists.txt
>@@ -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 @@
>+@@ -90,9 +90,9 @@
>      set(WTF_CPU_X86_64 1)
>  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
>      set(WTF_CPU_X86 1)
>diff --git c/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h i/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
>deleted file mode 100644
>index 66212a8fb59e..000000000000
>--- c/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
>+++ /dev/null
>@@ -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;
>diff --git c/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake i/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
>index f6e2c3f0b715..6e9a21c4262d 100644
>--- c/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
>+++ i/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
>@@ -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       2017-08-09 12:13:51.000000000 +0300
>++++ Source/WebCore/PAL/pal/PlatformGTK.cmake    2017-11-18 15:17:56.116864000 +0300
>+@@ -6,6 +6,13 @@
>+     text/KillRingNone.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
>diff --git c/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake i/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
>new file mode 100644
>index 000000000000..ad8d0a15c5cc
>--- /dev/null
>+++ i/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake
>@@ -0,0 +1,10 @@
>+--- Source/WebDriver/PlatformGTK.cmake.orig	2017-11-18 15:44:03.270855000 +0300
>++++ Source/WebDriver/PlatformGTK.cmake	2017-11-18 15:44:08.480011000 +0300
>+@@ -5,6 +5,7 @@
>+ list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES
>+     "${GLIB_INCLUDE_DIRS}"
>+     "${LIBSOUP_INCLUDE_DIRS}"
>++    "${ICU_INCLUDE_DIRS}"
>+ )
>+ 
>+ list(APPEND WebDriver_SOURCES
>diff --git c/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake i/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake
>deleted file mode 100644
>index ff03ce96cad8..000000000000
>--- c/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake
>+++ /dev/null
>@@ -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}
>diff --git c/www/webkit2-gtk3/files/patch-Source_WebKit_PlatformGTK.cmake i/www/webkit2-gtk3/files/patch-Source_WebKit_PlatformGTK.cmake
>new file mode 100644
>index 000000000000..d7c66d8d728e
>--- /dev/null
>+++ i/www/webkit2-gtk3/files/patch-Source_WebKit_PlatformGTK.cmake
>@@ -0,0 +1,11 @@
>+--- Source/WebKit/PlatformGTK.cmake.orig        2017-10-16 13:49:22.000000000 +0300
>++++ Source/WebKit/PlatformGTK.cmake     2017-11-18 14:56:55.286903000 +0300
>+@@ -1243,7 +1243,7 @@
>+ )
>+ install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
>+               "${CMAKE_BINARY_DIR}/Source/WebKit/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}
>diff --git c/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp i/www/webkit2-gtk3/files/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath.cpp
>similarity index 71%
>rename from www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp
>rename to www/webkit2-gtk3/files/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath.cpp
>index 6868c3d57b00..fc36e61ebdae 100644
>--- c/www/webkit2-gtk3/files/patch-Source_WebKit2_Shared_Plugins_unix_PluginSearchPath.cpp
>+++ i/www/webkit2-gtk3/files/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath.cpp
>@@ -1,5 +1,5 @@
>---- Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.orig	2016-01-28 08:55:09 UTC
>-+++ Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
>+--- Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp.orig	2016-01-28 08:55:09 UTC
>++++ Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
> @@ -50,6 +50,7 @@ Vector<String> pluginsDirectories()
>  
>      result.append(homeDirectoryPath() + "/.mozilla/plugins");
>diff --git c/www/webkit2-gtk3/pkg-plist i/www/webkit2-gtk3/pkg-plist
>index 7d9beba07537..ca060ba759a1 100644
>--- c/www/webkit2-gtk3/pkg-plist
>+++ i/www/webkit2-gtk3/pkg-plist
>@@ -1,4 +1,4 @@
>-bin/MiniBrowser-4
>+bin/WebKitWebDriver
> bin/jsc-4
> include/webkitgtk-4.0/JavaScriptCore/JSBase.h
> include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
>@@ -8,8 +8,10 @@ include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
> 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 +43,8 @@ include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
> 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
>@@ -84,6 +88,8 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDeclaration.h
> 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 +197,18 @@ lib/girepository-1.0/WebKit2-4.0.typelib
> 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.6.12
> 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.24.6
> 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

Actions: View | Diff

Attachments on bug 223733: 188095