From 8e3752f9f85b1bb0d891c73853b3439bc3a77e64 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 21:18:04 +0100 Subject: [PATCH] automatic version update by autodist [release 119.0.6045.159-1mamba;Mon Nov 27 2023] --- chromium-119.0.6045.159-icu-74.patch | 13 +++++++ chromium-119.0.6045.159-libxml2-2.12.1.patch | 22 +++++++++++ chromium.spec | 39 +++++++++++++------- 3 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 chromium-119.0.6045.159-icu-74.patch create mode 100644 chromium-119.0.6045.159-libxml2-2.12.1.patch diff --git a/chromium-119.0.6045.159-icu-74.patch b/chromium-119.0.6045.159-icu-74.patch new file mode 100644 index 0000000..719113d --- /dev/null +++ b/chromium-119.0.6045.159-icu-74.patch @@ -0,0 +1,13 @@ +--- a/third_party/blink/renderer/platform/text/text_break_iterator.cc ++++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc +@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar + }; + // clang-format on + +-#if U_ICU_VERSION_MAJOR_NUM >= 58 ++#if U_ICU_VERSION_MAJOR_NUM >= 74 ++#define BA_LB_COUNT (U_LB_COUNT - 8) ++#elif U_ICU_VERSION_MAJOR_NUM >= 58 + #define BA_LB_COUNT (U_LB_COUNT - 3) + #else + #define BA_LB_COUNT U_LB_COUNT diff --git a/chromium-119.0.6045.159-libxml2-2.12.1.patch b/chromium-119.0.6045.159-libxml2-2.12.1.patch new file mode 100644 index 0000000..7c156eb --- /dev/null +++ b/chromium-119.0.6045.159-libxml2-2.12.1.patch @@ -0,0 +1,22 @@ +--- chromium-119.0.6045.159/third_party/blink/renderer/core/xml/xslt_processor.h.orig 2023-11-14 23:56:49.857019200 +0100 ++++ chromium-119.0.6045.159/third_party/blink/renderer/core/xml/xslt_processor.h 2023-11-26 15:10:34.596794280 +0100 +@@ -77,7 +77,7 @@ + + void reset(); + +- static void ParseErrorFunc(void* user_data, xmlError*); ++ static void ParseErrorFunc(void* user_data, const xmlError*); + static void GenericErrorFunc(void* user_data, const char* msg, ...); + + // Only for libXSLT callbacks +--- chromium-119.0.6045.159/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.orig 2023-11-22 04:34:50.210372204 +0100 ++++ chromium-119.0.6045.159/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc 2023-11-26 15:10:52.177772188 +0100 +@@ -66,7 +66,7 @@ + // It would be nice to do something with this error message. + } + +-void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { ++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { + FrameConsole* console = static_cast(user_data); + if (!console) + return; diff --git a/chromium.spec b/chromium.spec index 74fe977..3691c89 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1,8 +1,8 @@ %define MAJver %(echo %version | cut -d. -f1) -%define gcc_patchset 116-patchset-2 +%define chromium_patches_ver %(echo %version | cut -d. -f1)-3 Name: chromium Epoch: 3 -Version: 117.0.5938.88 +Version: 119.0.6045.159 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 @@ -18,7 +18,8 @@ URL: https://www.chromium.org Source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz #Source: http://gsdview.appspot.com/chromium-browser-official/chromium-%{version}.tar.xz Source1: %{name}-master_preferences -Source2: https://github.com/stha09/chromium-patches/releases/download/chromium-%{gcc_patchset}/chromium-%{gcc_patchset}.tar.xz +#Source2: https://github.com/stha09/chromium-patches/releases/download/chromium-%{gcc_patchset}/chromium-%{gcc_patchset}.tar.xz +Source2: https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/%{chromium_patches_ver}/chromium-patches-%{chromium_patches_ver}.tar.bz2 Patch10: chromium-90.0.4430.212-use-oauth2-client-switches-as-default.patch Patch11: chromium-115.0.5790.170-REVERT-disable-autoupgrading-debug-info.patch Patch12: chromium-116.0.5845.96-randrom-build-fixes.patch @@ -27,6 +28,8 @@ Patch14: chromium-117.0.5938.62-material-color-utilities-cmath.patch Patch15: chromium-117.0.5938.88-blink-remove-unused-mnemonic.patch Patch16: chromium-117.0.5938.88-add-memory-for-std-unique_ptr-in-third_party-ip.patch Patch17: chromium-117.0.5938.88-roll-src-third_party-libavif-src-b33d9ebfc.676aded35.patch +Patch18: chromium-119.0.6045.159-libxml2-2.12.1.patch +Patch19: chromium-119.0.6045.159-icu-74.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -41,7 +44,6 @@ BuildRequires: libat-spi2-core-devel BuildRequires: libatomic-devel BuildRequires: libavcodec-ffmpeg-devel BuildRequires: libavformat-ffmpeg-devel -BuildRequires: libavif-devel BuildRequires: libavutil-ffmpeg-devel BuildRequires: libcairo-devel BuildRequires: libcups-devel @@ -138,18 +140,24 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ %patch 10 -p1 -b .use-oauth2-client-switches-as-default %patch 11 -Rp1 -b .REVERT-disable-autoupgrading-debug-info -%patch 12 -p1 -b .randrom-build-fixes +##%patch 12 -p1 -b .randrom-build-fixes %patch 13 -p1 -b .aarch64-include-limits -%patch 14 -p0 -b .material-color-utilities-cmath -%patch 15 -p1 -b .blink-remove-unused-mnemonic -%patch 16 -p1 -b .add-memory-for-std-unique_ptr-in-third_party-ip -%patch 17 -p1 -b .roll-src-third_party-libavif-src-b33d9ebfc.676aded35 +#%patch 14 -p0 -b .material-color-utilities-cmath +#%patch 15 -p1 -b .blink-remove-unused-mnemonic +##%patch 16 -p1 -b .add-memory-for-std-unique_ptr-in-third_party-ip +##%patch 17 -p1 -b .roll-src-third_party-libavif-src-b33d9ebfc.676aded35 +%patch 18 -p1 -b .libxml2-2.12.1 +%patch 19 -p1 -b .icu-74 # Fixes for building with libstdc++ instead of libc++ -patch -Np1 -i patches/chromium-114-maldoca-include.patch -patch -Np1 -i patches/chromium-114-ruy-include.patch -patch -Np1 -i patches/chromium-114-vk_mem_alloc-include.patch - +patch -Np1 -i chromium-patches-*/chromium-114-ruy-include.patch +patch -Np1 -i chromium-patches-*/chromium-114-vk_mem_alloc-include.patch +patch -Np1 -i chromium-patches-*/chromium-117-material-color-include.patch +patch -Np1 -i chromium-patches-*/chromium-119-FragmentDataIterator-std.patch +patch -Np1 -i chromium-patches-*/chromium-119-at-spi-variable-consumption.patch +patch -Np1 -i chromium-patches-*/chromium-119-clang16.patch +patch -Np1 -i chromium-patches-*/chromium-119-replace-deprecated-is_pod.patch + # Force script incompatible with Python 3 to use /usr/bin/python2 sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py @@ -185,7 +193,7 @@ declare -rgA _system_libs=( [icu]=icu [jsoncpp]=jsoncpp #[libaom]=aom - [libavif]=libavif + #[libavif]=libavif [libdrm]= [libjpeg]=libjpeg [libpng]=libpng @@ -429,6 +437,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Mon Nov 27 2023 Automatic Build System 119.0.6045.159-1mamba +- automatic version update by autodist + * Mon Sep 18 2023 Silvan Calarco 117.0.5938.88-1mamba - update to 117.0.5938.88