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: fix build failure on rhel8
Date: Fri, 07 Aug 2026 16:04:59 GMT [thread overview]
Message-ID: <178611869956.1.10076912491179949085.rpms-chromium-edd83a7cb15a@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/chromium
Branch : epel9-next
Commit : edd83a7cb15ac1954774d915027a3071fdd24518
Author : Than Ngo <than@redhat.com>
Date : 2023-04-06T17:52:21+02:00
Stats : +73/-20 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/chromium/c/edd83a7cb15ac1954774d915027a3071fdd24518?branch=epel9-next
Log:
fix build failure on rhel8
---
diff --git a/chromium-112-feed_protos.patch b/chromium-112-feed_protos.patch
index 11a90e5..222d439 100644
--- a/chromium-112-feed_protos.patch
+++ b/chromium-112-feed_protos.patch
@@ -1,19 +1,66 @@
-diff -up chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc.me chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc
---- chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc.me 2023-03-31 20:33:32.129658455 +0200
-+++ chromium-112.0.5615.49/components/feed/core/v2/protocol_translator.cc 2023-03-31 20:41:19.593822038 +0200
-@@ -10,7 +10,6 @@
- #include "base/logging.h"
- #include "base/time/time.h"
- #include "components/feed/core/proto/v2/packing.pb.h"
--#include "components/feed/core/proto/v2/wire/chrome_feed_response_metadata.pb.h"
- #include "components/feed/core/proto/v2/wire/data_operation.pb.h"
- #include "components/feed/core/proto/v2/wire/feature.pb.h"
- #include "components/feed/core/proto/v2/wire/feed_response.pb.h"
-@@ -19,7 +18,6 @@
- #include "components/feed/core/proto/v2/wire/stream_structure.pb.h"
- #include "components/feed/core/proto/v2/wire/token.pb.h"
- #include "components/feed/core/v2/feedstore_util.h"
--#include "components/feed/core/v2/ios_shared_experiments_translator.h"
- #include "components/feed/core/v2/metrics_reporter.h"
- #include "components/feed/core/v2/proto_util.h"
- #include "components/feed/feed_feature_list.h"
+Split out ios shared feed protos
+
+chrome_feed_response_metadata.proto is needed in ios so split it out
+so it can be separately compiled into ios.
+
+Change-Id: I9e5e50f5e1742258f5c8197d54f0c610b56daf4b
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4266050
+Commit-Queue: edchin <edchin@google.com>
+Reviewed-by: Dan H <harringtond@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1107357}
+diff --git a/components/feed/core/proto/BUILD.gn b/components/feed/core/proto/BUILD.gn
+index 51916e08..f0ec531 100644
+--- a/components/feed/core/proto/BUILD.gn
++++ b/components/feed/core/proto/BUILD.gn
+@@ -22,7 +22,6 @@
+ "v2/wire/capabilities_debug_data.proto",
+ "v2/wire/capability.proto",
+ "v2/wire/chrome_client_info.proto",
+- "v2/wire/chrome_feed_response_metadata.proto",
+ "v2/wire/chrome_fulfillment_info.proto",
+ "v2/wire/client_info.proto",
+ "v2/wire/client_user_profiles.proto",
+@@ -69,6 +68,10 @@
+ ]
+ }
+
++proto_library("proto_ios_shared_v2") {
++ sources = [ "v2/wire/chrome_feed_response_metadata.proto" ]
++}
++
+ if (is_android) {
+ proto_java_library("proto_java_v2") {
+ proto_path = "../../../../"
+diff --git a/components/feed/core/v2/BUILD.gn b/components/feed/core/v2/BUILD.gn
+index ab5efcc4..b1d3fb4 100644
+--- a/components/feed/core/v2/BUILD.gn
++++ b/components/feed/core/v2/BUILD.gn
+@@ -172,6 +172,7 @@
+ ":ios_shared",
+ "//base",
+ "//components/feed/core/common:feed_core_common",
++ "//components/feed/core/proto:proto_ios_shared_v2",
+ "//components/feed/core/proto:proto_v2",
+ ]
+ }
+@@ -187,7 +188,7 @@
+ deps = [
+ "//base",
+ "//components/feed/core/common:feed_core_common",
+- "//components/feed/core/proto:proto_v2",
++ "//components/feed/core/proto:proto_ios_shared_v2",
+ "//components/prefs",
+ ]
+ }
+diff --git a/components/feed/core/v2/public/ios/BUILD.gn b/components/feed/core/v2/public/ios/BUILD.gn
+index 106f089a..59bdd2b 100644
+--- a/components/feed/core/v2/public/ios/BUILD.gn
++++ b/components/feed/core/v2/public/ios/BUILD.gn
+@@ -25,7 +25,6 @@
+ deps = [
+ ":feed_ios_public",
+ "//base/test:test_support",
+- "//components/feed/core/v2:feed_core_v2",
+ "//components/prefs",
+ "//components/prefs:test_support",
+ "//testing/gmock",
diff --git a/chromium.spec b/chromium.spec
index ccf944b..60b81dc 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -954,7 +954,7 @@ udev.
%patch -P107 -p1 -b .el7-extra-operator-equalequal
%endif
-%patch -P108 -p1 -b .chrome_feed_response_metadata
+%patch -P108 -p1 -R -b .chrome_feed_response_metadata
%patch -P130 -p1 -b .VirtualCursor-std-layout
@@ -1121,6 +1121,12 @@ CHROMIUM_CORE_GN_DEFINES+=' use_gold=false'
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
%endif
+# clang =< 14 and C++20, linker errors std::u16string
+# build failure on rhel8
+%if 0%{?rhel} == 8
+CHROMIUM_CORE_GN_DEFINES+=' use_cxx17=true'
+%endif
+
CHROMIUM_CORE_GN_DEFINES+=' icu_use_data_file=true'
CHROMIUM_CORE_GN_DEFINES+=' target_os="linux"'
CHROMIUM_CORE_GN_DEFINES+=' current_os="linux"'
reply other threads:[~2026-08-07 16:04 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=178611869956.1.10076912491179949085.rpms-chromium-edd83a7cb15a@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