public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Than Ngo <than@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/chromium] epel9-next: Prevent FTBFS due to changes in gperf 3.2 generated code in F43.
Date: Fri, 07 Aug 2026 16:07:37 GMT [thread overview]
Message-ID: <178611885756.1.14153968196398891606.rpms-chromium-f3b7db492ce4@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/chromium
Branch : epel9-next
Commit : f3b7db492ce4cff869292d0d3ff68c0d760f0e48
Author : Than Ngo <than@redhat.com>
Date : 2025-04-12T15:11:17+02:00
Stats : +38/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/chromium/c/f3b7db492ce4cff869292d0d3ff68c0d760f0e48?branch=epel9-next
Log:
Prevent FTBFS due to changes in gperf 3.2 generated code in F43.
---
diff --git a/chromium-135-gperf.patch b/chromium-135-gperf.patch
new file mode 100644
index 0000000..f404371
--- /dev/null
+++ b/chromium-135-gperf.patch
@@ -0,0 +1,35 @@
+From b552a86d494c1acf9c3472b8e5f00d90f9d3a704 Mon Sep 17 00:00:00 2001
+From: Daniel Richard G <iskunk@gmail.com>
+Date: Thu, 10 Apr 2025 04:35:40 -0400
+Subject: [PATCH] Don't apply /*FALLTHROUGH*/ edit to gperf 3.2 output
+
+The gperf issue at https://savannah.gnu.org/bugs/index.php?53029
+has been resolved as of the 3.2 release, and not only is the
+/*FALLTHROUGH*/ comment replacement no longer needed, it now
+breaks the build with "error: fallthrough annotation does not
+directly precede switch label". Only do the edit for 3.1.
+
+Bug: None
+Change-Id: I1f12a2a685b62d0dedb4298bc171ab4c94ec6b47
+---
+
+diff --git a/third_party/blink/renderer/build/scripts/gperf.py b/third_party/blink/renderer/build/scripts/gperf.py
+index 42630d3..0df5abd 100644
+--- a/third_party/blink/renderer/build/scripts/gperf.py
++++ b/third_party/blink/renderer/build/scripts/gperf.py
+@@ -35,10 +35,11 @@
+ # 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]];')
++ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
++ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
++ if '/* C++ code produced by gperf version 3.1 */' in 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
+ # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}
diff --git a/chromium.spec b/chromium.spec
index 0d9f6f5..f2e1557 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -453,6 +453,8 @@ Patch502: flatpak-Expose-Widevine-into-the-sandbox.patch
# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4636
# https://chromium-review.googlesource.com/c/chromium/src/+/6421030
Patch600: chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
+# https://chromium-review.googlesource.com/c/chromium/src/+/6445471
+Patch601: chromium-135-gperf.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/
@@ -1141,6 +1143,7 @@ Qt6 UI for chromium.
# Upstream patches
%patch -P600 -p1 -b .add-cfi-suppressions-for-pipewire-functions
+%patch -P601 -p1 -b .gperf-3.2
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
reply other threads:[~2026-08-07 16:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178611885756.1.14153968196398891606.rpms-chromium-f3b7db492ce4@fedoraproject.org \
--to=than@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox