diff options
| -rw-r--r-- | chromium/chromium/chromium-crashpad-template.patch | 41 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r1061645.patch | 50 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 22 |
3 files changed, 103 insertions, 10 deletions
diff --git a/chromium/chromium/chromium-crashpad-template.patch b/chromium/chromium/chromium-crashpad-template.patch new file mode 100644 index 0000000..340a107 --- /dev/null +++ b/chromium/chromium/chromium-crashpad-template.patch @@ -0,0 +1,41 @@ +From 0acdadf032955add4a996332c19e08f7cecd7558 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Fri, 30 Sep 2022 14:07:07 +0200 +Subject: [PATCH] snapshot: remove redundant template parameter + +GCC 12 does not allow it in C++20 mode anymore. + +Bug: chromium:819294 +Change-Id: I025dda8046739fefc4ff449d4496ef496374eff5 +Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3929186 +Commit-Queue: Mark Mentovai <mark@chromium.org> +Reviewed-by: Mark Mentovai <mark@chromium.org> +--- + snapshot/elf/elf_image_reader.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/snapshot/elf/elf_image_reader.cc b/snapshot/elf/elf_image_reader.cc +index 9d3ba43a..30e8b987 100644 +--- a/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader.cc ++++ b/third_party/crashpad/crashpad/snapshot/elf/elf_image_reader.cc +@@ -56,14 +56,14 @@ template <typename PhdrType> + class ElfImageReader::ProgramHeaderTableSpecific + : public ElfImageReader::ProgramHeaderTable { + public: +- ProgramHeaderTableSpecific<PhdrType>() {} ++ ProgramHeaderTableSpecific() {} + +- ProgramHeaderTableSpecific<PhdrType>( ++ ProgramHeaderTableSpecific( + const ProgramHeaderTableSpecific<PhdrType>&) = delete; + ProgramHeaderTableSpecific<PhdrType>& operator=( + const ProgramHeaderTableSpecific<PhdrType>&) = delete; + +- ~ProgramHeaderTableSpecific<PhdrType>() {} ++ ~ProgramHeaderTableSpecific() {} + + bool Initialize(const ProcessMemoryRange& memory, + VMAddress address, +-- +2.38.1 + diff --git a/chromium/chromium/chromium-gcc-12-r1061645.patch b/chromium/chromium/chromium-gcc-12-r1061645.patch new file mode 100644 index 0000000..441f678 --- /dev/null +++ b/chromium/chromium/chromium-gcc-12-r1061645.patch @@ -0,0 +1,50 @@ +From 82827b0a8683c5c9c7285db48cefb7fa8ea92ffe Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jdapena@igalia.com> +Date: Thu, 20 Oct 2022 16:27:27 +0000 +Subject: [PATCH] GCC: declare DocumentLoader::DecodedBodyData as public +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix build with GCC as DocumentLoader::DecodedBodyData was not +declaring SameSizeAsDocumentLoader. This works in Clang because +declaring it as friend of DocumentLoader implicitly declares it +as friend of its class members. But GCC does not accept that. + +Bug: 819294 +Change-Id: Iba6a4138fbd90831e7a65fae8445ad4b1736594f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3963839 +Commit-Queue: José Dapena Paz <jdapena@igalia.com> +Reviewed-by: Nate Chapin <japhet@chromium.org> +Cr-Commit-Position: refs/heads/main@{#1061645} +--- + third_party/blink/renderer/core/loader/document_loader.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h +index b22fe2a2faa80..37a423040cde7 100644 +--- a/third_party/blink/renderer/core/loader/document_loader.h ++++ b/third_party/blink/renderer/core/loader/document_loader.h +@@ -434,6 +434,11 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>, + const KURL& url, + const ResourceResponse& response); + ++ // This needs to be kept as public to be accessible from ++ // SameSizeAsDocumentLoader as GCC will fail to allow access ++ // even if it is friend of DocumentLoader ++ class DecodedBodyData; ++ + protected: + // Based on its MIME type, if the main document's response corresponds to an + // MHTML archive, then every resources will be loaded from this archive. +@@ -465,7 +470,6 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>, + friend struct SameSizeAsDocumentLoader; + class BodyData; + class EncodedBodyData; +- class DecodedBodyData; + + Frame* CalculateOwnerFrame(); + scoped_refptr<SecurityOrigin> CalculateOrigin(Document* owner_document); +-- +2.38.1 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index aed6509..5644905 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -22,8 +22,8 @@ %bcond_with system_freetype %endif -# Require harfbuzz >= 3.0.0 for hb_subset_input_set_flags -%if 0%{?fedora} >= 36 +# Require harfbuzz >= 4.4.0 for hb-cplusplus.hh +%if 0%{?fedora} >= 37 %bcond_without system_harfbuzz %else %bcond_with system_harfbuzz @@ -70,7 +70,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 107.0.5304.121 +Version: 108.0.5359.94 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -121,7 +121,9 @@ Patch2: chromium-python3.patch Patch3: chromium-media-mojo-services-opus.patch # Pull upstream patches -Patch10: chromium-minizip-r1063478.patch +Patch10: chromium-gcc-12-r1061645.patch +Patch11: chromium-minizip-r1063478.patch +Patch12: chromium-crashpad-template.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -343,7 +345,6 @@ find -type f -exec \ %if !%{with system_harfbuzz} third_party/harfbuzz-ng \ %endif - third_party/harfbuzz-ng/utils \ third_party/highway \ third_party/hunspell \ third_party/iccjpeg \ @@ -361,13 +362,13 @@ find -type f -exec \ %if !%{with system_libaom} third_party/libaom \ third_party/libaom/source/libaom/third_party/fastfeat \ + third_party/libaom/source/libaom/third_party/SVT-AV1 \ third_party/libaom/source/libaom/third_party/vector \ third_party/libaom/source/libaom/third_party/x86inc \ %endif third_party/libavif \ third_party/libevent \ third_party/libgav1 \ - third_party/libgifcodec \ third_party/libjingle \ third_party/libjxl \ third_party/libphonenumber \ @@ -545,11 +546,9 @@ ln -s %{_bindir}/java third_party/jdk/current/bin/java mkdir -p buildtools/third_party/eu-strip/bin ln -s %{_bindir}/true buildtools/third_party/eu-strip/bin/eu-strip -rm -r third_party/wayland/src - %build -export AR=ar NM=nm +export AR=ar NM=nm PATH="${PATH}:%{_qt5_bindir}" # Fedora 25 doesn't have __global_cxxflags %if %{with fedora_compilation_flags} @@ -589,7 +588,7 @@ gn_args=( use_system_harfbuzz=true %endif use_system_libdrm=true - use_system_libwayland_server=true + use_system_libwayland=true use_system_minigbm=true use_system_wayland_scanner=true use_xkbcommon=true @@ -764,6 +763,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Dec 05 2022 - Ting-Wei Lan <lantw44@gmail.com> - 108.0.5359.94-100 +- Update to 108.0.5359.94 + * Sat Nov 26 2022 - Ting-Wei Lan <lantw44@gmail.com> - 107.0.5304.121-100 - Update to 107.0.5304.121 |