View | Details | Raw Unified | Return to bug 223733
Collapse All | Expand All

(-)i/www/webkit2-gtk3/Makefile (-13 / +17 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	webkit
4
PORTNAME=	webkit
5
PORTVERSION=	2.16.6
5
PORTVERSION=	2.18.3
6
PORTREVISION=	3
6
PORTREVISION=	3
7
CATEGORIES=	www
7
CATEGORIES=	www
8
MASTER_SITES=	http://webkitgtk.org/releases/
8
MASTER_SITES=	http://webkitgtk.org/releases/
Lines 28-34 LIB_DEPENDS= libenchant.so:textproc/enchant \ Link Here
28
		libharfbuzz-icu.so:print/harfbuzz-icu \
28
		libharfbuzz-icu.so:print/harfbuzz-icu \
29
		libsoup-2.4.so:devel/libsoup \
29
		libsoup-2.4.so:devel/libsoup \
30
		libgcrypt.so:security/libgcrypt \
30
		libgcrypt.so:security/libgcrypt \
31
		libgnutls.so:security/gnutls
31
		libgnutls.so:security/gnutls \
32
		libtasn1.so:security/libtasn1
32
33
33
PORTSCOUT=	limitw:1,even
34
PORTSCOUT=	limitw:1,even
34
35
Lines 39-66 USES= bison cmake compiler:c++14-lang gettext gnome gperf \ Link Here
39
USE_RUBY=	yes
40
USE_RUBY=	yes
40
RUBY_NO_RUN_DEPENDS=yes
41
RUBY_NO_RUN_DEPENDS=yes
41
USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
42
USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
42
USE_GL=		gl egl
43
USE_GL=		gl egl glesv2
43
USE_PERL5=	build
44
USE_PERL5=	build
44
USE_LDCONFIG=	yes
45
USE_LDCONFIG=	yes
46
CFLAGS+=	-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32
45
CPPFLAGS+=	-I${LOCALBASE}/include
47
CPPFLAGS+=	-I${LOCALBASE}/include
46
LDFLAGS+=	-L${LOCALBASE}/lib
48
LDFLAGS+=	-L${LOCALBASE}/lib
47
INSTALL_TARGET=	install
49
INSTALL_TARGET=	install
48
50
49
CMAKE_ARGS+=	-DPORT=GTK \
51
CMAKE_ARGS+=	-DPORT=GTK \
50
		-DENABLE_WAYLAND_TARGET:BOOL=OFF \
52
		-DENABLE_GLES2:BOOL=ON \
51
		-DENABLE_MINIBROWSER:BOOL=ON \
53
		-DUSE_LD_GOLD:BOOL=OFF
52
		-DENABLE_GLES2:BOOL=OFF \
53
		-DENABLE_ACCELERATED_2D_CANVAS=ON \
54
		-DUSE_LD_GOLD:BOOL=OFF \
55
		-DENABLE_WEBKIT:BOOL=OFF
56
CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
54
CONFIGURE_ENV+=	XDG_CACHE_HOME=${WRKDIR}
57
55
58
BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
56
BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
59
#_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
57
#_BROWSER_PLUGINS_DIR=	${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
60
58
61
OPTIONS_SUB=	yes
59
OPTIONS_SUB=	yes
62
OPTIONS_DEFINE=	DEBUG GEOIP NPAPI
60
OPTIONS_DEFINE=	DEBUG GEOIP NPAPI WAYLAND
63
OPTIONS_DEFAULT=GEOIP
61
OPTIONS_DEFAULT=GEOIP WAYLAND
64
OPTIONS_DEFAULT_i386=	NPAPI
62
OPTIONS_DEFAULT_i386=	NPAPI
65
OPTIONS_DEFAULT_amd64=	NPAPI
63
OPTIONS_DEFAULT_amd64=	NPAPI
66
64
Lines 86-91 NPAPI_DESC= Support gtk2 (NPAPI) based plugins (like flash) Link Here
86
NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
84
NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
87
NPAPI_USE=	GNOME=gtk20
85
NPAPI_USE=	GNOME=gtk20
88
86
87
WAYLAND_DESC=	Support Wayland render backend
88
WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
89
WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
90
	libwayland-server.so:graphics/wayland \
91
	libwayland-egl.so:graphics/mesa-libs
92
89
.include <bsd.port.options.mk>
93
.include <bsd.port.options.mk>
90
94
91
.if ${ARCH} == armv6
95
.if ${ARCH} == armv6
Lines 103-109 CFLAGS+= -mminimal-toc Link Here
103
107
104
post-patch:
108
post-patch:
105
	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
109
	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
106
		${WRKSRC}/Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
110
		${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
107
111
108
pre-configure:
112
pre-configure:
109
# .if !exists() evaluates too early before cairo has a chance to be installed
113
# .if !exists() evaluates too early before cairo has a chance to be installed
Lines 114-122 pre-configure: Link Here
114
118
115
post-install:
119
post-install:
116
	@${LN} -sf ../libexec/webkit2gtk-4.0/jsc ${STAGEDIR}${PREFIX}/bin/jsc-4
120
	@${LN} -sf ../libexec/webkit2gtk-4.0/jsc ${STAGEDIR}${PREFIX}/bin/jsc-4
117
	@${LN} -sf ../libexec/webkit2gtk-4.0/MiniBrowser ${STAGEDIR}${PREFIX}/bin/MiniBrowser-4
118
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
121
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.*
119
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so
122
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so
120
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/*
123
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/*
124
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver
121
125
122
.include <bsd.port.mk>
126
.include <bsd.port.mk>
(-)i/www/webkit2-gtk3/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1500907942
1
TIMESTAMP = 1511005431
2
SHA256 (webkitgtk-2.16.6.tar.xz) = fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21
2
SHA256 (webkitgtk-2.18.3.tar.xz) = e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e
3
SIZE (webkitgtk-2.16.6.tar.xz) = 14658120
3
SIZE (webkitgtk-2.18.3.tar.xz) = 14824668
(-)i/www/webkit2-gtk3/files/patch-CMakeLists.txt (-1 / +1 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2017-05-06 21:35:44.417942000 +0200
1
--- CMakeLists.txt.orig	2017-05-06 21:35:44.417942000 +0200
2
+++ CMakeLists.txt	2017-05-06 21:36:47.317895000 +0200
2
+++ CMakeLists.txt	2017-05-06 21:36:47.317895000 +0200
3
@@ -60,9 +60,9 @@
3
@@ -90,9 +90,9 @@
4
     set(WTF_CPU_X86_64 1)
4
     set(WTF_CPU_X86_64 1)
5
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
5
 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
6
     set(WTF_CPU_X86 1)
6
     set(WTF_CPU_X86 1)
(-)c/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h (-15 lines)
Removed Link Here
1
$OpenBSD: patch-Source_JavaScriptCore_jit_ExecutableAllocator_h,v 1.1 2013/04/13 09:11:02 landry Exp $
2
3
https://bugs.webkit.org/show_bug.cgi?id=61137
4
5
--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	2016-02-04 11:16:16 UTC
6
+++ Source/JavaScriptCore/jit/ExecutableAllocator.h
7
@@ -78,7 +78,7 @@ class DemandExecutableAllocator;
8
 static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
9
 #elif CPU(ARM64)
10
 static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
11
-#elif CPU(X86_64)
12
+#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
13
 static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
14
 #else
15
 static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
(-)i/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake (-6 / +8 lines)
Lines 1-10 Link Here
1
--- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig	2017-04-17 15:36:57.688080000 +0200
1
--- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig       2017-08-09 12:13:51.000000000 +0300
2
+++ Source/WebCore/PAL/pal/PlatformGTK.cmake	2017-04-17 15:39:47.928689000 +0200
2
+++ Source/WebCore/PAL/pal/PlatformGTK.cmake    2017-11-18 15:17:56.116864000 +0300
3
@@ -1,3 +1,11 @@
3
@@ -6,6 +6,13 @@
4
 list(APPEND PAL_SOURCES
4
     text/KillRingNone.cpp
5
     crypto/gcrypt/CryptoDigestGCrypt.cpp
6
 )
5
 )
7
+
6
8
+list(APPEND PAL_INCLUDE_DIRECTORIES
7
+list(APPEND PAL_INCLUDE_DIRECTORIES
9
+    ${LIBGCRYPT_INCLUDE_DIRS}
8
+    ${LIBGCRYPT_INCLUDE_DIRS}
10
+)
9
+)
Lines 12-14 Link Here
12
+    ${LIBGCRYPT_LIBRARIES}
11
+    ${LIBGCRYPT_LIBRARIES}
13
+)
12
+)
14
+
13
+
14
 if (ENABLE_SUBTLE_CRYPTO)
15
     list(APPEND PAL_SOURCES
16
         crypto/tasn1/Utilities.cpp
(-)i/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake (+10 lines)
Added Link Here
1
--- Source/WebDriver/PlatformGTK.cmake.orig	2017-11-18 15:44:03.270855000 +0300
2
+++ Source/WebDriver/PlatformGTK.cmake	2017-11-18 15:44:08.480011000 +0300
3
@@ -5,6 +5,7 @@
4
 list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES
5
     "${GLIB_INCLUDE_DIRS}"
6
     "${LIBSOUP_INCLUDE_DIRS}"
7
+    "${ICU_INCLUDE_DIRS}"
8
 )
9
 
10
 list(APPEND WebDriver_SOURCES
(-)c/www/webkit2-gtk3/files/patch-Source_WebKit2_PlatformGTK.cmake (-11 lines)
Removed Link Here
1
--- Source/WebKit2/PlatformGTK.cmake.orig	2014-12-25 20:23:07.749658406 +0100
2
+++ Source/WebKit2/PlatformGTK.cmake	2014-12-25 20:23:43.409739634 +0100
3
@@ -837,7 +837,7 @@
4
 )
5
 install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
6
               "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
7
-        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
8
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"
9
 )
10
 install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
11
               ${WebKit2WebExtension_INSTALLED_HEADERS}
(-)i/www/webkit2-gtk3/files/patch-Source_WebKit_PlatformGTK.cmake (+11 lines)
Added Link Here
1
--- Source/WebKit/PlatformGTK.cmake.orig        2017-10-16 13:49:22.000000000 +0300
2
+++ Source/WebKit/PlatformGTK.cmake     2017-11-18 14:56:55.286903000 +0300
3
@@ -1243,7 +1243,7 @@
4
 )
5
 install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc"
6
               "${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc"
7
-        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
8
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"
9
 )
10
 install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
11
               ${WebKit2WebExtension_INSTALLED_HEADERS}
(-)i/www/webkit2-gtk3/files/patch-Source_WebKit_Shared_Plugins_unix_PluginSearchPath.cpp (-2 / +2 lines)
Lines 1-5 Link Here
1
--- Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp.orig	2016-01-28 08:55:09 UTC
1
--- Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp.orig	2016-01-28 08:55:09 UTC
2
+++ Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp
2
+++ Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp
3
@@ -50,6 +50,7 @@ Vector<String> pluginsDirectories()
3
@@ -50,6 +50,7 @@ Vector<String> pluginsDirectories()
4
 
4
 
5
     result.append(homeDirectoryPath() + "/.mozilla/plugins");
5
     result.append(homeDirectoryPath() + "/.mozilla/plugins");
(-)i/www/webkit2-gtk3/pkg-plist (-5 / +10 lines)
Lines 1-4 Link Here
1
bin/MiniBrowser-4
1
bin/WebKitWebDriver
2
bin/jsc-4
2
bin/jsc-4
3
include/webkitgtk-4.0/JavaScriptCore/JSBase.h
3
include/webkitgtk-4.0/JavaScriptCore/JSBase.h
4
include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
4
include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
Lines 8-15 include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h Link Here
8
include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
8
include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
9
include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
9
include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
10
include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
10
include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
11
include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
11
include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
12
include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
12
include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
13
include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
14
include/webkitgtk-4.0/webkit2/WebKitAutomationSession.h
13
include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
15
include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
14
include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
16
include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
15
include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
17
include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
Lines 41-46 include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h Link Here
41
include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
43
include/webkitgtk-4.0/webkit2/WebKitNetworkProxySettings.h
42
include/webkitgtk-4.0/webkit2/WebKitNotification.h
44
include/webkitgtk-4.0/webkit2/WebKitNotification.h
43
include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
45
include/webkitgtk-4.0/webkit2/WebKitNotificationPermissionRequest.h
46
include/webkitgtk-4.0/webkit2/WebKitOptionMenu.h
47
include/webkitgtk-4.0/webkit2/WebKitOptionMenuItem.h
44
include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
48
include/webkitgtk-4.0/webkit2/WebKitPermissionRequest.h
45
include/webkitgtk-4.0/webkit2/WebKitPlugin.h
49
include/webkitgtk-4.0/webkit2/WebKitPlugin.h
46
include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
50
include/webkitgtk-4.0/webkit2/WebKitPolicyDecision.h
Lines 84-89 include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleDeclaration.h Link Here
84
include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
88
include/webkitgtk-4.0/webkitdom/WebKitDOMCSSStyleSheet.h
85
include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
89
include/webkitgtk-4.0/webkitdom/WebKitDOMCSSValue.h
86
include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
90
include/webkitgtk-4.0/webkitdom/WebKitDOMCharacterData.h
91
include/webkitgtk-4.0/webkitdom/WebKitDOMClientRect.h
92
include/webkitgtk-4.0/webkitdom/WebKitDOMClientRectList.h
87
include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
93
include/webkitgtk-4.0/webkitdom/WebKitDOMComment.h
88
include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
94
include/webkitgtk-4.0/webkitdom/WebKitDOMCustom.h
89
include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
95
include/webkitgtk-4.0/webkitdom/WebKitDOMCustomUnstable.h
Lines 191-209 lib/girepository-1.0/WebKit2-4.0.typelib Link Here
191
lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
197
lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
192
lib/libjavascriptcoregtk-4.0.so
198
lib/libjavascriptcoregtk-4.0.so
193
lib/libjavascriptcoregtk-4.0.so.18
199
lib/libjavascriptcoregtk-4.0.so.18
194
lib/libjavascriptcoregtk-4.0.so.18.5.13
200
lib/libjavascriptcoregtk-4.0.so.18.6.12
195
lib/libwebkit2gtk-4.0.so
201
lib/libwebkit2gtk-4.0.so
196
lib/libwebkit2gtk-4.0.so.37
202
lib/libwebkit2gtk-4.0.so.37
197
lib/libwebkit2gtk-4.0.so.37.19.9
203
lib/libwebkit2gtk-4.0.so.37.24.6
198
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
204
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
199
libdata/pkgconfig/javascriptcoregtk-4.0.pc
205
libdata/pkgconfig/javascriptcoregtk-4.0.pc
200
libdata/pkgconfig/webkit2gtk-4.0.pc
206
libdata/pkgconfig/webkit2gtk-4.0.pc
201
libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
207
libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
202
libexec/webkit2gtk-4.0/MiniBrowser
203
libexec/webkit2gtk-4.0/WebKitDatabaseProcess
204
libexec/webkit2gtk-4.0/WebKitNetworkProcess
208
libexec/webkit2gtk-4.0/WebKitNetworkProcess
205
libexec/webkit2gtk-4.0/WebKitPluginProcess
209
libexec/webkit2gtk-4.0/WebKitPluginProcess
206
%%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
210
%%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
211
libexec/webkit2gtk-4.0/WebKitStorageProcess
207
libexec/webkit2gtk-4.0/WebKitWebProcess
212
libexec/webkit2gtk-4.0/WebKitWebProcess
208
libexec/webkit2gtk-4.0/jsc
213
libexec/webkit2gtk-4.0/jsc
209
share/gir-1.0/JavaScriptCore-4.0.gir
214
share/gir-1.0/JavaScriptCore-4.0.gir

Return to bug 223733