commit 8c20b985a8b9c54d5d2add0b98751984bb65d8f4 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Oct 20 05:59:37 2021 +0100 Update to 95.0.4638.54 chromium-95-maldoca-zlib.patch | 13 +++++++++++++ chromium-freeworld.spec | 18 ++++++++++++------ chromium-rawhide-gcc-std-max-fix.patch | 8 ++++---- remove-llvm13-warning-flags.patch | 23 ++++++++++++++--------- sources | 4 ++-- 5 files changed, 45 insertions(+), 21 deletions(-) --- diff --git a/chromium-95-maldoca-zlib.patch b/chromium-95-maldoca-zlib.patch new file mode 100644 index 0000000..1f64a66 --- /dev/null +++ b/chromium-95-maldoca-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/maldoca/BUILD.gn b/third_party/maldoca/BUILD.gn +index eeab205..29a0a2c 100644 +--- a/third_party/maldoca/BUILD.gn ++++ b/third_party/maldoca/BUILD.gn +@@ -224,7 +224,7 @@ source_set("maldoca-ole") { + "//third_party/libxml", + "//third_party/protobuf:protobuf_lite", + "//third_party/re2", +- "//third_party/zlib:zlib_common_headers", ++ "//third_party/zlib:zlib", + "//third_party/zlib/google:zip", + ] + diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index b668b7f..db4c490 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -32,7 +32,7 @@ %global system_re2 1 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 94.0.4606.81 +Version: 95.0.4638.54 Release: 1%{?dist} Summary: Chromium built with all freeworld codecs and VA-API support License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) @@ -57,7 +57,7 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-94-patchset-3 +%global patchset_revision chromium-95-patchset-4 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -165,6 +165,7 @@ ExclusiveArch: x86_64 aarch64 # Gentoo patches: Patch201: chromium-93-EnumTable-crash.patch +Patch202: chromium-95-maldoca-zlib.patch # Arch Linux patches: Patch226: chromium-93-ffmpeg-4.4.patch @@ -210,10 +211,9 @@ Patch1406: chromium-rpm-fusion-brand.patch %{__scm_apply_patch -p1} <%{patchset_root}/%{1} %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch -%patchset_apply chromium-90-ruy-include.patch -%patchset_apply chromium-91-libyuv-aarch64.patch -%patchset_apply chromium-94-ConversionStorageSql-lambda.patch -%patchset_apply chromium-94-CustomSpaces-include.patch +%patchset_apply chromium-95-libyuv-aarch64.patch +%patchset_apply chromium-95-BitstreamReader-namespace.patch +%patchset_apply chromium-95-quiche-include.patch # Apply patches up to #1000 from this spec. @@ -390,6 +390,9 @@ find -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__ third_party/lss \ third_party/lzma_sdk \ third_party/mako \ + third_party/maldoca \ + third_party/maldoca/src/third_party/tensorflow_protos \ + third_party/maldoca/src/third_party/zlibwrappe \ third_party/markupsafe \ third_party/mesa \ third_party/metrics_proto \ @@ -747,6 +750,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Tue Oct 19 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 95.0.4638.54-1 +- Update to 95.0.4638.54 + * Thu Oct 07 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 94.0.4606.81-1 - Update to 94.0.4606.81 diff --git a/chromium-rawhide-gcc-std-max-fix.patch b/chromium-rawhide-gcc-std-max-fix.patch index ea3e753..2dc5421 100644 --- a/chromium-rawhide-gcc-std-max-fix.patch +++ b/chromium-rawhide-gcc-std-max-fix.patch @@ -11,14 +11,14 @@ // one is too small. --- a/sandbox/linux/services/credentials.cc +++ b/sandbox/linux/services/credentials.cc -@@ -98,7 +98,9 @@ - // attempt this optimization. +@@ -100,7 +100,9 @@ bool ChrootToSafeEmptyDir() { + // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f. clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS; - + - char tls_buf[PTHREAD_STACK_MIN] = {0}; + const std::size_t pthread_stack_min = PTHREAD_STACK_MIN; + char tls_buf[pthread_stack_min]; + memset(tls_buf, 0, pthread_stack_min); tls = tls_buf; #endif - + diff --git a/remove-llvm13-warning-flags.patch b/remove-llvm13-warning-flags.patch index 542dfd4..fe9dcb4 100644 --- a/remove-llvm13-warning-flags.patch +++ b/remove-llvm13-warning-flags.patch @@ -1,13 +1,18 @@ --- a/build/config/compiler/BUILD.gn.orig +++ b/build/config/compiler/BUILD.gn -@@ -1631,10 +1631,6 @@ config("default_warnings") { - # TODO(https://crbug.com/1028110): Evaluate and possible enable. - "-Wno-deprecated-copy", +@@ -1668,15 +1668,6 @@ config("default_warnings") { + "-Wno-builtin-assume-aligned-alignment", + ] -- # TODO(https://crbug.com/1203071): Clean up and enable. -- "-Wno-unused-but-set-parameter", -- "-Wno-unused-but-set-variable", +- # NaCl does not support flags from ToT. +- if (!is_nacl) { +- cflags += [ +- # TODO(https://crbug.com/1203071): Clean up and enable. +- "-Wno-unused-but-set-parameter", +- "-Wno-unused-but-set-variable", +- ] +- } - - # TODO(https://crbug.com/1239077): Fix and re-enable. - "-Wno-inline-asm", - ] + if (is_fuchsia) { + # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383) + cflags += [ "-Wno-deprecated-copy" ] diff --git a/sources b/sources index ee26f13..bc070f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-94.0.4606.81.tar.xz) = 59bde106e41da1daa1e806f790cbeea8623e5b5a191222981981f2722da97a26c7f70cbe3a9108e5d84e411712627657a86b3931ec940121c7e61bdb09b5bee8 -SHA512 (chromium-patches-chromium-94-patchset-3.tar.gz) = e7491fce352e41f9ae41d397ce9865b691ff3a665bda9dee61eb5e57ab4094ed2a948cc5dd7b8fb2ab6b8a9bdc8c2ac894aec115b757ffaa9a98f502c38dc99c +SHA512 (chromium-95.0.4638.54.tar.xz) = 159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9 +SHA512 (chromium-patches-chromium-95-patchset-4.tar.gz) = bb74eb56b99eccf363ce2ff64a98955108a72cf5a4e22d79be4840060ad1a5ae977d5f779fb698b3fb96fbd61fc8481a90c9a58d7415183fab3b8b48bcbf1d42