From 5ce9757b9218a8d7e8a55825da3f690222b0cb19 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 8 Mar 2023 08:21:13 +0100 Subject: [PATCH] update to 111.0.5563.64 --- chromium-109-clang14-c++20-link-error.patch | 17 --------------- chromium-110-limits.patch | 11 ++++++++++ chromium.spec | 23 +++++++++++++-------- sources | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 chromium-109-clang14-c++20-link-error.patch create mode 100644 chromium-110-limits.patch diff --git a/chromium-109-clang14-c++20-link-error.patch b/chromium-109-clang14-c++20-link-error.patch deleted file mode 100644 index 530915c..0000000 --- a/chromium-109-clang14-c++20-link-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up chromium-109.0.5414.74/build/config/compiler/BUILD.gn.link-error-clang14 chromium-109.0.5414.74/build/config/compiler/BUILD.gn ---- chromium-109.0.5414.74/build/config/compiler/BUILD.gn.link-error-clang14 2023-01-11 18:00:34.692512606 +0100 -+++ chromium-109.0.5414.74/build/config/compiler/BUILD.gn 2023-01-11 18:30:10.905410122 +0100 -@@ -601,12 +601,7 @@ config("compiler") { - cflags_cc += [ "-fno-trigraphs" ] - } - } else if (is_clang) { -- if (is_chromeos_device) { -- # TODO(crbug.com/1392471): Support C++20 in CrOS toolchain. -- cflags_cc += [ "-std=${standard_prefix}++17" ] -- } else { -- cflags_cc += [ "-std=${standard_prefix}++20" ] -- } -+ cflags_cc += [ "-std=${standard_prefix}++17" ] - } else { - # The gcc bots are currently using GCC 9, which is not new enough to - # support "c++20"/"gnu++20". diff --git a/chromium-110-limits.patch b/chromium-110-limits.patch new file mode 100644 index 0000000..31a4c1e --- /dev/null +++ b/chromium-110-limits.patch @@ -0,0 +1,11 @@ +diff -up chromium-110.0.5481.177/base/memory/ref_counted.h.me chromium-110.0.5481.177/base/memory/ref_counted.h +--- chromium-110.0.5481.177/base/memory/ref_counted.h.me 2023-02-23 13:34:33.174817255 -0500 ++++ chromium-110.0.5481.177/base/memory/ref_counted.h 2023-02-23 13:42:28.646052469 -0500 +@@ -6,6 +6,7 @@ + #define BASE_MEMORY_REF_COUNTED_H_ + + #include ++#include + + #include + diff --git a/chromium.spec b/chromium.spec index 44e9b54..23e3cae 100644 --- a/chromium.spec +++ b/chromium.spec @@ -241,7 +241,7 @@ %endif Name: chromium%{chromium_channel} -Version: 111.0.5563.50 +Version: 111.0.5563.64 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use Url: http://www.chromium.org/Home @@ -284,6 +284,9 @@ Patch20: chromium-disable-font-tests.patch # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch Patch52: chromium-81.0.4044.92-unbundle-zlib.patch +# missing limits.h, error: no member named 'numeric_limits' in namespace 'std' +Patch53: chromium-110-limits.patch + # ../../third_party/perfetto/include/perfetto/base/task_runner.h:48:55: error: 'uint32_t' has not been declared Patch56: chromium-96.0.4664.45-missing-cstdint-header.patch @@ -352,10 +355,6 @@ Patch116: chromium-108-ffmpeg-first_dts.patch # revert new-channel-layout-api on f36, old ffmpeg-free Patch117: chromium-108-ffmpeg-revert-new-channel-layout-api.patch -# clang =< 14 and C++20, linker errors std::u16string -# build failure on rhel and fedora 36 -Patch120: chromium-109-clang14-c++20-link-error.patch - # enable Qt Patch121: chromium-108-enable-allowqt.patch @@ -365,6 +364,7 @@ Patch122: chromium-109-gcc13.patch # Patches by Stephan Hartmann, https://github.com/stha09/chromium-patches Patch130: chromium-103-VirtualCursor-std-layout.patch +# Pagesize > 4kb Patch146: chromium-110-LargerThan4k.patch # VAAPI @@ -904,6 +904,7 @@ udev. %patch52 -p1 -b .unbundle-zlib %endif +%patch53 -p1 -b .limits-header %patch56 -p1 -b .missing-cstdint %patch57 -p1 -b .missing-cstring @@ -953,10 +954,6 @@ udev. %patch107 -p1 -b .el7-extra-operator-equalequal %endif -%if 0%{?rhel} || 0%{?fedora} == 36 -%patch120 -p1 -b .link-error-clang14 -%endif - %patch130 -p1 -b .VirtualCursor-std-layout %patch146 -p1 -b .LargerThan4k @@ -1137,6 +1134,11 @@ CHROMIUM_CORE_GN_DEFINES+=' enable_vr=false' CHROMIUM_CORE_GN_DEFINES+=' build_dawn_tests=false enable_perfetto_unittests=false' CHROMIUM_CORE_GN_DEFINES+=' disable_fieldtrial_testing_config=true' CHROMIUM_CORE_GN_DEFINES+=' blink_symbol_level=0 symbol_level=0 v8_symbol_level=0' +# clang =< 14 and C++20, linker errors std::u16string +# build failure on rhel and fedora 36 +%if 0%{?rhel} || 0%{?fedora} == 36 +CHROMIUM_CORE_GN_DEFINES+=' use_cxx17=true' +%endif export CHROMIUM_CORE_GN_DEFINES # browser gn defines @@ -1650,6 +1652,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Tue Mar 07 2023 Than Ngo - 111.0.5563.64-1 +- update to 111.0.5563.64 + * Mon Mar 06 2023 Than Ngo - 111.0.5563.50-1 - update to 111.0.5563.50 - system freetype on fedora > 36 diff --git a/sources b/sources index 7f2d4f8..0510b02 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (node-v16.17.0-linux-x64.tar.xz) = aedfeeb71420a7fbcb07fbc4c5d2ba74ffe4f88c15998809346a84148132ec866dbae4e848531a2a77ca41413f442e1046f981d4f188bdf667faf88069aa28cd SHA512 (node-v16.17.0-linux-arm64.tar.xz) = ae4aabc2389779c9e1b4a15622cae3ba50e0c313ca3d7a1dc7b2344df06ade1f303d6a75b941d37e2a0ef368cf047c862a822a893684494f55446afd6ab0610e -SHA512 (chromium-111.0.5563.50-clean.tar.xz) = 4576e080a55cc1dabf65e14d5380310ee93bfe50e40823adb963bf47d3bbe668b39ef41c3f5e7b8c2aebc8161915926a2f6b37c39cc0289898e515e600743e3c +SHA512 (chromium-111.0.5563.64-clean.tar.xz) = c31c672d5f301cacdb3357337ffb369e63b7d25b031e124798fb04a0c845b178b23fdffec2647b8bedc90a1482d249d64926e98a18eb21399873a0d23c3cda98