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:           Sun May 29 17:47:15 UTC 2022

Modified Files:
        pkgsrc/www/webkit-gtk: Makefile PLIST buildlink3.mk distinfo options.mk
        pkgsrc/www/webkit-gtk/patches: patch-Source_WTF_wtf_PlatformHave.h
            patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
            patch-Source_cmake_OptionsCommon.cmake
            patch-Source_cmake_WebKitCommon.cmake
Added Files:
        pkgsrc/www/webkit-gtk/patches:
            patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp
            patch-Source_bmalloc_bmalloc_AvailableMemory.cpp

Log Message:
webkit-gtk: Update to 2.36.3

pkgsrc changes:
 - Remove USE_LD_GOLD option adjustment. The option was removed, if gold is
   accidentally picked up it should be re-investigate how to re-disable it.
 - USE_SYSTEMD option is no longer available, switch to ENABLE_JOURNALD_LOG
   and unconditionally disable it to avoid possible systemd dependencies
 - ENABLE_OPENGL option is no longer available, switch to USE_OPENGL_OR_ES
   (not tested)

Changes:
WebKitGTK 2.36.3
================
  - Support capturing already encoded video streams, which takes advantage
    of encoding done in hardware by devices which support this feature.
  - Avoid using experimental GStreamer elements for video demuxing.
  - Avoid using the legacy GStreamer VA-API decoding plug-ins, which often
    cause rendering issues and are not much maintained. Their usage can be
    re-enabled setting WEBKIT_GST_ENABLE_LEGACY_VAAPI=1 in the environment.
  - Fix playback of YouTube streams which use dynamic ad insertion.
  - Fix display capture with Pipewire.
  - Fix the build without the X11 target when X11 headers are not present.
  - Fix several crashes and rendering issues.

WebKitGTK 2.36.2
================
  - Fix some pages showing empty content boxes when using GTK4.
  - Fix the build with accessibility disabled.
  - Fix the build with newer Ruby versions.
  - Fix several crashes and rendering issues.

WebKitGTK 2.36.1
================
  - Fix the build with accessibility disabled.
  - Fix several crashes and rendering issues.
  - Translation updates: Croatian.

WebKitGTK 2.36.0
================
  - Fix selection foreground color on text with decorations.
  - Fix seeking on YouTube videos.
  - Fix list item marker not exposed to a11y when not a direct child of a list item.
  - Fix a crash while closing a page.
  - Fix the build to make it reproducible again.
  - Fix several crashes and rendering issues.

WebKitGTK 2.35.90
=================
  - Fix scrolling with the mouse wheel on sites using overscroll-behavior.
  - Suspend web processes after some time in the process cache.
  - Fix renderning of horizontal scrollbars with themes enabling steppers.
  - Ensure EGL displays are terminated before web process exits.
  - Deinitialize gstreamer before web process exits.
  - Make fonts under XDG_DATA_DIRS available in web process sanbox.
  - Canonicalize paths passed to bubblewrap launcher.
  - Fix several crashes and rendering issues.
  - Translation updates: Hebrew.

WebKitGTK 2.35.3
================
  - Fix a crash at startup when bubblewrap sandbox is enabled.
  - Fix a crash when starting a drag an drop on touchscreen.
  - Fix several crashes and rendering issues.

WebKitGTK 2.35.2
================
  - Add new accessibility implementation using ATSPI DBus interfaces instead of ATK.
  - Use native GtkWidgets for form validation popups.
  - Add support for requestVideoFrameCallback.
  - Add support for accent colors.
  - Fix pinch zooming from a link to not activate the link.
  - Fix kinetic scrolling via touch screen.
  - Fix several crashes and rendering issues.

WebKitGTK 2.35.1
================
  - Make user interactive threads (event handler, scrolling, ...) real time in linux.
  - Add new API to set HTTP response information to custom uri schemes.
  - Add support for media session.
  - Change hardware-acceleration-policy setting default value to always.
  - Fix jsc_value_object_define_property_accessor() to work with objects not having a wrapped instance.
  - Fix several crashes and rendering issues.


To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/www/webkit-gtk/PLIST
cvs rdiff -u -r1.88 -r1.89 pkgsrc/www/webkit-gtk/buildlink3.mk
cvs rdiff -u -r1.162 -r1.163 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/webkit-gtk/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp \
    pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
cvs rdiff -u -r1.5 -r1.6 \
    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.225 pkgsrc/www/webkit-gtk/Makefile:1.226
--- pkgsrc/www/webkit-gtk/Makefile:1.225        Mon Apr 25 23:28:51 2022
+++ pkgsrc/www/webkit-gtk/Makefile      Sun May 29 17:47:15 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.225 2022/04/25 23:28:51 tnn Exp $
+# $NetBSD: Makefile,v 1.226 2022/05/29 17:47:15 leot Exp $
 
-DISTNAME=      webkitgtk-2.34.6
+DISTNAME=      webkitgtk-2.36.3
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=  .tar.xz
@@ -20,7 +19,7 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-expat-[0-9
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++17
-USE_TOOLS+=    automake bash bison flex gmake perl pkg-config msgfmt
+USE_TOOLS+=    automake bash bison flex gdbus-codegen gmake perl pkg-config msgfmt
 
 # Enabling -gdwarf-2 hits GNU ar limits on file size.
 CTF_SUPPORTED= no
@@ -40,10 +39,6 @@ USE_PKGSRC_GCC=              yes
 USE_PKGSRC_GCC_RUNTIME=        yes
 .endif
 
-# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
-# versions of ld.gold.
-CMAKE_ARGS+=   -DUSE_LD_GOLD=OFF
-
 PKGCONFIG_OVERRIDE+=   Source/JavaScriptCore/javascriptcoregtk.pc.in
 PKGCONFIG_OVERRIDE+=   Source/WebKit/gtk/webkit2gtk-web-extension.pc.in
 PKGCONFIG_OVERRIDE+=   Source/WebKit/gtk/webkit2gtk.pc.in
@@ -54,12 +49,12 @@ CMAKE_ARGS+=                -DENABLE_X11_TARGET=ON
 CMAKE_ARGS+=           -DENABLE_MINIBROWSER=ON
 CMAKE_ARGS+=           -DENABLE_GAMEPAD=OFF
 CMAKE_ARGS+=           -DENABLE_GEOLOCATION=OFF
+CMAKE_ARGS+=           -DENABLE_JOURNALD_LOG=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_SOUP2=ON
-CMAKE_ARGS+=           -DUSE_SYSTEMD=OFF
 
 REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
 REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
@@ -111,7 +106,7 @@ REPLACE_RUBY+=              Source/WebKit/Scripts/*.
 
 SUBST_CLASSES+=                python
 SUBST_FILES.python+=   Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-SUBST_SED.python+=     -e 's,\(.\)python.;,\1${PYTHONBIN}\1;,'
+SUBST_SED.python+=     -e 's,"python3","${PYTHONBIN}",'
 SUBST_STAGE.python=    pre-configure
 SUBST_MESSAGE.python=  Fixing path to python binary.
 

Index: pkgsrc/www/webkit-gtk/PLIST
diff -u pkgsrc/www/webkit-gtk/PLIST:1.82 pkgsrc/www/webkit-gtk/PLIST:1.83
--- pkgsrc/www/webkit-gtk/PLIST:1.82    Thu Feb 17 16:55:16 2022
+++ pkgsrc/www/webkit-gtk/PLIST Sun May 29 17:47:15 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.82 2022/02/17 16:55:16 leot Exp $
+@comment $NetBSD: PLIST,v 1.83 2022/05/29 17:47:15 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -76,6 +76,7 @@ include/webkitgtk-4.0/webkit2/WebKitSett
 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/WebKitURISchemeResponse.h
 include/webkitgtk-4.0/webkit2/WebKitURIUtilities.h
 include/webkitgtk-4.0/webkit2/WebKitUserContent.h
 include/webkitgtk-4.0/webkit2/WebKitUserContentFilterStore.h
@@ -220,10 +221,10 @@ ${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.19.11
+lib/libjavascriptcoregtk-4.0.so.18.20.7
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.55.9
+lib/libwebkit2gtk-4.0.so.37.56.7
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
@@ -255,6 +256,7 @@ share/locale/gl/LC_MESSAGES/WebKit2GTK-4
 share/locale/gu/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/he/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/hi/LC_MESSAGES/WebKit2GTK-4.0.mo
+share/locale/hr/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/hu/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/id/LC_MESSAGES/WebKit2GTK-4.0.mo
 share/locale/it/LC_MESSAGES/WebKit2GTK-4.0.mo

Index: pkgsrc/www/webkit-gtk/buildlink3.mk
diff -u pkgsrc/www/webkit-gtk/buildlink3.mk:1.88 pkgsrc/www/webkit-gtk/buildlink3.mk:1.89
--- pkgsrc/www/webkit-gtk/buildlink3.mk:1.88    Mon Apr 18 19:10:12 2022
+++ pkgsrc/www/webkit-gtk/buildlink3.mk Sun May 29 17:47:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.88 2022/04/18 19:10:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.89 2022/05/29 17:47:15 leot Exp $
 
 BUILDLINK_TREE+=       webkit-gtk
 

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.162 pkgsrc/www/webkit-gtk/distinfo:1.163
--- pkgsrc/www/webkit-gtk/distinfo:1.162        Thu Feb 17 16:55:16 2022
+++ pkgsrc/www/webkit-gtk/distinfo      Sun May 29 17:47:15 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.162 2022/02/17 16:55:16 leot Exp $
+$NetBSD: distinfo,v 1.163 2022/05/29 17:47:15 leot Exp $
 
-BLAKE2s (webkitgtk-2.34.6.tar.xz) = 117fe0ec529e03bc59ab091ca6e84e42b3491481ae0a874e90831f0ac67b26ef
-SHA512 (webkitgtk-2.34.6.tar.xz) = 57ab25af027ae39820622743c258f3e6d0af86376f2a4c3a8ede560ca6652c98c49056c716aace56291264c18164cb60395be9779a9d12455e6a0f7d2c197343
-Size (webkitgtk-2.34.6.tar.xz) = 24393340 bytes
+BLAKE2s (webkitgtk-2.36.3.tar.xz) = c0536c4edcb59ed28edcdaf309267d6c3c1e49e5eaae85b39fb29b49722977ad
+SHA512 (webkitgtk-2.36.3.tar.xz) = dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
+Size (webkitgtk-2.36.3.tar.xz) = 26600236 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
@@ -17,15 +17,16 @@ SHA1 (patch-Source_ThirdParty_gtest_incl
 SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
 SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
-SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 1c96cc094a4f62f17d11890a17f164d214fa0f1f
+SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 56cec19c923ccb6539f2d321abafa1e167735b6a
 SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
+SHA1 (patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp) = 73b3facb6912411a5767b05b7d7eebdbc9416ebf
 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
 SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
 SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
-SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
+SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 43f423af652533a64d0793ec6d15150b908da0f8
 SHA1 (patch-Source_WebCore_platform_network_DNS.h) = dd9fb67aae0029c6a452e7d8f09eeed1235d5700
 SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
@@ -37,10 +38,11 @@ SHA1 (patch-Source_WebKit_Platform_IPC_u
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
 SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
 SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
+SHA1 (patch-Source_bmalloc_bmalloc_AvailableMemory.cpp) = 18915c691d6f4e2a8870f8fee0909bd1a609cc05
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
-SHA1 (patch-Source_cmake_OptionsCommon.cmake) = b0f0070bb006081e5f609d07103cd8abf382d60e
-SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 5f275eb75cf61b89a9168e4d72f9587dd5c732bc
+SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 7db9d7b06e7f784000e66b0dab23e98f6298107a
+SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 73a0da491ef93d5cc25214e7733b54bbdacd487e
 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/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.21 pkgsrc/www/webkit-gtk/options.mk:1.22
--- pkgsrc/www/webkit-gtk/options.mk:1.21       Tue Mar 10 18:14:04 2020
+++ pkgsrc/www/webkit-gtk/options.mk    Sun May 29 17:47:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2020/03/10 18:14:04 leot Exp $
+# $NetBSD: options.mk,v 1.22 2022/05/29 17:47:15 leot Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
@@ -47,9 +47,9 @@ CMAKE_ARGS+=  -DENABLE_JIT=OFF
 # OpenGL support: enable support for GLX, WebGL and accelerated compositing
 #
 .if !empty(PKG_OPTIONS:Mopengl)
-CMAKE_ARGS+=   -DENABLE_OPENGL=ON
+CMAKE_ARGS+=   -DUSE_OPENGL_OR_ES=ON
 .else
-CMAKE_ARGS+=   -DENABLE_OPENGL=OFF
+CMAKE_ARGS+=   -DUSE_OPENGL_OR_ES=OFF
 .endif
 
 #

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h:1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h:1.3
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h:1.2       Thu May 13 08:20:58 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h   Sun May 29 17:47:15 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.2 2021/05/13 08:20:58 leot Exp $
+$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.3 2022/05/29 17:47:15 leot Exp $
 
 Add support for NetBSD.
 
---- Source/WTF/wtf/PlatformHave.h.orig 2021-05-05 05:33:24.000000000 +0000
+--- Source/WTF/wtf/PlatformHave.h.orig 2022-02-23 08:58:57.000000000 +0000
 +++ Source/WTF/wtf/PlatformHave.h
-@@ -206,7 +206,7 @@
+@@ -229,7 +229,7 @@
  #define HAVE_HOSTED_CORE_ANIMATION 1
  #endif
  
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+-#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(OPENBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS) || CPU(RISCV64)))
++#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS) || CPU(RISCV64)))
  #define HAVE_MACHINE_CONTEXT 1
  #endif
  

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp:1.1 
pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp:1.1   Fri Jun 15 09:17:02 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp       Sun May 29 17:47:15 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp,v 1.1 2018/06/15 09:17:02 jperkin Exp $
+$NetBSD: patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp,v 1.2 2022/05/29 17:47:15 leot Exp $
 
 Avoid ambiguous function call.
 
---- Source/WebCore/platform/graphics/filters/FEMorphology.cpp.orig     2018-02-19 11:04:38.000000000 +0000
+--- Source/WebCore/platform/graphics/filters/FEMorphology.cpp.orig     2022-02-23 08:59:02.000000000 +0000
 +++ Source/WebCore/platform/graphics/filters/FEMorphology.cpp
-@@ -32,6 +32,8 @@
- #include <wtf/Vector.h>
+@@ -29,6 +29,8 @@
+ #include "FEMorphologySoftwareApplier.h"
  #include <wtf/text/TextStream.h>
  
 +using std::sqrt;
 +
  namespace WebCore {
  
- FEMorphology::FEMorphology(Filter& filter, MorphologyOperatorType type, float radiusX, float radiusY)
+ Ref<FEMorphology> FEMorphology::create(MorphologyOperatorType type, float radiusX, float radiusY)
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake:1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake:1.1     Tue Mar 30 12:47:42 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_WebKitCommon.cmake Sun May 29 17:47:15 2022
@@ -1,20 +1,20 @@
-$NetBSD: patch-Source_cmake_WebKitCommon.cmake,v 1.1 2021/03/30 12:47:42 leot Exp $
+$NetBSD: patch-Source_cmake_WebKitCommon.cmake,v 1.2 2022/05/29 17:47:15 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.orig       2022-02-23 08:59:06.000000000 +0000
 +++ Source/cmake/WebKitCommon.cmake
-@@ -84,7 +84,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+@@ -88,7 +88,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
      endif ()
-     if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64)")
+     if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^aarch64|^arm64|^cortex-?[am][2-7][2-8])")
          set(WTF_CPU_ARM64 1)
--    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-+    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^earm)")
+-    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^cortex)")
++    elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(^arm|^cortex|^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)
+@@ -106,9 +106,9 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
          endif ()
      elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
          set(WTF_CPU_X86 1)

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.6
--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake:1.5    Tue Mar 30 12:47:42 2021
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake        Sun May 29 17:47:15 2022
@@ -1,21 +1,21 @@
-$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.5 2021/03/30 12:47:42 leot Exp $
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.6 2022/05/29 17:47:15 leot 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.orig      2022-02-23 08:59:06.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 ()
+@@ -128,10 +128,10 @@ endif ()
+ option(USE_THIN_ARCHIVES "Produce all static libraries as thin archives" ${USE_THIN_ARCHIVES_DEFAULT})
+ 
+ if (USE_THIN_ARCHIVES)
+-    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 ()
  
+ set(ENABLE_DEBUG_FISSION_DEFAULT OFF)

Added files:

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp:1.1
--- /dev/null   Sun May 29 17:47:15 2022
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp       Sun May 29 17:47:15 2022
@@ -0,0 +1,55 @@
+$NetBSD: patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp,v 1.1 2022/05/29 17:47:15 leot Exp $
+
+For NetBSD use the same code paths of OS(LINUX) (there isn't anything
+that NetBSD does not support).
+
+This avoid a regression introduced by:
+
+ 2022-02-10  Keith Miller  <keith_miller%apple.com@localhost>
+ 
+ tryReserveUncommittedAligned should explicitly take the alignment requested
+ https://bugs.webkit.org/show_bug.cgi?id=236460
+ 
+ Reviewed by Yusuke Suzuki.
+ 
+ When reducing the size of VA space reserved for Structures, we
+ didn't take care to ensure the alignment matched the required
+ alignment for our bit mask. To fix this we need to pass the
+ original alignment to the allocator as a new parameter.
+ 
+ * heap/StructureAlignedMemoryAllocator.cpp:
+   (JSC::StructureMemoryManager::StructureMemoryManager):
+
+Where probably the PROT_* are not readjusted.
+
+XXX: This is a wild-guess that should be double-checked!
+
+--- Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp.orig     2022-02-23 11:41:47.560819000 +0000
++++ Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp
+@@ -115,7 +115,7 @@ void* OSAllocator::tryReserveAndCommit(s
+ 
+ void* OSAllocator::tryReserveUncommitted(size_t bytes, Usage usage, bool writable, bool executable, bool jitCageEnabled, bool includesGuardPages)
+ {
+-#if OS(LINUX)
++#if OS(LINUX) || OS(NETBSD)
+     UNUSED_PARAM(usage);
+     UNUSED_PARAM(writable);
+     UNUSED_PARAM(executable);
+@@ -225,7 +225,7 @@ void* OSAllocator::reserveAndCommit(size
+ 
+ void OSAllocator::commit(void* address, size_t bytes, bool writable, bool executable)
+ {
+-#if OS(LINUX)
++#if OS(LINUX) || OS(NETBSD)
+     int protection = PROT_READ;
+     if (writable)
+         protection |= PROT_WRITE;
+@@ -249,7 +249,7 @@ void OSAllocator::commit(void* address, 
+ 
+ void OSAllocator::decommit(void* address, size_t bytes)
+ {
+-#if OS(LINUX)
++#if OS(LINUX) || OS(NETBSD)
+     madvise(address, bytes, MADV_DONTNEED);
+     if (mprotect(address, bytes, PROT_NONE))
+         CRASH();
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp:1.1
--- /dev/null   Sun May 29 17:47:15 2022
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp      Sun May 29 17:47:15 2022
@@ -0,0 +1,26 @@
+$NetBSD: patch-Source_bmalloc_bmalloc_AvailableMemory.cpp,v 1.1 2022/05/29 17:47:15 leot Exp $
+
+sysinfo() is used only on FreeBSD and Linux.
+
+Shared upstream via <https://bugs.webkit.org/show_bug.cgi?id=241077>.
+
+--- Source/bmalloc/bmalloc/AvailableMemory.cpp.orig    2022-02-23 08:59:06.000000000 +0000
++++ Source/bmalloc/bmalloc/AvailableMemory.cpp
+@@ -44,15 +44,16 @@
+ #import <mach/mach_error.h>
+ #import <math.h>
+ #elif BOS(UNIX)
+-#include <sys/sysinfo.h>
+ #if BOS(LINUX)
+ #include <algorithm>
+ #include <fcntl.h>
++#include <sys/sysinfo.h>
+ #elif BOS(FREEBSD)
+ #include "VMAllocate.h"
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+ #include <sys/user.h>
++#include <sys/sysinfo.h>
+ #endif
+ #include <unistd.h>
+ #endif
Home | Main Index | Thread Index | Old Index