Fix build error due to old clang18 in el 8/9 and f40

i8e
Arkady L. Shane 2 weeks ago
parent df52d2c831
commit 69abc07631
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -0,0 +1,12 @@
diff -up chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc.me chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc
--- chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc.me 2025-02-10 14:16:34.810693753 +0100
+++ chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc 2025-02-10 14:16:39.747791800 +0100
@@ -543,7 +543,7 @@ void ComposeSession::RequestWithSession(
// execution in case request fails.
compose::LogComposeRequestReason(request_reason);
- optimization_guide::ModelExecutionSessionCallbackWithLogging callback =
+ optimization_guide::ModelExecutionSessionCallbackWithLogging<optimization_guide::proto::ComposeLoggingData> callback =
base::BindRepeating(&ComposeSession::ModelExecutionCallback,
weak_ptr_factory_.GetWeakPtr(),
std::move(request_timer), request_id_, request_reason,

@ -372,6 +372,7 @@ Patch307: chromium-133-el8-atk-compiler-error.patch
Patch308: chromium-132-el8-unsupport-clang-flags.patch Patch308: chromium-132-el8-unsupport-clang-flags.patch
Patch309: chromium-132-el8-unsupport-rustc-flags.patch Patch309: chromium-132-el8-unsupport-rustc-flags.patch
Patch310: chromium-132-el8-clang18-build-error.patch Patch310: chromium-132-el8-clang18-build-error.patch
Patch311: chromium-133-clang18-template.patch
# enable fstack-protector-strong # enable fstack-protector-strong
Patch312: chromium-123-fstack-protector-strong.patch Patch312: chromium-123-fstack-protector-strong.patch
@ -1172,6 +1173,9 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena
%patch -P309 -p1 -b .el8-unsupport-rustc-flags %patch -P309 -p1 -b .el8-unsupport-rustc-flags
%patch -P310 -p1 -b .el8-clang18-build-error %patch -P310 -p1 -b .el8-clang18-build-error
%endif %endif
%if 0%{?rhel} == 8 || 0%{?rhel} == 9 || 0%{?fedora} == 40
%patch -P311 -p1 -b .clang18-template
%endif
%patch -P312 -p1 -b .fstack-protector-strong %patch -P312 -p1 -b .fstack-protector-strong
@ -1792,9 +1796,6 @@ popd
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/managed mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/managed
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/recommended mkdir -p %{buildroot}%{_sysconfdir}/%{name}/policies/recommended
cp -a out/Release/gen/chrome/app/policy/common/html/en-US/*.html .
cp -a out/Release/gen/chrome/app/policy/linux/examples/chrome.json .
%if %{with gost} %if %{with gost}
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/
tar xavf %{SOURCE103} -C %{buildroot}%{_datadir}/icons/hicolor/ tar xavf %{SOURCE103} -C %{buildroot}%{_datadir}/icons/hicolor/

Loading…
Cancel
Save