mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 10:02:47 +00:00
%global rust_prefix %(echo /opt/rust-*0
update to 125.0.6422.76 fix build llvm18 ,ninja 1.12.1 (rosa2023)
This commit is contained in:
parent
d616e4556e
commit
32003d109a
5 changed files with 52 additions and 27 deletions
4
.abf.yml
4
.abf.yml
|
@ -1,6 +1,6 @@
|
|||
sources:
|
||||
chromium-124.0.6367.118.tar.xz: a6b3e27c9154df1cc31f39122eaef5f1167cbe9d
|
||||
chromium-gost-c4fd120cad76025be8a17a035968aece4f27bbaf.tar.gz: e71cdf5b0c30289a5264ff5a2b078c23f6331ce4
|
||||
chromium-125.0.6422.76.tar.xz: cf5a478751ceab78da124fa4197cbb78cca8a466
|
||||
chromium-gost-17ccfa0e7ef4b330f5787b6871c44260cfe4afd3.tar.gz: f35fa98df88286bb04c70bcfb507bb43c797fbf2
|
||||
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
|
||||
icons-2012.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
|
||||
msspi-192d2662e058453313e6f824099ace60ca6fd242.tar.gz: 21dcea9a69b37a1c3bd533ce2a62f50bd160cfb5
|
||||
|
|
|
@ -7,19 +7,18 @@ Remove voice search button from chrome://new-tab-page.
|
|||
Firstly, Google APIs keys do not work now and this button also does not work.
|
||||
Secondly, we use Yandex as the default search for most users, and Google's voice search is irrelevant.
|
||||
|
||||
--- a/ui/webui/resources/cr_components/omnibox/realbox.html
|
||||
+++ b/ui/webui/resources/cr_components/omnibox/realbox.html
|
||||
@@ -291,13 +291,6 @@
|
||||
<cr-realbox-icon id="icon" match="[[selectedMatch_]]"
|
||||
default-icon="[[realboxIcon_]]" in-searchbox>
|
||||
</cr-realbox-icon>
|
||||
- <div class="realbox-icon-button-container voice"
|
||||
- hidden="[[!realboxChromeRefreshTheming]]">
|
||||
- <button id="voiceSearchButton" class="realbox-icon-button"
|
||||
- on-click="onVoiceSearchClick_"
|
||||
- title="[[i18n('voiceSearchButtonLabel')]]">
|
||||
- </button>
|
||||
- </div>
|
||||
<div class="realbox-icon-button-container lens"
|
||||
hidden="[[!realboxChromeRefreshTheming]]">
|
||||
--- a/ui/webui/resources/cr_components/searchbox/realbox.html
|
||||
+++ b/ui/webui/resources/cr_components/searchbox/realbox.html
|
||||
@@ -316,12 +316,6 @@
|
||||
</template>
|
||||
<template is="dom-if" if="[[realboxChromeRefreshTheming]]">
|
||||
<template is="dom-if" if="[[realboxVoiceSearchEnabled_]]">
|
||||
- <div class="realbox-icon-button-container voice">
|
||||
- <button id="voiceSearchButton" class="realbox-icon-button"
|
||||
- on-click="onVoiceSearchClick_"
|
||||
- title="[[i18n('voiceSearchButtonLabel')]]">
|
||||
- </button>
|
||||
- </div>
|
||||
</template>
|
||||
<template is="dom-if" if="[[realboxLensSearchEnabled_]]">
|
||||
<div class="realbox-icon-button-container lens">
|
||||
|
|
|
@ -40,21 +40,23 @@ if they want to use their own API keys.
|
|||
<template is="dom-if" if="[[shouldShowAvatarRow_]]">
|
||||
<div class="cr-row first two-line" id="avatar-row">
|
||||
<div id="avatar-container">
|
||||
--- a/chrome/browser/resources/welcome/signin_view.html
|
||||
+++ b/chrome/browser/resources/welcome/signin_view.html
|
||||
@@ -9,6 +9,7 @@
|
||||
outline: none;
|
||||
}
|
||||
</style>
|
||||
--- a/chrome/browser/resources/welcome/landing_view.html.ts
|
||||
+++ b/chrome/browser/resources/welcome/landing_view.html.ts
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
export function getHtml(this: LandingViewElement) {
|
||||
return html`<!--_html_template_start_-->
|
||||
+<!--
|
||||
<div id="container">
|
||||
<onboarding-background id="background" class="fade-in">
|
||||
</onboarding-background>
|
||||
@@ -25,3 +26,4 @@
|
||||
@@ -24,5 +25,6 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
+-->
|
||||
<!--_html_template_end_-->`;
|
||||
}
|
||||
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
@@ -186,9 +186,7 @@
|
||||
|
|
11
chromium-125-ninja-1-12.patch
Normal file
11
chromium-125-ninja-1-12.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
diff -up chromium-124.0.6367.155/chrome/browser/devtools/BUILD.gn.17~ chromium-124.0.6367.155/chrome/browser/devtools/BUILD.gn
|
||||
--- chromium-124.0.6367.155/chrome/browser/devtools/BUILD.gn.17~ 2024-05-09 22:16:35.199838703 +0200
|
||||
+++ chromium-124.0.6367.155/chrome/browser/devtools/BUILD.gn 2024-05-09 22:17:27.820476430 +0200
|
||||
@@ -113,6 +113,7 @@ static_library("devtools") {
|
||||
"//chrome/browser/autofill:autofill",
|
||||
"//components/autofill/content/browser:browser",
|
||||
"//components/autofill/core/browser:browser",
|
||||
+ "//components/enterprise/buildflags",
|
||||
"//components/paint_preview/buildflags:buildflags",
|
||||
"//content/public/browser",
|
||||
"//net",
|
|
@ -56,7 +56,7 @@
|
|||
# GOST patches and sources
|
||||
# Using commit hashes because upstream often puts tags long after making changes
|
||||
# (they wait for builds to finish to make a new "release" with binary packages)
|
||||
%define chromium_gost_commit c4fd120cad76025be8a17a035968aece4f27bbaf
|
||||
%define chromium_gost_commit 17ccfa0e7ef4b330f5787b6871c44260cfe4afd3
|
||||
%define msspi_commit 192d2662e058453313e6f824099ace60ca6fd242
|
||||
%define _gostsourcedir %{_builddir}/chromium-gost
|
||||
|
||||
|
@ -108,7 +108,7 @@
|
|||
|
||||
Summary: A fast web browser based on the Blink engine
|
||||
Name: chromium-browser-stable
|
||||
Version: 124.0.6367.118
|
||||
Version: 125.0.6422.76
|
||||
Release: 1
|
||||
License: BSD, LGPL
|
||||
Group: Networking/WWW
|
||||
|
@ -169,7 +169,7 @@ Patch659: chromium-vaapi.patch
|
|||
# https://chromium-review.googlesource.com/c/chromium/src/+/4883576
|
||||
Patch660: chromium-119-revert-don_t-redefine-ATSPI-version-macros.patch
|
||||
Patch662: libclang-17.patch
|
||||
|
||||
Patch663: chromium-125-ninja-1-12.patch
|
||||
BuildRequires: bison
|
||||
%if %{with alternative_llvm}
|
||||
BuildRequires: llvm%{llvm_ver}
|
||||
|
@ -439,6 +439,19 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
|
|||
|
||||
%autopatch -p1
|
||||
|
||||
%if %{mdvver} == 202310
|
||||
%patch658 -p1 -R
|
||||
#%%%patch662 -p1 -R
|
||||
|
||||
# ninja 1.12 error
|
||||
sed -i -e "s|'-w', 'dupbuild=err',||g" tools/gn/bootstrap/bootstrap.py
|
||||
|
||||
# llvm18 rosa2023
|
||||
sed -i -e "s|clang_version == \"17\"|clang_version == \"18\"|" build/config/clang/BUILD.gn
|
||||
%else
|
||||
%patch663 -p1 -R
|
||||
%endif
|
||||
|
||||
%if %{with alternative_llvm}
|
||||
# search libs compiler-rt
|
||||
sed -i -e "s|rosa-linux-gnu|unknown-linux-gnu|g" build/config/clang/BUILD.gn
|
||||
|
|
Loading…
Add table
Reference in a new issue