CVS commit: pkgsrc/www/qt6-qtwebengine

["Robert Bagdan" <kikadf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Fri Oct  2 13:08:36 UTC 2026

Modified Files:
        pkgsrc/www/qt6-qtwebengine: Makefile distinfo
Added Files:
        pkgsrc/www/qt6-qtwebengine/patches:
            patch-src_3rdparty_chromium_mojo_core_channel__posix.cc
            patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc
            patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc

Log Message:
qt6-qtwebengine: import patches from chromium


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/qt6-qtwebengine/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/qt6-qtwebengine/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel__posix.cc \
    pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc \
    pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc

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

Modified files:

Index: pkgsrc/www/qt6-qtwebengine/Makefile
diff -u pkgsrc/www/qt6-qtwebengine/Makefile:1.17 pkgsrc/www/qt6-qtwebengine/Makefile:1.18
--- pkgsrc/www/qt6-qtwebengine/Makefile:1.17    Tue Sep 29 06:08:08 2026
+++ pkgsrc/www/qt6-qtwebengine/Makefile Fri Oct  2 13:08:36 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2026/09/29 06:08:08 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/10/02 13:08:36 kikadf Exp $
 
 DISTNAME=      qtwebengine-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtwebengine-${QTVERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       Qt6 webengine module
 CATEGORIES=    www
 LICENSE=       gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3

Index: pkgsrc/www/qt6-qtwebengine/distinfo
diff -u pkgsrc/www/qt6-qtwebengine/distinfo:1.8 pkgsrc/www/qt6-qtwebengine/distinfo:1.9
--- pkgsrc/www/qt6-qtwebengine/distinfo:1.8     Tue Aug 18 18:26:06 2026
+++ pkgsrc/www/qt6-qtwebengine/distinfo Fri Oct  2 13:08:36 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2026/08/18 18:26:06 adam Exp $
+$NetBSD: distinfo,v 1.9 2026/10/02 13:08:36 kikadf Exp $
 
 BLAKE2s (kikadf-chromium-audioio-v130.0.tar.gz) = 45fe07cb8280f81b8ef490059002da426b59fe69b5ebd53951fe1dc3e9495a10
 SHA512 (kikadf-chromium-audioio-v130.0.tar.gz) = 840aed119dc69982f14fd5f4767e144bfc8a66672b660f0f05f5459070d7f6a36b8719ae7c0de049f7345dec39266759aedcdd5ee37aa4e98bcd2b44d06a3a4c
@@ -657,7 +657,9 @@ SHA1 (patch-src_3rdparty_chromium_media_
 SHA1 (patch-src_3rdparty_chromium_media_webrtc_helpers__unittests.cc) = 374b8909391cc0985796d0a89136fbb5b70e3702
 SHA1 (patch-src_3rdparty_chromium_mojo_core_BUILD.gn) = a236dccd43adc1a9ff4924e98e51db769c92cca9
 SHA1 (patch-src_3rdparty_chromium_mojo_core_channel.cc) = 9c4aa885e6e366a609eefb4526ff0e43a9ef61d3
+SHA1 (patch-src_3rdparty_chromium_mojo_core_channel__posix.cc) = 6710b92c58f20afb6d565ac6ce73099e8afb2655
 SHA1 (patch-src_3rdparty_chromium_mojo_core_embedder_features.h) = 6773ad4533e5833af0db3440babaf78b89885de2
+SHA1 (patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc) = cd08b45abb7ea67cc1cbf7009b38e54e18d464aa
 SHA1 (patch-src_3rdparty_chromium_mojo_public_cpp_platform_socket__utils__posix.cc) = 9c80e09154b7a81b715c947bd419489f175e4257
 SHA1 (patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni) = b43382515e457842959488f644b6668b8994daf8
 SHA1 (patch-src_3rdparty_chromium_net_BUILD.gn) = 924e9c3c262fcf39dc9b0108abe277c8d1805b0d
@@ -934,6 +936,7 @@ SHA1 (patch-src_3rdparty_chromium_third_
 SHA1 (patch-src_3rdparty_chromium_third__party_node_check__version.py) = c99b14d92716c5e2fd2548238ede7b0bd87153ac
 SHA1 (patch-src_3rdparty_chromium_third__party_node_node.gni) = 674ed5886b07b4886baf0b964216dec452f691e4
 SHA1 (patch-src_3rdparty_chromium_third__party_node_node.py) = ef364690eb2445a329e944d4625c04593936b505
+SHA1 (patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc) = e9fe19e3f954290c568f15cf7ed4c67405cb206b
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_core_fpdfapi_page_cpdf__psengine.cpp) = 2815e321325d05223d4b0e05d08095c5a38213ad
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_css_cfx__cssdeclaration.cpp) = a7594316fb1ef8b196eb40f7dd28a46afc1b4f79
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_core_fxcrt_fx__extension.h) = 4563e7d2a973b442525912f8db02cbb391a1e296

Added files:

Index: pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel__posix.cc
diff -u /dev/null pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel__posix.cc:1.1
--- /dev/null   Fri Oct  2 13:08:36 2026
+++ pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_core_channel__posix.cc  Fri Oct  2 13:08:36 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_core_channel__posix.cc,v 1.1 2026/10/02 13:08:36 kikadf Exp $
+
+* Workaround to the renderer process crash
+
+--- src/3rdparty/chromium/mojo/core/channel_posix.cc.orig      2026-10-02 06:55:56.671304457 +0000
++++ src/3rdparty/chromium/mojo/core/channel_posix.cc
+@@ -409,10 +409,11 @@ bool ChannelPosix::WriteNoLock(MessageVi
+     if (result < 0) {
+       if (errno != EAGAIN &&
+           errno != EWOULDBLOCK
+-#if BUILDFLAG(IS_IOS)
++#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_NETBSD)
+           // On iOS if sendmsg() is trying to send fds between processes and
+           // there isn't enough room in the output buffer to send the fd
+-          // structure over atomically then EMSGSIZE is returned.
++          // structure over atomically then EMSGSIZE is returned. The same
++          // applies to NetBSD as well.
+           //
+           // EMSGSIZE presents a problem since the system APIs can only call
+           // us when there's room in the socket buffer and not when there is
Index: pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc
diff -u /dev/null pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc:1.1
--- /dev/null   Fri Oct  2 13:08:36 2026
+++ pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc        Fri Oct  2 13:08:36 2026
@@ -0,0 +1,51 @@
+$NetBSD: patch-src_3rdparty_chromium_mojo_public_cpp_platform_platform__channel.cc,v 1.1 2026/10/02 13:08:36 kikadf Exp $
+
+* Workaround to the renderer process crash
+
+--- src/3rdparty/chromium/mojo/public/cpp/platform/platform_channel.cc.orig    2026-10-02 06:57:10.694874304 +0000
++++ src/3rdparty/chromium/mojo/public/cpp/platform/platform_channel.cc
+@@ -118,6 +118,32 @@ void CreateChannel(PlatformHandle* local
+   *remote_endpoint = PlatformHandle(std::move(receive));
+ }
+ #elif BUILDFLAG(IS_POSIX)
++#if BUILDFLAG(IS_NETBSD)
++// PR60832 https://gnats.netbsd.org/60832
++void GrowReceiveBufferAbovePeerSendBuffer(int fd, int peer_fd) {
++  int sndbuf = 0;
++  socklen_t len = sizeof(sndbuf);
++  if (getsockopt(peer_fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, &len) != 0 ||
++      sndbuf <= 0) {
++    PLOG(ERROR) << "getsockopt(SO_SNDBUF)";
++    return;
++  }
++  int rcvbuf = 0;
++  len = sizeof(rcvbuf);
++  if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &len) != 0) {
++    PLOG(ERROR) << "getsockopt(SO_RCVBUF)";
++    return;
++  }
++  const int wanted = base::ClampMul(sndbuf, 2);
++  if (rcvbuf >= wanted) {
++    return;
++  }
++  if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &wanted, sizeof(wanted)) != 0) {
++    PLOG(ERROR) << "setsockopt(SO_RCVBUF, " << wanted << ")";
++  }
++}
++#endif  // BUILDFLAG(IS_NETBSD)
++
+ void CreateChannel(PlatformHandle* local_endpoint,
+                    PlatformHandle* remote_endpoint) {
+   int fds[2];
+@@ -127,6 +153,11 @@ void CreateChannel(PlatformHandle* local
+   PCHECK(fcntl(fds[0], F_SETFL, O_NONBLOCK) == 0);
+   PCHECK(fcntl(fds[1], F_SETFL, O_NONBLOCK) == 0);
+ 
++#if BUILDFLAG(IS_NETBSD)
++  GrowReceiveBufferAbovePeerSendBuffer(fds[0], fds[1]);
++  GrowReceiveBufferAbovePeerSendBuffer(fds[1], fds[0]);
++#endif
++
+   *local_endpoint = PlatformHandle(base::ScopedFD(fds[0]));
+   *remote_endpoint = PlatformHandle(base::ScopedFD(fds[1]));
+   DCHECK(local_endpoint->is_valid());
Index: pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc
diff -u /dev/null pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc:1.1
--- /dev/null   Fri Oct  2 13:08:36 2026
+++ pkgsrc/www/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc     Fri Oct  2 13:08:36 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_chromium_third__party_ots_src_src_name.cc,v 1.1 2026/10/02 13:08:36 kikadf Exp $
+
+* Fix ctype abuse
+
+--- src/3rdparty/chromium/third_party/ots/src/src/name.cc.orig 2026-10-02 12:57:12.214658841 +0000
++++ src/3rdparty/chromium/third_party/ots/src/src/name.cc
+@@ -16,7 +16,7 @@ namespace {
+ // We disallow characters outside the URI spec "unreserved characters"
+ // set; any chars outside this set will be replaced by underscore.
+ bool AllowedInPsName(char c) {
+-  return isalnum(c) || std::strchr("-._~", c);
++  return isalnum(static_cast<unsigned char>(c)) || std::strchr("-._~", c);
+ }
+ 
+ bool SanitizePsNameAscii(std::string& name) {