pkgsrc-WIP-changes archive

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

chromium: sync gperf fix from pkgsrc



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Fri Apr 11 15:13:20 2025 +0200
Changeset:	c1ad25ccd4e01133e6c5562d945e74ba2f005cd8

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

Log Message:
chromium: sync gperf fix from pkgsrc

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

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

diffstat:
 chromium/Makefile                                  |  4 +--
 chromium/distinfo                                  |  1 +
 ...rd__party_blink_renderer_build_scripts_gperf.py | 33 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diffs:
diff --git a/chromium/Makefile b/chromium/Makefile
index 2f92a5e850..bafefb0b7a 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=			chromium-${VERSION}
 VERSION=			131.0.6778.204
-PKGREVISION=			5
+PKGREVISION=			6
 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/rust-toolchain/lib/rustlib/src/rust/vendor/
 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
diff --git a/chromium/distinfo b/chromium/distinfo
index 25aef74dbc..68ecee332d 100644
--- a/chromium/distinfo
+++ b/chromium/distinfo
@@ -1068,6 +1068,7 @@ SHA1 (patch-third__party_blink_public_common_renderer__preferences_renderer__pre
 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
diff --git a/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py b/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 0000000000..c31769e740
--- /dev/null
+++ b/chromium/patches/patch-third__party_blink_renderer_build_scripts_gperf.py
@@ -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:


Home | Main Index | Thread Index | Old Index