diff options
| author | Ionen Wolkens <ionen@gentoo.org> | 2025-04-18 06:52:30 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2025-04-18 06:59:09 -0400 |
| commit | 1b46554a96860af16180c43d7cc6b8ec38d36917 (patch) | |
| tree | 2e1f2e88c0ff151a5b55b1c2589e9993bcaf8624 /dev-qt/qtwebengine/files | |
| parent | c27a815bde9912260d8f2b2a660cfc8b63400154 (diff) | |
| download | gentoo-1b46554a96860af16180c43d7cc6b8ec38d36917.tar.gz gentoo-1b46554a96860af16180c43d7cc6b8ec38d36917.tar.bz2 gentoo-1b46554a96860af16180c43d7cc6b8ec38d36917.zip | |
dev-qt/qtwebengine: backport build fix for with gperf 3.2
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtwebengine/files')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch new file mode 100644 index 000000000000..b44934ab59d3 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch @@ -0,0 +1,26 @@ +Patch status: fixed in >=chromium-137.0.7126.0 + +A old workaround for a gperf-3.1 issue[1] breaks building with the +now fixed gperf-3.2, backport the conditional check[2] which should +work with either. + +[1] https://savannah.gnu.org/bugs/index.php?53029 +[2] https://crrev.com/f8f21fb4aa01f75acbb12abf5ea8c263c6817141 +--- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -36,8 +36,11 @@ + 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]];') ++ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement. ++ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2) ++ if re.search( ++ r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/', ++ gperf_output): ++ gperf_output = gperf_output.replace('/*FALLTHROUGH*/', ++ ' [[fallthrough]];') + # -Wpointer-to-int-cast warns about casting pointers to smaller ints + # Replace {(int)(long)&(foo), bar} with |