CVS commit: pkgsrc/www/chromium

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 10 20:07:52 UTC 2025

Modified Files:
        pkgsrc/www/chromium: Makefile distinfo
Added Files:
        pkgsrc/www/chromium/patches:
            patch-third__party_blink_renderer_build_scripts_gperf.py

Log Message:
chromium: fix build with gperf 3.2 and depend on it

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/chromium/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/chromium/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py

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

Modified files:

Index: pkgsrc/www/chromium/Makefile
diff -u pkgsrc/www/chromium/Makefile:1.4 pkgsrc/www/chromium/Makefile:1.5
--- pkgsrc/www/chromium/Makefile:1.4    Tue Feb 18 10:33:22 2025
+++ pkgsrc/www/chromium/Makefile        Thu Apr 10 20:07:52 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2025/02/18 10:33:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2025/04/10 20:07:52 wiz Exp $
 
 DISTNAME=                      chromium-${VERSION}
 VERSION=                       131.0.6778.204
-PKGREVISION=                   4
+PKGREVISION=                   5
 CATEGORIES=                    www
 MASTER_SITES=                  https://commondatastorage.googleapis.com/chromium-browser-official/
 EXTRACT_SUFX_C=                        .tar.xz
@@ -42,7 +42,7 @@ CHECK_PORTABILITY_SKIP+=      third_party/rus
 CHECK_PORTABILITY_SKIP+=       v8/tools/run-llprof.sh
 CHECK_PORTABILITY_SKIP+=       v8/tools/profiling/run-llprof.sh
 
-TOOL_DEPENDS+=                 gperf>=3.0.1:../../devel/gperf
+TOOL_DEPENDS+=                 gperf>=3.2:../../devel/gperf
 TOOL_DEPENDS+=                 nasm-[0-9]*:../../devel/nasm
 TOOL_DEPENDS+=                 ninja-build-[0-9]*:../../devel/ninja-build
 TOOL_DEPENDS+=                 ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib

Index: pkgsrc/www/chromium/distinfo
diff -u pkgsrc/www/chromium/distinfo:1.1 pkgsrc/www/chromium/distinfo:1.2
--- pkgsrc/www/chromium/distinfo:1.1    Thu Feb  6 09:57:37 2025
+++ pkgsrc/www/chromium/distinfo        Thu Apr 10 20:07:52 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2025/02/06 09:57:37 wiz Exp $
+$NetBSD: distinfo,v 1.2 2025/04/10 20:07:52 wiz Exp $
 
 BLAKE2s (chromium-131.0.6778.204-testdata.tar.xz) = c8e99fa924e08b74fe4913b13ee1030ffe96b5dfb5da0f5afc0a8e0adcf22d29
 SHA512 (chromium-131.0.6778.204-testdata.tar.xz) = f6b71812815d0988f054d998a67ee95b9190cbdc4269ffb3fd99fa088ad6ce77b652a5f569f8078274c0aaaba1a8eecb4de84bf8d7dd360def152787640961ba
@@ -1068,6 +1068,7 @@ SHA1 (patch-third__party_blink_public_co
 SHA1 (patch-third__party_blink_public_platform_platform.h) = e048996eb704dadec1ef2ab8b524659610e9b8d1
 SHA1 (patch-third__party_blink_public_platform_web__vector.h) = 2153b41cca994cb9232fccbca3d3e21d51240652
 SHA1 (patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 2a14e70b3abf70caba7f10e89b125223d9a11465
+SHA1 (patch-third__party_blink_renderer_build_scripts_gperf.py) = 48eb40f6767acca98a55edbc2aea48c9d2f0d62c
 SHA1 (patch-third__party_blink_renderer_build_scripts_run__with__pythonpath.py) = 94a55da4e044728eb857917c28109fddef1e8bd6
 SHA1 (patch-third__party_blink_renderer_controller_blink__initializer.cc) = e075b8c26ffba4ec9ade861e969597f16628e206
 SHA1 (patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc) = a51d6f2acff5c5a85d8bb7f58c45ffa91e9d1125

Added files:

Index: pkgsrc/www/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
diff -u /dev/null pkgsrc/www/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py:1.1
--- /dev/null   Thu Apr 10 20:07:52 2025
+++ pkgsrc/www/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py        Thu Apr 10 20:07:52 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-third__party_blink_renderer_build_scripts_gperf.py,v 1.1 2025/04/10 20:07:52 wiz Exp $
+
+Remove workarounds that are not needed any longer with gperf 3.2.
+https://bugs.gentoo.org/953436
+https://bugs.gentoo.org/attachment.cgi?id=924201&action=diff
+
+--- third_party/blink/renderer/build/scripts/gperf.py.orig     2025-04-10 10:26:39.919526849 +0000
++++ third_party/blink/renderer/build/scripts/gperf.py
+@@ -28,24 +28,6 @@ def generate_gperf(gperf_path, gperf_inp
+             stdout=subprocess.PIPE,
+             universal_newlines=True)
+         gperf_output = gperf.communicate(gperf_input)[0]
+-        # Massage gperf output to be more palatable for modern compilers.
+-        # TODO(thakis): Upstream these to gperf so we don't need massaging.
+-        # `register` is deprecated in C++11 and removed in C++17, so remove
+-        # it from gperf's output.
+-        # https://savannah.gnu.org/bugs/index.php?53028
+-        gperf_output = re.sub(r'\bregister ', '', gperf_output)
+-        # -Wimplicit-fallthrough needs an explicit fallthrough statement,
+-        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
+-        # https://savannah.gnu.org/bugs/index.php?53029
+-        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
+-                                            '  [[fallthrough]];')
+-        # -Wpointer-to-int-cast warns about casting pointers to smaller ints
+-        # Replace {(int)(long)&(foo), bar} with
+-        # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
+-        gperf_output = re.sub(
+-            r'\(int\)\(long\)(.*?),',
+-            r'static_cast<int>(reinterpret_cast<uintptr_t>(\1)),',
+-            gperf_output)
+         script = 'third_party/blink/renderer/build/scripts/gperf.py'
+         return '// Generated by %s\n' % script + gperf_output
+     except OSError: