automatic version update by autodist [release 131.0.6778.85-1mamba;Sat Nov 23 2024]
This commit is contained in:
parent
47fcf03080
commit
6497472294
@ -1,18 +0,0 @@
|
|||||||
diff --git a/google_apis/google_api_keys-inc.cc b/google_apis/google_api_keys-inc.cc
|
|
||||||
index 4d13e697a54d..61aac7b48662 100644
|
|
||||||
--- a/google_apis/google_api_keys-inc.cc
|
|
||||||
+++ b/google_apis/google_api_keys-inc.cc
|
|
||||||
@@ -193,11 +193,11 @@ class APIKeyCache {
|
|
||||||
std::string default_client_id = CalculateKeyValue(
|
|
||||||
GOOGLE_DEFAULT_CLIENT_ID,
|
|
||||||
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
|
|
||||||
- nullptr, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
+ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
std::string default_client_secret = CalculateKeyValue(
|
|
||||||
GOOGLE_DEFAULT_CLIENT_SECRET,
|
|
||||||
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
|
|
||||||
- nullptr, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
|
|
||||||
|
|
||||||
// We currently only allow overriding the baked-in values for the
|
|
||||||
// default OAuth2 client ID and secret using a command-line
|
|
35
chromium-131.0.6778.85-const-atomicstring-conversion.patch
Normal file
35
chromium-131.0.6778.85-const-atomicstring-conversion.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matt Jolly <kangie@gentoo.org>
|
||||||
|
Date: Sat, 12 Oct 2024 13:45:37 +1000
|
||||||
|
Subject: [PATCH] Convert 'Const AtomicString' to 'const char *'.
|
||||||
|
|
||||||
|
I don't know why this is suddenly required?
|
||||||
|
--- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||||
|
+++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
|
||||||
|
@@ -323,7 +323,10 @@ void TextCodecICU::CreateICUConverter() const {
|
||||||
|
DCHECK(!converter_icu_);
|
||||||
|
|
||||||
|
#if defined(USING_SYSTEM_ICU)
|
||||||
|
- const char* name = encoding_.GetName();
|
||||||
|
+ //convert to WTF::String to use existing `const char *` dependent functions
|
||||||
|
+ WTF::String nameString = encoding_.GetName();
|
||||||
|
+ std::string nameUtf8 = nameString.Utf8();
|
||||||
|
+ const char* name = nameUtf8.c_str();
|
||||||
|
needs_gbk_fallbacks_ =
|
||||||
|
name[0] == 'G' && name[1] == 'B' && name[2] == 'K' && !name[3];
|
||||||
|
#endif
|
||||||
|
@@ -448,7 +451,10 @@ String TextCodecICU::Decode(base::span<const uint8_t> data,
|
||||||
|
// <http://bugs.webkit.org/show_bug.cgi?id=17014>
|
||||||
|
// Simplified Chinese pages use the code A3A0 to mean "full-width space", but
|
||||||
|
// ICU decodes it as U+E5E5.
|
||||||
|
- if (!strcmp(encoding_.GetName(), "GBK")) {
|
||||||
|
+ // Convert AtomicString to String
|
||||||
|
+ WTF::String nameString = encoding_.GetName();
|
||||||
|
+ std::string nameUtf8 = nameString.Utf8();
|
||||||
|
+ if (!strcmp(nameUtf8.c_str(), "GBK")) {
|
||||||
|
if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
|
||||||
|
resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
|
||||||
|
// Make GBK compliant to the encoding spec and align with GB18030
|
||||||
|
--
|
||||||
|
2.46.2
|
||||||
|
|
32
chromium-131.0.6778.85-unbundle-add-enable_freetype.patch
Normal file
32
chromium-131.0.6778.85-unbundle-add-enable_freetype.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From 88676c640928fd2dce56a46c1c3adb62ac349697 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "lauren n. liberda" <lauren@selfisekai.rocks>
|
||||||
|
Date: Thu, 24 Oct 2024 17:54:35 +0000
|
||||||
|
Subject: [PATCH] [unbundle] add enable_freetype
|
||||||
|
|
||||||
|
fixes freetype unbundle after https://crrev.com/c/5832411
|
||||||
|
|
||||||
|
Bug: none
|
||||||
|
Change-Id: If5573d2c0e833ef3c18b505c004b3fa997f903a0
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5952222
|
||||||
|
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
||||||
|
Commit-Queue: Lei Zhang <thestig@chromium.org>
|
||||||
|
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/main@{#1373430}
|
||||||
|
---
|
||||||
|
build/linux/unbundle/freetype.gn | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/build/linux/unbundle/freetype.gn b/build/linux/unbundle/freetype.gn
|
||||||
|
index 73f9666833e5..c780c630d55b 100644
|
||||||
|
--- a/build/linux/unbundle/freetype.gn
|
||||||
|
+++ b/build/linux/unbundle/freetype.gn
|
||||||
|
@@ -11,4 +11,9 @@ declare_args() {
|
||||||
|
# System FreeType configurations other than as described WILL INTRODUCE TEXT
|
||||||
|
# RENDERING AND SECURITY REGRESSIONS.
|
||||||
|
use_system_freetype = true
|
||||||
|
+
|
||||||
|
+ # Use FreeType for font rendering. If this is set to false, FreeType is
|
||||||
|
+ # replaced with the Rust-based Fontations set of libraries plus Skia
|
||||||
|
+ # path rendering.
|
||||||
|
+ enable_freetype = true
|
||||||
|
}
|
21
chromium-131.0.6778.85-unbundle-icu-target.patch
Normal file
21
chromium-131.0.6778.85-unbundle-icu-target.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matt Jolly <kangie@gentoo.org>
|
||||||
|
Date: Thu, 10 Oct 2024 14:36:51 +1000
|
||||||
|
Subject: [PATCH] unbundle: add missing icu target
|
||||||
|
|
||||||
|
--- a/build/linux/unbundle/icu.gn
|
||||||
|
+++ b/build/linux/unbundle/icu.gn
|
||||||
|
@@ -65,6 +65,10 @@ group("icuuc_public") {
|
||||||
|
public_deps = [ ":icuuc" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
+group("icui18n_hidden_visibility") {
|
||||||
|
+ public_deps = [ ":icuuc" ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
shim_headers("icui18n_shim") {
|
||||||
|
root_path = "source/i18n"
|
||||||
|
headers = [
|
||||||
|
--
|
||||||
|
2.46.2
|
||||||
|
|
@ -0,0 +1,21 @@
|
|||||||
|
diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
|
||||||
|
index e8bc9bb79704..38e5d2bd005f 100644
|
||||||
|
--- a/google_apis/api_key_cache.cc
|
||||||
|
+++ b/google_apis/api_key_cache.cc
|
||||||
|
@@ -221,14 +221,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
|
||||||
|
|
||||||
|
std::string default_client_id = CalculateKeyValue(
|
||||||
|
default_api_keys.google_default_client_id,
|
||||||
|
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr,
|
||||||
|
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID,
|
||||||
|
std::string(), environment.get(), command_line, gaia_config,
|
||||||
|
default_api_keys.allow_override_via_environment,
|
||||||
|
default_api_keys.allow_unset_values);
|
||||||
|
std::string default_client_secret = CalculateKeyValue(
|
||||||
|
default_api_keys.google_default_client_secret,
|
||||||
|
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
|
||||||
|
- nullptr, std::string(), environment.get(), command_line, gaia_config,
|
||||||
|
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config,
|
||||||
|
default_api_keys.allow_override_via_environment,
|
||||||
|
default_api_keys.allow_unset_values);
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
%define clang_version %(clang --version | grep -m1 version | sed 's/[^0-9.]//g' | cut -d. -f1)
|
%define clang_version %(clang --version | grep -m1 version | sed 's/[^0-9.]//g' | cut -d. -f1)
|
||||||
Name: chromium
|
Name: chromium
|
||||||
Epoch: 3
|
Epoch: 3
|
||||||
Version: 130.0.6723.116
|
Version: 131.0.6778.85
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web
|
||||||
Group: Graphical Desktop/Applications/Internet
|
Group: Graphical Desktop/Applications/Internet
|
||||||
@ -14,12 +14,15 @@ URL: https://www.chromium.org
|
|||||||
Source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
|
Source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
|
||||||
Source1: chromium-master_preferences
|
Source1: chromium-master_preferences
|
||||||
Source2: https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/%{chromium_patches_ver}/chromium-patches-%{chromium_patches_ver}.tar.bz2
|
Source2: https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/%{chromium_patches_ver}/chromium-patches-%{chromium_patches_ver}.tar.bz2
|
||||||
Patch1: chromium-126.0.6478.126-use-oauth2-client-switches-as-default.patch
|
Patch1: chromium-131.0.6778.85-use-oauth2-client-switches-as-default.patch
|
||||||
Patch2: chromium-116-0.5845.110-aarch64-include-limits.patch
|
Patch2: chromium-116.0.5845.110-aarch64-include-limits.patch
|
||||||
Patch6: chromium-123.0.6312.86-clang-18-2.patch
|
Patch3: chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch
|
||||||
Patch7: chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch
|
Patch4: chromium-130.0.6723.92-compiler-rt-adjust-paths.patch
|
||||||
Patch8: chromium-130.0.6723.92-compiler-rt-adjust-paths.patch
|
Patch5: chromium-123.0.6312.86-clang-18-2.patch
|
||||||
Patch9: chromium-130.0.6723.92-increase-fortify-level.patch
|
Patch6: chromium-130.0.6723.92-increase-fortify-level.patch
|
||||||
|
Patch7: chromium-131.0.6778.85-unbundle-add-enable_freetype.patch
|
||||||
|
Patch8: chromium-131.0.6778.85-unbundle-icu-target.patch
|
||||||
|
Patch9: chromium-131.0.6778.85-const-atomicstring-conversion.patch
|
||||||
License: BSD
|
License: BSD
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@ -106,9 +109,9 @@ Chromium is an open-source browser project that aims to build a safer, faster, a
|
|||||||
%global __provides_exclude_from ^%{_libdir}/chromium/.*$
|
%global __provides_exclude_from ^%{_libdir}/chromium/.*$
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
#% setup -q -a2
|
%setup -q -a2
|
||||||
%setup -q -D -T
|
#% setup -q -D -T
|
||||||
:<< ___EOF
|
#:<< ___EOF
|
||||||
|
|
||||||
# Allow building against system libraries in official builds
|
# Allow building against system libraries in official builds
|
||||||
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
|
||||||
@ -123,10 +126,13 @@ sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
|
|||||||
|
|
||||||
%patch 1 -p1 -b .use-oauth2-client-switches-as-default
|
%patch 1 -p1 -b .use-oauth2-client-switches-as-default
|
||||||
%patch 2 -p1 -b .aarch64-include-limits
|
%patch 2 -p1 -b .aarch64-include-limits
|
||||||
%patch 7 -p1 -b .fix_lib64_in_rust_bindgen
|
%patch 3 -p1 -b .fix_lib64_in_rust_bindgen
|
||||||
%patch 8 -p1 -b .compiler-rt-adjust-paths
|
%patch 4 -p1 -b .compiler-rt-adjust-paths
|
||||||
%patch 6 -p1 -b .clang-18-2
|
%patch 5 -p1 -b .clang-18-2
|
||||||
%patch 9 -p1 -b .increase-fortify-level
|
%patch 6 -p1 -b .increase-fortify-level
|
||||||
|
%patch 7 -p1 -b .unbundle-add-enable_freetype
|
||||||
|
%patch 8 -p1 -b .unbundle-icu-target
|
||||||
|
%patch 9 -p1 -b .const-atomicstring-conversion
|
||||||
|
|
||||||
# Fixes for building with libstdc++ instead of libc++
|
# Fixes for building with libstdc++ instead of libc++
|
||||||
#patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch
|
#patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch
|
||||||
@ -427,6 +433,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver
|
|||||||
%{_mandir}/man1/chromium.1*
|
%{_mandir}/man1/chromium.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Nov 23 2024 Automatic Build System <autodist@openmamba.org> 131.0.6778.85-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Tue Nov 12 2024 Automatic Build System <autodist@openmamba.org> 130.0.6723.116-1mamba
|
* Tue Nov 12 2024 Automatic Build System <autodist@openmamba.org> 130.0.6723.116-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user