webkit-gtk: Update to 2.32.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk: Update to 2.32.0
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sat, 27 Mar 2021 00:14:25 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Mar 27 01:14:25 2021 +0100
Changeset:	d36a01ed97f06a425769b02321dfd9226cab456c

Modified Files:
	webkit-gtk/Makefile
	webkit-gtk/PLIST
	webkit-gtk/distinfo
	webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
Added Files:
	webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
	webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake

Log Message:
webkit-gtk: Update to 2.32.0

pkgsrc changes:
 - Readd patch-CMakeLists.txt from www/webkit-gtk:
   existent logic was migrated to Source/cmake/WebKitCommon.cmake
 - Readd patch-Source_cmake_OptionsCommon.cmake (probably accidentally
   removed/forgotten)
 - Add a comment to patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
 - Revert some PLIST changes: introspection files needs to be marked
   via PLIST.introspection and the `.so' suffix is mostly unrelated to
   RUBY_DLEXT

Changes:
2.32.0
======
 - NPAPI plugins support have been removed.
 - System font scaling factor is correctly applied now.
 - New permission request API for MediaKeySystem access.
 - New API to remove individual scripts/stylesheets using WebKitUserContentManager.
 - Web inspector now shows detailed information about main loop frames.
 - The minimum required GStreamer version is now 1.14.
 - The GStreamer runtime is now initialized only when required.
 - Improved platform support for WebAudio (WebAudio->MediaStream, Worklet, Multi-channel).
 - Support for hardware-accelerated video rendering on i.MX8 platforms (using the NXP driver).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d36a01ed97f06a425769b02321dfd9226cab456c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/Makefile                                |  4 ++--
 webkit-gtk/PLIST                                   | 25 ++++++++++---------
 webkit-gtk/distinfo                                | 12 ++++++----
 ...e_WebCore_rendering_shapes_ShapeOutsideInfo.cpp |  2 ++
 .../patches/patch-Source_cmake_OptionsCommon.cmake | 21 ++++++++++++++++
 .../patches/patch-Source_cmake_WebKitCommon.cmake  | 28 ++++++++++++++++++++++
 6 files changed, 72 insertions(+), 20 deletions(-)

diffs:
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index abcb6e9b5d..6e54cdc0d9 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.202 2021/03/18 14:56:21 leot Exp $
 
-DISTNAME=	webkitgtk-2.31.91
+DISTNAME=	webkitgtk-2.32.0
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
@@ -40,13 +40,13 @@ CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=		-DPORT=GTK
 CMAKE_ARGS+=		-DENABLE_X11_TARGET=ON
 CMAKE_ARGS+=		-DENABLE_MINIBROWSER=ON
+CMAKE_ARGS+=		-DENABLE_GAMEPAD=OFF
 CMAKE_ARGS+=		-DENABLE_GEOLOCATION=OFF
 CMAKE_ARGS+=		-DENABLE_BUBBLEWRAP_SANDBOX=OFF
 CMAKE_ARGS+=		-DUSE_GSTREAMER_GL=OFF
 CMAKE_ARGS+=		-DUSE_LIBHYPHEN=OFF
 CMAKE_ARGS+=		-DUSE_OPENJPEG=OFF
 CMAKE_ARGS+=		-DUSE_SYSTEMD=OFF
-CMAKE_ARGS+=		-DENABLE_GAMEPAD=OFF
 
 REPLACE_PERL+=	Source/JavaScriptCore/Scripts/*.pl
 REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table
diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST
index 3f41037594..11a33ff5b0 100644
--- a/webkit-gtk/PLIST
+++ b/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.69 2021/03/18 14:56:21 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -51,7 +51,6 @@ include/webkitgtk-4.0/webkit2/WebKitHitTestResult.h
 include/webkitgtk-4.0/webkit2/WebKitInputMethodContext.h
 include/webkitgtk-4.0/webkit2/WebKitInstallMissingMediaPluginsPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitJavascriptResult.h
-include/webkitgtk-4.0/webkit2/WebKitMediaKeySystemPermissionRequest.h
 include/webkitgtk-4.0/webkit2/WebKitMimeInfo.h
 include/webkitgtk-4.0/webkit2/WebKitNavigationAction.h
 include/webkitgtk-4.0/webkit2/WebKitNavigationPolicyDecision.h
@@ -214,26 +213,26 @@ include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
 include/webkitgtk-4.0/webkitdom/webkitdom.h
 include/webkitgtk-4.0/webkitdom/webkitdomautocleanups.h
 include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
-lib/girepository-1.0/JavaScriptCore-4.0.typelib
-lib/girepository-1.0/WebKit2-4.0.typelib
-lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
-lib/libjavascriptcoregtk-4.0.${RUBY_DLEXT}
+${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-4.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
+${PLIST.introspection}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.18.3
-lib/libwebkit2gtk-4.0.${RUBY_DLEXT}
+lib/libjavascriptcoregtk-4.0.so.18.18.4
+lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.53.0
+lib/libwebkit2gtk-4.0.so.37.53.1
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
-lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.${RUBY_DLEXT}
+lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
 libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
-share/gir-1.0/JavaScriptCore-4.0.gir
-share/gir-1.0/WebKit2-4.0.gir
-share/gir-1.0/WebKit2WebExtension-4.0.gir
+${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit2-4.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit2WebExtension-4.0.gir
 share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/bg/LC_MESSAGES/WebKit2GTK-4.0.mo
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 6df4b8ecc8..7fa020501f 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.146 2021/03/18 14:56:21 leot Exp $
 
-SHA1 (webkitgtk-2.31.91.tar.xz) = 35e3eb5a89c497c7a4ff158ec580e4f09f4fb030
-RMD160 (webkitgtk-2.31.91.tar.xz) = 8035b3f3245b6d165d4d3bb6b676cc063cc5aaa0
-SHA512 (webkitgtk-2.31.91.tar.xz) = 972761a0db13a7ffde547b65941cdc2d6fd76032d2ca7f28724b5fee15714fc486c7b3d977834d0fad51de13ad695290cae47b2642f4f57543e14fd2765d68ff
-Size (webkitgtk-2.31.91.tar.xz) = 23316948 bytes
+SHA1 (webkitgtk-2.32.0.tar.xz) = 8abdb3ba2732c892dd06bb2bd63208b090462bf7
+RMD160 (webkitgtk-2.32.0.tar.xz) = c825873ec544e505f84e3b8a900619dac08e01ce
+SHA512 (webkitgtk-2.32.0.tar.xz) = 4832a4614be24481028ca8a6480a8e6cfacd8e22f5ba9f936703c09944550056f06f75ccf8fffa7dee3f5a1d11ab1870841407745be2e61ebad6557a0934db15
+Size (webkitgtk-2.32.0.tar.xz) = 23315936 bytes
 SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
 SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 79c282ca90d0ba2ef4769da40d4648f5f709951b
@@ -30,7 +30,7 @@ SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2
 SHA1 (patch-Source_WebCore_platform_network_DNS.h) = a491ed31e288af1ef56c4a70564045609ecb4b6a
 SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
-SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = d0e9a4b472a7167235c68a02d4203fe0abfc6b86
+SHA1 (patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
@@ -40,6 +40,8 @@ SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef
 SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = b1eb6ab93f2ce272cfee94a544d19806feb9a625
+SHA1 (patch-Source_cmake_OptionsCommon.cmake) = b0f0070bb006081e5f609d07103cd8abf382d60e
+SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 5f275eb75cf61b89a9168e4d72f9587dd5c732bc
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a
 SHA1 (patch-aj) = ec60907df4336b755d1d1924c026b3041805f431
diff --git a/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp b/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
index df4a4f4e3f..6965a1157f 100644
--- a/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
+++ b/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Properly calls std::isnan()
+
 --- Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp.orig	2021-02-26 09:57:14.000000000 +0000
 +++ Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp
 @@ -172,7 +172,7 @@ const Shape& ShapeOutsideInfo::computedS
diff --git a/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake b/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
new file mode 100644
index 0000000000..ae8d8c3911
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
@@ -0,0 +1,21 @@
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.4 2018/04/09 08:33:48 wiz Exp $
+
+Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
+
+--- Source/cmake/OptionsCommon.cmake.orig	2021-02-26 09:57:17.000000000 +0000
++++ Source/cmake/OptionsCommon.cmake
+@@ -14,10 +14,10 @@ if (USE_THIN_ARCHIVES)
+     elseif ("${AR_ERROR}")
+         message(WARNING "Error from `ar`: ${AR_ERROR}")
+     elseif ("${AR_VERSION}" MATCHES "^GNU ar")
+-        set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
+-        set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
++        set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
+     endif ()
+ endif ()
+ 
diff --git a/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake b/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
new file mode 100644
index 0000000000..41a78df11b
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
@@ -0,0 +1,28 @@
+$NetBSD$
+
+- Fix support for arm
+- Fix support for ppc, from FreeBSD.
+
+--- Source/cmake/WebKitCommon.cmake.orig	2021-02-26 09:57:17.000000000 +0000
++++ Source/cmake/WebKitCommon.cmake
+@@ -84,7 +84,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+     endif ()
+     if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)")
+         set(WTF_CPU_ARM64 1)
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
++    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^earm)")
+         set(WTF_CPU_ARM 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
+         set(WTF_CPU_MIPS64 1)
+@@ -102,9 +102,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+         endif ()
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
+         set(WTF_CPU_X86 1)
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
++    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
+         set(WTF_CPU_PPC 1)
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
++    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)")
+         set(WTF_CPU_PPC64 1)
+     elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+         set(WTF_CPU_PPC64LE 1)
Prev by Date: kalarm: add version 20.04.1
Next by Date: webkit-gtk: Add an initial COMMIT_MSG
Previous by Thread: kalarm: add version 20.04.1
Next by Thread: kleopatra: add version 20.04.1
Indexes:
Home | Main Index | Thread Index | Old Index