diff --git a/SOURCES/0001-Revert-optimization_guide-ModelExecutionSessionCallb.patch b/SOURCES/0001-Revert-optimization_guide-ModelExecutionSessionCallb.patch new file mode 100644 index 00000000..1b27bf49 --- /dev/null +++ b/SOURCES/0001-Revert-optimization_guide-ModelExecutionSessionCallb.patch @@ -0,0 +1,36 @@ +From db3d8a5e5494cf8951c5aa65c39552f784238b3e Mon Sep 17 00:00:00 2001 +From: tigro +Date: Sun, 9 Feb 2025 20:44:18 +0300 +Subject: [PATCH] Revert + optimization_guide::ModelExecutionSessionCallbackWithLogging callback + +--- + chrome/browser/compose/compose_session.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/chrome/browser/compose/compose_session.cc b/chrome/browser/compose/compose_session.cc +index e456d8c9f2..71c75f805f 100644 +--- a/chrome/browser/compose/compose_session.cc ++++ b/chrome/browser/compose/compose_session.cc +@@ -543,13 +543,11 @@ void ComposeSession::RequestWithSession( + // execution in case request fails. + compose::LogComposeRequestReason(request_reason); + +- optimization_guide::ModelExecutionSessionCallbackWithLogging callback = +- base::BindRepeating(&ComposeSession::ModelExecutionCallback, +- weak_ptr_factory_.GetWeakPtr(), +- std::move(request_timer), request_id_, request_reason, +- is_input_edited); +- optimization_guide::ExecuteModelSessionWithLogging(session_.get(), request, +- callback); ++ session_->ExecuteModel( ++ request, base::BindRepeating(&ComposeSession::ModelExecutionCallback, ++ weak_ptr_factory_.GetWeakPtr(), ++ std::move(request_timer), request_id_, ++ request_reason, is_input_edited)); + } + + void ComposeSession::ComposeRequestTimeout(int id) { +-- +2.48.1 + diff --git a/SPECS/chromium.spec b/SPECS/chromium.spec index 4e9ccd28..a03036f1 100644 --- a/SPECS/chromium.spec +++ b/SPECS/chromium.spec @@ -477,6 +477,8 @@ Patch416: flatpak-Add-initial-sandbox-support.patch Patch417: flatpak-Adjust-paths-for-the-sandbox.patch Patch418: flatpak-Expose-Widevine-into-the-sandbox.patch +# Fix build on el8/el9/fedora40 +Patch599: 0001-Revert-optimization_guide-ModelExecutionSessionCallb.patch # Old Yandex patch Patch600: 0001-Yandex-as-default-search-engine.patch # Yandex Search by default @@ -1283,6 +1285,11 @@ sed -i 's/std::string data_dir_basename = "chromium"/std::string data_dir_basena %patch -P418 -p1 -b .flatpak-widevine %endif +%if 0%{?rhel} == 8 || 0%{?rhel} == 9 || 0%{?fedora} < 41 +%patch -P599 -p1 -b .Revert-optimization_guide-ModelExecutionSessionCallb +%endif + +%patch -P601 -p1 -b .Added-Russian-description-and-summary-for-gnome-soft %if ! %{with gost} %patch -P602 -p1 -b .Yandex-as-default-search-engine %else