pkgsrc-WIP-changes archive

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

qt6-qtwebengine: gperf fix, from chromium



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Mon Apr 14 07:39:01 2025 +1200
Changeset:	848e1d9f57e434a39eb4245ae9051f84c9e9a521

Modified Files:
	qt6-qtwebengine/Makefile
	qt6-qtwebengine/distinfo
Added Files:
	qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py

Log Message:
qt6-qtwebengine: gperf fix, from chromium

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

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

diffstat:
 qt6-qtwebengine/Makefile                           |  2 +-
 qt6-qtwebengine/distinfo                           |  1 +
 ...rd__party_blink_renderer_build_scripts_gperf.py | 33 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diffs:
diff --git a/qt6-qtwebengine/Makefile b/qt6-qtwebengine/Makefile
index 62e6286627..19c2072f91 100644
--- a/qt6-qtwebengine/Makefile
+++ b/qt6-qtwebengine/Makefile
@@ -10,7 +10,7 @@ CMAKE_GENERATOR=		ninja
 
 .include "../../x11/qt6-qtbase/Makefile.common"
 
-TOOL_DEPENDS+=		gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+=		gperf>=3.2:../../devel/gperf
 TOOL_DEPENDS+=		ninja-build-[0-9]*:../../devel/ninja-build
 TOOL_DEPENDS+=		nodejs-[0-9]*:../../lang/nodejs
 TOOL_DEPENDS+=		${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
diff --git a/qt6-qtwebengine/distinfo b/qt6-qtwebengine/distinfo
index 811ced13fb..55dcf06020 100644
--- a/qt6-qtwebengine/distinfo
+++ b/qt6-qtwebengine/distinfo
@@ -691,6 +691,7 @@ SHA1 (patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__pre
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h) = c80717444fbb1996221780cc825cc001497dc5bd
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_public_platform_web__vector.h) = 891a92e74d3b7898818f0161cc9ec903120f7a6b
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py) = 35a023f27e740f863b5edc3a964e1c906c6d7931
+SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py) = e454e41d2e0429e4c6914cc2d01373c619f94c6c
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_run__with__pythonpath.py) = e0d41b7dc611fd9bd34a71ed96a13f42a9455ce4
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc) = a00bef8e201666ae078324387dbbe09df7db483c
 SHA1 (patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc) = da609482ea0a82e6b9bcc95e666a143b6e6f0680
diff --git a/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py b/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py
new file mode 100644
index 0000000000..dfecff2614
--- /dev/null
+++ b/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_blink_renderer_build_scripts_gperf.py
@@ -0,0 +1,33 @@
+$NetBSD$
+
+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
+
+--- src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py.orig	2025-03-18 19:28:59.000000000 +0000
++++ src/3rdparty/chromium/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