From 4d2ff9641dde4128026bbfbeb7ca4e738d94b1c7 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sun, 19 Jan 2025 20:19:02 +0100 Subject: [PATCH] automatic version update by autodist [release 132.0.6834.83-1mamba;Fri Jan 17 2025] --- README.md | 1 - ...778.85-const-atomicstring-conversion.patch | 35 ------------------- ...6778.85-unbundle-add-enable_freetype.patch | 32 ----------------- ...um-131.0.6778.85-unbundle-icu-target.patch | 21 ----------- ....0.6834.83-fix_lib64_in_rust_bindgen.patch | 17 ++++++--- chromium.spec | 31 +++++++--------- 6 files changed, 25 insertions(+), 112 deletions(-) delete mode 100644 chromium-131.0.6778.85-const-atomicstring-conversion.patch delete mode 100644 chromium-131.0.6778.85-unbundle-add-enable_freetype.patch delete mode 100644 chromium-131.0.6778.85-unbundle-icu-target.patch rename chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch => chromium-132.0.6834.83-fix_lib64_in_rust_bindgen.patch (68%) diff --git a/README.md b/README.md index 06ddd66..5682352 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # chromium Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web. - diff --git a/chromium-131.0.6778.85-const-atomicstring-conversion.patch b/chromium-131.0.6778.85-const-atomicstring-conversion.patch deleted file mode 100644 index 52f7466..0000000 --- a/chromium-131.0.6778.85-const-atomicstring-conversion.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 403ee5b14df12c8ee3b3583177bbd30d930e9aaf Mon Sep 17 00:00:00 2001 -From: Matt Jolly -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 data, - // - // 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 - diff --git a/chromium-131.0.6778.85-unbundle-add-enable_freetype.patch b/chromium-131.0.6778.85-unbundle-add-enable_freetype.patch deleted file mode 100644 index 1fd94c2..0000000 --- a/chromium-131.0.6778.85-unbundle-add-enable_freetype.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 88676c640928fd2dce56a46c1c3adb62ac349697 Mon Sep 17 00:00:00 2001 -From: "lauren n. liberda" -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 -Commit-Queue: Lei Zhang -Reviewed-by: Thomas Anderson -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 - } diff --git a/chromium-131.0.6778.85-unbundle-icu-target.patch b/chromium-131.0.6778.85-unbundle-icu-target.patch deleted file mode 100644 index 618750f..0000000 --- a/chromium-131.0.6778.85-unbundle-icu-target.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001 -From: Matt Jolly -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 - diff --git a/chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch b/chromium-132.0.6834.83-fix_lib64_in_rust_bindgen.patch similarity index 68% rename from chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch rename to chromium-132.0.6834.83-fix_lib64_in_rust_bindgen.patch index 22d6cad..dd72ba5 100644 --- a/chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch +++ b/chromium-132.0.6834.83-fix_lib64_in_rust_bindgen.patch @@ -9,7 +9,18 @@ } # Template to build Rust/C bindings with bindgen. -@@ -122,7 +122,7 @@ +--- chromium-132.0.6834.83/build/rust/rust_bindgen_generator.gni.orig 2025-01-16 23:23:02.744914633 +0100 ++++ chromium-132.0.6834.83/build/rust/rust_bindgen_generator.gni 2025-01-16 23:23:35.608028299 +0100 +@@ -22,7 +22,7 @@ + if (host_os == "win") { + _libclang_path += "/bin" + } else { +- _libclang_path += "/lib" ++ _libclang_path += "/lib64" + } + + # Template to build Rust/C bindings with bindgen. +@@ -172,7 +172,7 @@ # point to. args += [ "--ld-library-path", @@ -18,9 +29,7 @@ ] } ---- chromium-130.0.6723.92/build/rust/rust_bindgen.gni.orig 2024-11-05 09:00:20.400539921 +0100 -+++ chromium-130.0.6723.92/build/rust/rust_bindgen.gni 2024-11-05 09:00:40.482583864 +0100 -@@ -150,7 +150,7 @@ +@@ -216,7 +216,7 @@ # make it behave consistently with our other command line flags and allows # system headers to be found. clang_resource_dir = diff --git a/chromium.spec b/chromium.spec index e5f8e1c..0ebc84e 100644 --- a/chromium.spec +++ b/chromium.spec @@ -3,7 +3,7 @@ %define clang_version %(clang --version | grep -m1 version | sed 's/[^0-9.]//g' | cut -d. -f1) Name: chromium Epoch: 3 -Version: 131.0.6778.204 +Version: 132.0.6834.83 Release: 1mamba 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 @@ -16,13 +16,10 @@ Source1: chromium-master_preferences Source2: https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/%{chromium_patches_ver}/chromium-patches-%{chromium_patches_ver}.tar.bz2 Patch1: chromium-131.0.6778.85-use-oauth2-client-switches-as-default.patch Patch2: chromium-116.0.5845.110-aarch64-include-limits.patch -Patch3: chromium-130.0.6723.92-fix_lib64_in_rust_bindgen.patch +Patch3: chromium-132.0.6834.83-fix_lib64_in_rust_bindgen.patch Patch4: chromium-130.0.6723.92-compiler-rt-adjust-paths.patch Patch5: chromium-123.0.6312.86-clang-18-2.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 ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -100,18 +97,20 @@ Requires: libvdpau-Mesa %description Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web. -%debug_package - # Don't clean build at the end %global __spec_rmbuild_cmd /bin/true +# Chromium adds its own LTO flags +%global _lto_cflags %{nil} + %define _default_patch_fuzz 2 + %global __provides_exclude_from ^%{_libdir}/chromium/.*$ %prep -#% setup -q -a2 -%setup -q -D -T -:<< ___EOF +%setup -q -a2 +#% setup -q -D -T +#:<< ___EOF # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ @@ -130,9 +129,6 @@ sed -i -e 's/\/malloc/' -e 's/\/free/' \ %patch 4 -p1 -b .compiler-rt-adjust-paths %patch 5 -p1 -b .clang-18-2 %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++ #patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch @@ -213,11 +209,6 @@ ln -s /usr/bin/java third_party/jdk/current/bin/ rm buildtools/third_party/eu-strip/bin/eu-strip ln -s %{_bindir}/eu-strip buildtools/third_party/eu-strip/bin/eu-strip -# test deps are broken for ui/lens with system ICU -# "//third_party/icu:icuuc_public" (taken from Gentoo ebuild) -sed -i '/source_set("unit_tests") {/,/}/d' chrome/browser/ui/lens/BUILD.gn -sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn - # Remove compiler flags not supported by our system clang sed -i \ -e '/"-fsplit-lto-unit"/d' \ @@ -269,7 +260,6 @@ chromium_conf=( "rustc_version=\"$(rustc --version)\"" 'is_official_build=true' # implies is_cfi=true on x86_64 'symbol_level=0' - 'chrome_pgo_phase=0' # needs newer clang to read the bundled PGO profile 'treat_warnings_as_errors=false' 'disable_fieldtrial_testing_config=true' 'blink_enable_generated_code_formatting=false' @@ -433,6 +423,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Fri Jan 17 2025 Automatic Build System 132.0.6834.83-1mamba +- automatic version update by autodist + * Fri Dec 20 2024 Automatic Build System 131.0.6778.204-1mamba - automatic version update by autodist