pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www/webkit-gtk



Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Mar 30 12:47:42 UTC 2021

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile PLIST distinfo
        pkgsrc/www/webkit-gtk/patches: patch-Source_cmake_OptionsCommon.cmake
Added Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
            patch-Source_cmake_WebKitCommon.cmake
Removed Files:
        pkgsrc/www/webkit-gtk/patches: patch-CMakeLists.txt
            patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh
            patch-Source_WTF_wtf_RAMSize.cpp

Log Message:
webkit-gtk: Update to 2.32.0

pkgsrc changes:
 - Remove patch-Source_WTF_wtf_RAMSize.cpp: fallback method using sysconf(3) is
   now used also on NetBSD
 - patch-CMakeLists.txt migrated to Source/cmake/WebKitCommon.cmake: all
   existent logic was migrated there
 - Remove patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh: patched
   file no longer present
 - Add `-DENABLE_GAMEPAD=OFF' to disable gamepad support: needs libmanette not
   yet packaged in pkgsrc

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).

Updated in pkgsrc-wip by <cirnatdan> and me.


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/www/webkit-gtk/PLIST
cvs rdiff -u -r1.146 -r1.147 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.12 -r0 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_RAMSize.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake

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

Modified files:

Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.202 pkgsrc/www/webkit-gtk/Makefile:1.203
--- pkgsrc/www/webkit-gtk/Makefile:1.202        Thu Mar 18 14:56:21 2021
+++ pkgsrc/www/webkit-gtk/Makefile      Tue Mar 30 12:47:42 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.202 2021/03/18 14:56:21 leot Exp $
+# $NetBSD: Makefile,v 1.203 2021/03/30 12:47:42 leot Exp $
 
-DISTNAME=      webkitgtk-2.30.6
+DISTNAME=      webkitgtk-2.32.0
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
@@ -40,6 +40,7 @@ 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

Index: pkgsrc/www/webkit-gtk/PLIST
diff -u pkgsrc/www/webkit-gtk/PLIST:1.69 pkgsrc/www/webkit-gtk/PLIST:1.70
--- pkgsrc/www/webkit-gtk/PLIST:1.69    Thu Mar 18 14:56:21 2021
+++ pkgsrc/www/webkit-gtk/PLIST Tue Mar 30 12:47:42 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.69 2021/03/18 14:56:21 leot Exp $
+@comment $NetBSD: PLIST,v 1.70 2021/03/30 12:47:42 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -218,17 +218,16 @@ ${PLIST.introspection}lib/girepository-1
 ${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.17.14
+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.49.10
+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.so
 libexec/webkit2gtk-4.0/MiniBrowser
 libexec/webkit2gtk-4.0/WebKitNetworkProcess
-libexec/webkit2gtk-4.0/WebKitPluginProcess
 libexec/webkit2gtk-4.0/WebKitWebProcess
 libexec/webkit2gtk-4.0/jsc
 ${PLIST.introspection}share/gir-1.0/JavaScriptCore-4.0.gir

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.146 pkgsrc/www/webkit-gtk/distinfo:1.147
--- pkgsrc/www/webkit-gtk/distinfo:1.146        Thu Mar 18 14:56:21 2021
+++ pkgsrc/www/webkit-gtk/distinfo      Tue Mar 30 12:47:42 2021
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.146 2021/03/18 14:56:21 leot Exp $
+$NetBSD: distinfo,v 1.147 2021/03/30 12:47:42 leot Exp $
 
-SHA1 (webkitgtk-2.30.6.tar.xz) = aaaf9b0f1780f3eae104ae0d3ad15b3e19cf6e8d
-RMD160 (webkitgtk-2.30.6.tar.xz) = b0347f31ba8409d8ead8096633c1c9637a614733
-SHA512 (webkitgtk-2.30.6.tar.xz) = fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
-Size (webkitgtk-2.30.6.tar.xz) = 22311524 bytes
-SHA1 (patch-CMakeLists.txt) = 38d2957bb0f4573654adc0dc62b19d0fdbdbd496
+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
@@ -13,7 +12,6 @@ SHA1 (patch-Source_JavaScriptCore_heap_M
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
 SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 23bc86a389f8009ec829c3ee0fe3effe3f20b012
-SHA1 (patch-Source_ThirdParty_ANGLE_adjust-angle-include-paths.sh) = b6506b0f273a81f2a16a19abc604c3402f57f259
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = a5454eb891ad1f9d8285c28af2e9efb4ff439e6b
@@ -23,7 +21,6 @@ SHA1 (patch-Source_WTF_wtf_PlatformEnabl
 SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 3787817a0e288d00aa747c417aecd9abf52866d1
 SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
-SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = c4fd7f67cbb414318577c93d642f26827ba638c0
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
 SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
@@ -33,6 +30,7 @@ SHA1 (patch-Source_WebCore_platform_grap
 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) = 3a4d9415e7d3ac78a948b9e7eb5e0377575835c3
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 14dfbee895aa7c70bf3b61b4dbb5bccd96d9583a
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 61d2b4942b83d3f3c1b642d122f109ba90bbff9d
@@ -42,7 +40,8 @@ SHA1 (patch-Source_WebKit_Scripts_check-
 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) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
+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

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.4 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.5
--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.4    Mon Apr  9 08:33:48 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake        Tue Mar 30 12:47:42 2021
@@ -1,13 +1,13 @@
-$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.4 2018/04/09 08:33:48 wiz Exp $
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.5 2021/03/30 12:47:42 leot Exp $
 
 Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
 
---- Source/cmake/OptionsCommon.cmake.orig      2017-02-27 07:11:15.000000000 +0000
+--- Source/cmake/OptionsCommon.cmake.orig      2021-02-26 09:57:17.000000000 +0000
 +++ Source/cmake/OptionsCommon.cmake
-@@ -27,10 +27,10 @@ option(USE_THIN_ARCHIVES "Produce all st
- if (USE_THIN_ARCHIVES)
-     execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
-     if ("${AR_VERSION}" MATCHES "^GNU ar")
+@@ -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>")

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp:1.1
--- /dev/null   Tue Mar 30 12:47:42 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp    Tue Mar 30 12:47:42 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_rendering_shapes_ShapeOutsideInfo.cpp,v 1.1 2021/03/30 12:47:42 leot Exp $
+
+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
+     WritingMode writingMode = containingBlockStyle.writingMode();
+     auto margin = [&] {
+         auto shapeMargin = floatValueForLength(m_renderer.style().shapeMargin(), m_renderer.containingBlock() ? m_renderer.containingBlock()->contentWidth() : 0_lu);
+-        return isnan(shapeMargin) ? 0.0f : shapeMargin;
++        return std::isnan(shapeMargin) ? 0.0f : shapeMargin;
+     }();
+     float shapeImageThreshold = style.shapeImageThreshold();
+     const ShapeValue& shapeValue = *style.shapeOutside();
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake:1.1
--- /dev/null   Tue Mar 30 12:47:42 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake Tue Mar 30 12:47:42 2021
@@ -0,0 +1,28 @@
+$NetBSD: patch-Source_cmake_WebKitCommon.cmake,v 1.1 2021/03/30 12:47:42 leot Exp $
+
+- 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)



Home | Main Index | Thread Index | Old Index