Skip to content

Commit 9e5b901

Browse files
committedApr 27, 2025
Fix build with gperf >= 3.2
1 parent 1c4e6f7 commit 9e5b901

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed
 

‎qt6-qtwebengine.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Patch2: qt6-qtwebengine-6.2.2-workaround-for-__fp16-build-failure-aarch64.patch
2828
# https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/641190
2929
Patch3: a55ef9d.diff
3030
Patch4: qtwebengine-6.5.0-aarch64-compile.patch
31+
Patch5: qtwebengine-6.9.0-gperf-3.2+.patch
3132
#Patch6: qtwebengine-6.7.0-compile.patch
3233
# Try to restore a sufficient amount of binary compatibility between the
3334
# internalized copy of absl (which can't be disabled yet) and the system

‎qtwebengine-6.9.0-gperf-3.2+.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff -up qtwebengine-everywhere-src-6.9.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py.omv~ qtwebengine-everywhere-src-6.9.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py
2+
--- qtwebengine-everywhere-src-6.9.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py.omv~ 2025-04-27 02:31:46.711323894 +0200
3+
+++ qtwebengine-everywhere-src-6.9.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py 2025-04-27 02:32:14.122458159 +0200
4+
@@ -37,8 +37,9 @@ def generate_gperf(gperf_path, gperf_inp
5+
# -Wimplicit-fallthrough needs an explicit fallthrough statement,
6+
# so replace gperf's /*FALLTHROUGH*/ comment with the statement.
7+
# https://savannah.gnu.org/bugs/index.php?53029
8+
- gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
9+
- ' [[fallthrough]];')
10+
+ # This is no longer needed with gperf >= 3.2
11+
+ #gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
12+
+ # ' [[fallthrough]];')
13+
# -Wpointer-to-int-cast warns about casting pointers to smaller ints
14+
# Replace {(int)(long)&(foo), bar} with
15+
# {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}

0 commit comments

Comments
 (0)
Please sign in to comment.