Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Oct 2019 20:56:16 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r516196 - in head/www/webkit2-gtk3: . files
Message-ID:  <201910312056.x9VKuGD2042919@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Thu Oct 31 20:56:16 2019
New Revision: 516196
URL: https://svnweb.freebsd.org/changeset/ports/516196

Log:
  Update webkit2-gtk3 to 2.26.1.
  
  * Drop the NPAPI option, which was removed. This option was used to support gtk+2 plugins (like flash).
  * Add a note when binutils can be dropped for linking.
  
  MFH:		2019Q4
  Security:	92243b6a-5775-4aea-8727-a938058df5ba

Deleted:
  head/www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp
  head/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp
  head/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp
Modified:
  head/www/webkit2-gtk3/Makefile
  head/www/webkit2-gtk3/distinfo
  head/www/webkit2-gtk3/pkg-plist

Modified: head/www/webkit2-gtk3/Makefile
==============================================================================
--- head/www/webkit2-gtk3/Makefile	Thu Oct 31 20:43:57 2019	(r516195)
+++ head/www/webkit2-gtk3/Makefile	Thu Oct 31 20:56:16 2019	(r516196)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTVERSION=	2.24.4
-PORTREVISION=	1
+PORTVERSION=	2.26.1
 CATEGORIES=	www
 MASTER_SITES=	https://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
@@ -38,7 +37,7 @@ PORTSCOUT=	limitw:1,even
 
 USES=		bison cmake compiler:c++14-lang gettext gl gnome gperf \
 		jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \
-		sqlite tar:xz
+		sqlite tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
 USE_GL=		gl egl glesv2
 USE_GSTREAMER1=	bad gl
@@ -66,17 +65,15 @@ INSTALL_TARGET=		install
 
 BROWSER_PLUGINS_DIR?=	${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3
 
-OPTIONS_DEFINE=		DEBUG GEOIP NPAPI WAYLAND
+OPTIONS_DEFINE=		DEBUG GEOIP WAYLAND
 OPTIONS_DEFAULT=	GEOIP WAYLAND
-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
+# binutils can be removed when 12.0-R and 11.2 and 11.3 are EOL
+# https://svnweb.freebsd.org/base?view=revision&revision=346079
 DEBUG_BUILD_DEPENDS=	binutils>=0:devel/binutils
 DEBUG_CMAKE_ON=		-DCMAKE_AR=${LOCALBASE}/bin/ar \
 			-DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \
@@ -93,11 +90,10 @@ GEOIP_CMAKE_BOOL=	ENABLE_GEOLOCATION
 GEOIP_BUILD_DEPENDS=	geoclue>=2.4.3:net/geoclue
 GEOIP_RUN_DEPENDS=	geoclue>=2.4.3:net/geoclue
 
-NPAPI_CMAKE_BOOL=	ENABLE_PLUGIN_PROCESS_GTK2
-NPAPI_USE=		GNOME=gtk20
-
 WAYLAND_CMAKE_BOOL=	ENABLE_WAYLAND_TARGET
-WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
+WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
+			libwpe-1.0.so:www/libwpe \
+			libWPEBackend-fdo-1.0.so:www/wpebackend-fdo
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \

Modified: head/www/webkit2-gtk3/distinfo
==============================================================================
--- head/www/webkit2-gtk3/distinfo	Thu Oct 31 20:43:57 2019	(r516195)
+++ head/www/webkit2-gtk3/distinfo	Thu Oct 31 20:56:16 2019	(r516196)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567099248
-SHA256 (gnome/webkitgtk-2.24.4.tar.xz) = 8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8
-SIZE (gnome/webkitgtk-2.24.4.tar.xz) = 17575784
+TIMESTAMP = 1569330516
+SHA256 (gnome/webkitgtk-2.26.1.tar.xz) = 6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155
+SIZE (gnome/webkitgtk-2.26.1.tar.xz) = 19327444

Modified: head/www/webkit2-gtk3/pkg-plist
==============================================================================
--- head/www/webkit2-gtk3/pkg-plist	Thu Oct 31 20:43:57 2019	(r516195)
+++ head/www/webkit2-gtk3/pkg-plist	Thu Oct 31 20:56:16 2019	(r516196)
@@ -46,6 +46,7 @@ include/webkitgtk-4.0/webkit2/WebKitFindController.h
 include/webkitgtk-4.0/webkit2/WebKitFormSubmissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitForwardDeclarations.h
 include/webkitgtk-4.0/webkit2/WebKitFrame.h
+include/webkitgtk-4.0/webkit2/WebKitGeolocationManager.h
 include/webkitgtk-4.0/webkit2/WebKitGeolocationPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
@@ -213,10 +214,10 @@ 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.13.7
+lib/libjavascriptcoregtk-4.0.so.18.14.6
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.37.6
+lib/libwebkit2gtk-4.0.so.37.39.2
 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libdata/pkgconfig/javascriptcoregtk-4.0.pc
 libdata/pkgconfig/webkit2gtk-4.0.pc
@@ -224,7 +225,6 @@ libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
 libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitPluginProcess
-%%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 share/gir-1.0/JavaScriptCore-4.0.gir



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910312056.x9VKuGD2042919>