From owner-svn-ports-all@freebsd.org Fri Nov 1 21:42:50 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3638F1A3ED8; Fri, 1 Nov 2019 21:42:50 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 474bJp0cRtz3JWy; Fri, 1 Nov 2019 21:42:50 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC89B195FE; Fri, 1 Nov 2019 21:42:49 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA1Lgn6E043811; Fri, 1 Nov 2019 21:42:49 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA1LgndJ043808; Fri, 1 Nov 2019 21:42:49 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201911012142.xA1LgndJ043808@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Fri, 1 Nov 2019 21:42:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r516269 - in branches/2019Q4/www/webkit2-gtk3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: in branches/2019Q4/www/webkit2-gtk3: . files X-SVN-Commit-Revision: 516269 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2019 21:42:50 -0000 Author: kwm Date: Fri Nov 1 21:42:49 2019 New Revision: 516269 URL: https://svnweb.freebsd.org/changeset/ports/516269 Log: MFH: r516196 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. Security: 92243b6a-5775-4aea-8727-a938058df5ba Approved by: ports-secteam Deleted: branches/2019Q4/www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp branches/2019Q4/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp branches/2019Q4/www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp Modified: branches/2019Q4/www/webkit2-gtk3/Makefile branches/2019Q4/www/webkit2-gtk3/distinfo branches/2019Q4/www/webkit2-gtk3/pkg-plist Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/www/webkit2-gtk3/Makefile ============================================================================== --- branches/2019Q4/www/webkit2-gtk3/Makefile Fri Nov 1 21:39:37 2019 (r516268) +++ branches/2019Q4/www/webkit2-gtk3/Makefile Fri Nov 1 21:42:49 2019 (r516269) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.24.4 +PORTVERSION= 2.26.1 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 @@ -37,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 @@ -65,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 \ @@ -92,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: branches/2019Q4/www/webkit2-gtk3/distinfo ============================================================================== --- branches/2019Q4/www/webkit2-gtk3/distinfo Fri Nov 1 21:39:37 2019 (r516268) +++ branches/2019Q4/www/webkit2-gtk3/distinfo Fri Nov 1 21:42:49 2019 (r516269) @@ -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: branches/2019Q4/www/webkit2-gtk3/pkg-plist ============================================================================== --- branches/2019Q4/www/webkit2-gtk3/pkg-plist Fri Nov 1 21:39:37 2019 (r516268) +++ branches/2019Q4/www/webkit2-gtk3/pkg-plist Fri Nov 1 21:42:49 2019 (r516269) @@ -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