diff options
| -rw-r--r-- | chromium/chromium/chromium-crashpad-template.patch | 41 | ||||
| -rwxr-xr-x | chromium/chromium/chromium-ffmpeg-clean.sh | 2 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc-12-r1061645.patch | 50 | ||||
| -rwxr-xr-x | chromium/chromium/chromium-latest.py | 6 | ||||
| -rw-r--r-- | chromium/chromium/chromium-minizip-r1063478.patch | 69 | ||||
| -rw-r--r-- | chromium/chromium/chromium-stub-unrar-wrapper.patch | 25 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 14 |
7 files changed, 22 insertions, 185 deletions
diff --git a/chromium/chromium/chromium-crashpad-template.patch b/chromium/chromium/chromium-crashpad-template.patch deleted file mode 100644 index 340a107..0000000 --- a/chromium/chromium/chromium-crashpad-template.patch +++ /dev/null @@ -1,41 +0,0 @@ -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-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh index 2b82ffb..5b8aaec 100755 --- a/chromium/chromium/chromium-ffmpeg-clean.sh +++ b/chromium/chromium/chromium-ffmpeg-clean.sh @@ -133,9 +133,9 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/mpegutils.h \ libavcodec/mpegvideo.h \ libavcodec/mpegvideodata.h \ - libavcodec/mpegvideodsp.h \ libavcodec/mpegvideoencdsp.h \ libavcodec/options_table.h \ + libavcodec/opus.h \ libavcodec/opusdsp.h \ libavcodec/opus_celt.h \ libavcodec/opus_pvq.h \ diff --git a/chromium/chromium/chromium-gcc-12-r1061645.patch b/chromium/chromium/chromium-gcc-12-r1061645.patch deleted file mode 100644 index 441f678..0000000 --- a/chromium/chromium/chromium-gcc-12-r1061645.patch +++ /dev/null @@ -1,50 +0,0 @@ -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-latest.py b/chromium/chromium/chromium-latest.py index 02dcb95..031f405 100755 --- a/chromium/chromium/chromium-latest.py +++ b/chromium/chromium/chromium-latest.py @@ -312,12 +312,8 @@ if __name__ == '__main__': if (args.deleteunrar): unrar_dir = 'third_party/unrar' for filename in os.listdir(os.path.join(latest_dir, unrar_dir)): - if filename not in ['BUILD.gn', 'DEPS', 'src']: + if filename not in ['BUILD.gn', 'DEPS', 'google']: delete_chromium_dir_or_file(os.path.join(unrar_dir, filename)) - unrar_src_dir = os.path.join(unrar_dir, 'src') - for filename in os.listdir(os.path.join(latest_dir, unrar_src_dir)): - if filename not in ['unrar_wrapper.h', 'unrar_wrapper.cc']: - delete_chromium_dir_or_file(os.path.join(unrar_src_dir, filename)) if (not args.prep): print("Compressing cleaned tree, please wait...") diff --git a/chromium/chromium/chromium-minizip-r1063478.patch b/chromium/chromium/chromium-minizip-r1063478.patch deleted file mode 100644 index 54af6f6..0000000 --- a/chromium/chromium/chromium-minizip-r1063478.patch +++ /dev/null @@ -1,69 +0,0 @@ -From dda01a706453ded8c01c41775707cb5ef4e316f8 Mon Sep 17 00:00:00 2001 -From: Andres Salomon <dilinger@queued.net> -Date: Tue, 25 Oct 2022 21:11:46 +0000 -Subject: [PATCH] Re-fix TFLite build error on linux when using the system zlib - -In commit ae0f9adb7e14c0d19ca695ef6ad40b321a8cb64c, I fixed some build -errors related to minizip patch inclusion in TFLite. However, after that -when TFLite Support was rolled to HEAD, a small part of that patch got -dropped. The result is the following build error with 107.0.5304.62: - -../../third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc:22:10: fatal error: 'contrib/minizip/ioapi.h' file not found - ^~~~~~~~~~~~~~~~~~~~~~~~~ -1 error generated. - -This commit re-adds the lost fix. - -R=junzou@chromium.org - -Change-Id: Ie96c3571894b5100a1e2a2771da29699eff0beb3 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3972087 -Reviewed-by: Robert Ogden <robertogden@chromium.org> -Commit-Queue: Robert Ogden <robertogden@chromium.org> -Auto-Submit: Andres Salomon <dilinger@queued.net> -Cr-Commit-Position: refs/heads/main@{#1063478} ---- - ...-build-errors-on-linux-when-using-the-syst.patch | 13 +++++++++++++ - .../metadata/cc/utils/zip_readonly_mem_file.cc | 2 +- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/third_party/tflite_support/patches/0007-Fix-TFLite-build-errors-on-linux-when-using-the-syst.patch b/third_party/tflite_support/patches/0007-Fix-TFLite-build-errors-on-linux-when-using-the-syst.patch -index 6aa7548e1d725..9f1946ed97af6 100644 ---- a/third_party/tflite_support/patches/0007-Fix-TFLite-build-errors-on-linux-when-using-the-syst.patch -+++ b/third_party/tflite_support/patches/0007-Fix-TFLite-build-errors-on-linux-when-using-the-syst.patch -@@ -63,6 +63,19 @@ index 13927a7afa698..1b7bed5987fbc 100644 - - #include "absl/strings/string_view.h" // from @com_google_absl - -#include "contrib/minizip/ioapi.h" -++#include "third_party/zlib/contrib/minizip/ioapi.h" -+ -+ namespace tflite { -+ namespace metadata { -+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -+index 392b6b411fe03..525ae4a2b45bd 100644 -+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -+@@ -19,7 +19,7 @@ limitations under the License. -+ #include <cstdio> -+ -+ #include "absl/strings/string_view.h" // from @com_google_absl -+-#include "contrib/minizip/ioapi.h" - +#include "third_party/zlib/contrib/minizip/ioapi.h" - - namespace tflite { -diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -index 392b6b411fe03..525ae4a2b45bd 100644 ---- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -+++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc -@@ -19,7 +19,7 @@ limitations under the License. - #include <cstdio> - - #include "absl/strings/string_view.h" // from @com_google_absl --#include "contrib/minizip/ioapi.h" -+#include "third_party/zlib/contrib/minizip/ioapi.h" - - namespace tflite { - namespace metadata { --- -2.37.3 - diff --git a/chromium/chromium/chromium-stub-unrar-wrapper.patch b/chromium/chromium/chromium-stub-unrar-wrapper.patch index ea87cd4..e97e47c 100644 --- a/chromium/chromium/chromium-stub-unrar-wrapper.patch +++ b/chromium/chromium/chromium-stub-unrar-wrapper.patch @@ -1,11 +1,11 @@ diff --git a/third_party/unrar/BUILD.gn b/third_party/unrar/BUILD.gn -index 96756a8a538a1..5b300ef5667f9 100644 +index 97f4e0460ad7c..0d665e199e4b4 100644 --- a/third_party/unrar/BUILD.gn +++ b/third_party/unrar/BUILD.gn -@@ -23,54 +23,7 @@ config("unrar_warnings") { - - static_library("unrar") { +@@ -25,53 +25,6 @@ static_library("unrar") { sources = [ + "google/unrar_wrapper.cc", + "google/unrar_wrapper.h", - "src/archive.cpp", - "src/arcread.cpp", - "src/blake2s.cpp", @@ -52,15 +52,14 @@ index 96756a8a538a1..5b300ef5667f9 100644 - "src/ui.cpp", - "src/unicode.cpp", - "src/unpack.cpp", - "src/unrar_wrapper.cc", - "src/volume.cpp", ] if (is_win) { sources += [ "src/isnt.cpp" ] -diff --git a/third_party/unrar/src/unrar_wrapper.cc b/third_party/unrar/src/unrar_wrapper.cc -index 04f44784a4ddd..6879a2d849889 100644 ---- a/third_party/unrar/src/unrar_wrapper.cc -+++ b/third_party/unrar/src/unrar_wrapper.cc +diff --git a/third_party/unrar/google/unrar_wrapper.cc b/third_party/unrar/google/unrar_wrapper.cc +index 1b777d2275099..135ba83abbedd 100644 +--- a/third_party/unrar/google/unrar_wrapper.cc ++++ b/third_party/unrar/google/unrar_wrapper.cc @@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/metrics/histogram_macros.h" @@ -146,10 +145,10 @@ index 04f44784a4ddd..6879a2d849889 100644 return false; } -diff --git a/third_party/unrar/src/unrar_wrapper.h b/third_party/unrar/src/unrar_wrapper.h -index 05bf5b256383f..b96260c709717 100644 ---- a/third_party/unrar/src/unrar_wrapper.h -+++ b/third_party/unrar/src/unrar_wrapper.h +diff --git a/third_party/unrar/google/unrar_wrapper.h b/third_party/unrar/google/unrar_wrapper.h +index 9e5a08bf092b0..01a1f7b023e4c 100644 +--- a/third_party/unrar/google/unrar_wrapper.h ++++ b/third_party/unrar/google/unrar_wrapper.h @@ -12,9 +12,9 @@ // Forward declare the unrar symbols needed for extraction, so users of diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 017f24e..d687385 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -70,7 +70,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 108.0.5359.124 +Version: 109.0.5414.74 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -120,11 +120,6 @@ Patch2: chromium-python3.patch # Fix missing opus dependency for media/mojo/services/gpu_mojo_media_client.cc Patch3: chromium-media-mojo-services-opus.patch -# Pull upstream patches -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 @@ -319,6 +314,7 @@ find -type f -exec \ third_party/devtools-frontend/src/front_end/third_party/lodash-isequal \ third_party/devtools-frontend/src/front_end/third_party/marked \ third_party/devtools-frontend/src/front_end/third_party/puppeteer \ + third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt \ third_party/devtools-frontend/src/front_end/third_party/wasmparser \ third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n \ third_party/devtools-frontend/src/third_party \ @@ -436,6 +432,7 @@ find -type f -exec \ third_party/protobuf/third_party/six \ third_party/pthreadpool \ third_party/pyjson5 \ + third_party/pyyaml \ third_party/qcms \ %if !%{with system_re2} third_party/re2 \ @@ -444,6 +441,7 @@ find -type f -exec \ third_party/ruy \ third_party/s2cellid \ third_party/securemessage \ + third_party/selenium-atoms \ third_party/shell-encryption \ third_party/simplejson \ third_party/six \ @@ -461,6 +459,7 @@ find -type f -exec \ third_party/swiftshader/third_party/SPIRV-Headers/include/spirv \ third_party/swiftshader/third_party/SPIRV-Tools \ third_party/swiftshader/third_party/subzero \ + third_party/tensorflow_models \ third_party/tensorflow-text \ third_party/tflite \ third_party/tflite/src/third_party/eigen3 \ @@ -763,6 +762,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Jan 14 2023 - Ting-Wei Lan <lantw44@gmail.com> - 109.0.5414.74-100 +- Update to 109.0.5414.74 + * Sat Dec 17 2022 - Ting-Wei Lan <lantw44@gmail.com> - 108.0.5359.124-100 - Update to 108.0.5359.124 |