From owner-svn-ports-head@freebsd.org Sat Mar 23 15:25:23 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C25C5155384D; Sat, 23 Mar 2019 15:25:23 +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 620106E3FE; Sat, 23 Mar 2019 15:25:23 +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 396A5A411; Sat, 23 Mar 2019 15:25:23 +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 x2NFPNvE046270; Sat, 23 Mar 2019 15:25:23 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2NFPLlG046261; Sat, 23 Mar 2019 15:25:21 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201903231525.x2NFPLlG046261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sat, 23 Mar 2019 15:25:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496665 - in head/www/webkit2-gtk3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: in head/www/webkit2-gtk3: . files X-SVN-Commit-Revision: 496665 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 620106E3FE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Mar 2019 15:25:24 -0000 Author: kwm Date: Sat Mar 23 15:25:20 2019 New Revision: 496665 URL: https://svnweb.freebsd.org/changeset/ports/496665 Log: Update webkit2-gtk3 to 2.24.0. Disable GLES support (upstream default is off), this should fix display issues with nvidia cards. [1] PR: 229491 [1] Reported by: c0141@xbsd.net and others Obtained from: gnome development repo Added: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h (contents, props changed) head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb - copied, changed from r496664, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64_rb head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp (contents, props changed) Deleted: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64_rb head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h head/www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_soup_SoupNetworkSession.h head/www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h Modified: head/www/webkit2-gtk3/Makefile head/www/webkit2-gtk3/distinfo head/www/webkit2-gtk3/files/patch-CMakeLists.txt head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h head/www/webkit2-gtk3/pkg-plist Modified: head/www/webkit2-gtk3/Makefile ============================================================================== --- head/www/webkit2-gtk3/Makefile Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/Makefile Sat Mar 23 15:25:20 2019 (r496665) @@ -2,11 +2,12 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.22.6 +PORTVERSION= 2.24.0 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit @@ -24,6 +25,7 @@ LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \ libnotify.so:devel/libnotify \ libhyphen.so:textproc/hyphen \ libicutu.so:devel/icu \ + libopenjp2.so:graphics/openjpeg \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libsoup-2.4.so:devel/libsoup \ @@ -51,8 +53,9 @@ CXXFLAGS_powerpc= -DENABLE_YARR_JIT=0 CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0 CMAKE_ARGS= -DPORT=GTK CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \ + ENABLE_GLES2 \ USE_SYSTEM_MALLOC -CMAKE_ON= ENABLE_GLES2 ENABLE_MINIBROWSER +CMAKE_ON= ENABLE_MINIBROWSER CMAKE_OFF_armv6= ENABLE_JIT CMAKE_OFF_armv7= ENABLE_JIT CMAKE_OFF_powerpc= ENABLE_JIT Modified: head/www/webkit2-gtk3/distinfo ============================================================================== --- head/www/webkit2-gtk3/distinfo Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/distinfo Sat Mar 23 15:25:20 2019 (r496665) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549750133 -SHA256 (webkitgtk-2.22.6.tar.xz) = df90db9c0db0a2072b945fa3e1d45865922bd686c4659cce6cb5897ce357c85b -SIZE (webkitgtk-2.22.6.tar.xz) = 16773696 +TIMESTAMP = 1552504408 +SHA256 (gnome/webkitgtk-2.24.0.tar.xz) = 2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407 +SIZE (gnome/webkitgtk-2.24.0.tar.xz) = 17894000 Modified: head/www/webkit2-gtk3/files/patch-CMakeLists.txt ============================================================================== --- head/www/webkit2-gtk3/files/patch-CMakeLists.txt Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/files/patch-CMakeLists.txt Sat Mar 23 15:25:20 2019 (r496665) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2018-09-06 11:51:31 UTC +--- CMakeLists.txt.orig 2019-01-09 10:08:35 UTC +++ CMakeLists.txt -@@ -95,9 +95,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64 +@@ -96,9 +96,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) Modified: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h ============================================================================== --- head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Sat Mar 23 15:25:20 2019 (r496665) @@ -1,8 +1,8 @@ ---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2018-08-21 16:06:10 UTC +--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2019-01-09 10:08:35 UTC +++ Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -2863,6 +2863,8 @@ class ARM64Assembler { (public) +@@ -2874,6 +2874,8 @@ class ARM64Assembler { (public) { - #if OS(IOS) + #if OS(IOS_FAMILY) sys_cache_control(kCacheFunctionPrepareForExecution, code, size); +#elif OS(FREEBSD) || OS(NETBSD) + __clear_cache(code, reinterpret_cast(code) + size); Added: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h Sat Mar 23 15:25:20 2019 (r496665) @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2019-02-12 11:21:03 UTC ++++ Source/JavaScriptCore/assembler/ARMv7Assembler.h +@@ -2471,6 +2471,8 @@ class ARMv7Assembler { (public) + { + #if OS(IOS_FAMILY) + sys_cache_control(kCacheFunctionPrepareForExecution, code, size); ++#elif OS(FREEBSD) || OS(NETBSD) ++ __clear_cache(code, reinterpret_cast(code) + size); + #elif OS(LINUX) + size_t page = pageSize(); + uintptr_t current = reinterpret_cast(code); Copied and modified: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb (from r496664, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64_rb) ============================================================================== --- head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64_rb Sat Mar 23 14:58:34 2019 (r496664, copy source) +++ head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb Sat Mar 23 15:25:20 2019 (r496665) @@ -1,11 +1,11 @@ ---- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2018-10-27 21:20:55 UTC +--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2019-02-12 11:21:03 UTC +++ Source/JavaScriptCore/offlineasm/arm64.rb -@@ -938,7 +938,7 @@ class Instruction - $asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, #{operands[0].asmLabel}@GOTPAGEOFF]" +@@ -1034,7 +1034,7 @@ class Instruction + $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]" # On Linux, use ELF GOT relocation specifiers. - $asm.putStr("#elif OS(LINUX)") + $asm.putStr("#elif OS(LINUX) || OS(FREEBSD)") - $asm.puts "adrp #{operands[1].arm64Operand(:ptr)}, :got:#{operands[0].asmLabel}" - $asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, :got_lo12:#{operands[0].asmLabel}]" + $asm.puts "adrp #{operands[1].arm64Operand(:quad)}, :got:#{operands[0].asmLabel}" + $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, :got_lo12:#{operands[0].asmLabel}]" Modified: head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h ============================================================================== --- head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h Sat Mar 23 15:25:20 2019 (r496665) @@ -1,6 +1,6 @@ ---- Source/WTF/wtf/Platform.h.orig 2018-09-21 19:59:47 UTC +--- Source/WTF/wtf/Platform.h.orig 2019-01-14 07:57:51 UTC +++ Source/WTF/wtf/Platform.h -@@ -183,6 +183,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__) \ -@@ -230,6 +231,7 @@ +@@ -229,6 +230,7 @@ #elif defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6K__) \ Added: head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp Sat Mar 23 15:25:20 2019 (r496665) @@ -0,0 +1,11 @@ +--- Source/WebCore/platform/text/TextCodec.cpp.orig 2019-02-16 10:10:59 UTC ++++ Source/WebCore/platform/text/TextCodec.cpp +@@ -24,6 +24,8 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#include ++ + #include "config.h" + #include "TextCodec.h" + Modified: head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h ============================================================================== --- head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h Sat Mar 23 15:25:20 2019 (r496665) @@ -1,6 +1,6 @@ ---- Source/bmalloc/bmalloc/BPlatform.h.orig 2018-07-25 11:56:32 UTC +--- Source/bmalloc/bmalloc/BPlatform.h.orig 2018-11-09 13:57:26 UTC +++ Source/bmalloc/bmalloc/BPlatform.h -@@ -138,6 +138,7 @@ +@@ -144,6 +144,7 @@ #elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6K__) \ Modified: head/www/webkit2-gtk3/pkg-plist ============================================================================== --- head/www/webkit2-gtk3/pkg-plist Sat Mar 23 14:58:34 2019 (r496664) +++ head/www/webkit2-gtk3/pkg-plist Sat Mar 23 15:25:20 2019 (r496665) @@ -14,6 +14,7 @@ include/webkitgtk-4.0/jsc/JSCClass.h include/webkitgtk-4.0/jsc/JSCContext.h include/webkitgtk-4.0/jsc/JSCDefines.h include/webkitgtk-4.0/jsc/JSCException.h +include/webkitgtk-4.0/jsc/JSCOptions.h include/webkitgtk-4.0/jsc/JSCValue.h include/webkitgtk-4.0/jsc/JSCVersion.h include/webkitgtk-4.0/jsc/JSCVirtualMachine.h @@ -33,6 +34,7 @@ include/webkitgtk-4.0/webkit2/WebKitContextMenuItem.h include/webkitgtk-4.0/webkit2/WebKitCookieManager.h include/webkitgtk-4.0/webkit2/WebKitCredential.h include/webkitgtk-4.0/webkit2/WebKitDefines.h +include/webkitgtk-4.0/webkit2/WebKitDeviceInfoPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitDownload.h include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h include/webkitgtk-4.0/webkit2/WebKitEditorState.h @@ -70,7 +72,9 @@ include/webkitgtk-4.0/webkit2/WebKitSettings.h include/webkitgtk-4.0/webkit2/WebKitURIRequest.h include/webkitgtk-4.0/webkit2/WebKitURIResponse.h include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h +include/webkitgtk-4.0/webkit2/WebKitURIUtilities.h include/webkitgtk-4.0/webkit2/WebKitUserContent.h +include/webkitgtk-4.0/webkit2/WebKitUserContentFilterStore.h include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h include/webkitgtk-4.0/webkit2/WebKitVersion.h @@ -209,10 +213,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.11.7 +lib/libjavascriptcoregtk-4.0.so.18.13.3 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.33.7 +lib/libwebkit2gtk-4.0.so.37.37.2 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-4.0.pc libdata/pkgconfig/webkit2gtk-4.0.pc @@ -221,7 +225,6 @@ 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/WebKitStorageProcess libexec/webkit2gtk-4.0/WebKitWebProcess libexec/webkit2gtk-4.0/jsc share/gir-1.0/JavaScriptCore-4.0.gir