From 6d107155e7d0a59cd30e4ede64d75dc056b1f1cb Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 21:13:38 +0100 Subject: [PATCH] update to 104.0.5112.101 [release 104.0.5112.101-1mamba;Mon Aug 29 2022] --- ...12.79-remove-no-opaque-pointers-flag.patch | 18 +++++ ....5112.79-roll-src-third_party-ffmpeg.patch | 0 ...ium-104.0.5112.79-tflite-system-zlib.patch | 70 +++++++++++++++++++ chromium.spec | 46 +++++------- 4 files changed, 107 insertions(+), 27 deletions(-) create mode 100644 chromium-104.0.5112.79-remove-no-opaque-pointers-flag.patch rename chromium-102.0.5005.61-roll-src-third_party-ffmpeg.patch => chromium-104.0.5112.79-roll-src-third_party-ffmpeg.patch (100%) create mode 100644 chromium-104.0.5112.79-tflite-system-zlib.patch diff --git a/chromium-104.0.5112.79-remove-no-opaque-pointers-flag.patch b/chromium-104.0.5112.79-remove-no-opaque-pointers-flag.patch new file mode 100644 index 0000000..9bd434a --- /dev/null +++ b/chromium-104.0.5112.79-remove-no-opaque-pointers-flag.patch @@ -0,0 +1,18 @@ +--- chromium-104.0.5112.57/build/config/compiler/BUILD.gn.orig 2022-07-26 08:11:54.192788877 +0000 ++++ chromium-104.0.5112.57/build/config/compiler/BUILD.gn 2022-07-26 08:12:10.019328155 +0000 +@@ -1540,15 +1540,6 @@ config("default_warnings") { + cflags += [ "-Wno-unqualified-std-cast-call" ] + } + +- if (!is_nacl && !(is_chromeos || +- default_toolchain == "//build/toolchain/cros:target")) { +- # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated. +- cflags += [ +- "-Xclang", +- "-no-opaque-pointers", +- ] +- } +- + if (is_fuchsia) { + # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383) + cflags += [ "-Wno-deprecated-copy" ] diff --git a/chromium-102.0.5005.61-roll-src-third_party-ffmpeg.patch b/chromium-104.0.5112.79-roll-src-third_party-ffmpeg.patch similarity index 100% rename from chromium-102.0.5005.61-roll-src-third_party-ffmpeg.patch rename to chromium-104.0.5112.79-roll-src-third_party-ffmpeg.patch diff --git a/chromium-104.0.5112.79-tflite-system-zlib.patch b/chromium-104.0.5112.79-tflite-system-zlib.patch new file mode 100644 index 0000000..91ef572 --- /dev/null +++ b/chromium-104.0.5112.79-tflite-system-zlib.patch @@ -0,0 +1,70 @@ +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc +@@ -21,8 +21,8 @@ limitations under the License. + #include "absl/status/status.h" // from @com_google_absl + #include "absl/strings/str_format.h" // from @com_google_absl + #include "absl/strings/string_view.h" // from @com_google_absl +-#include "contrib/minizip/ioapi.h" +-#include "contrib/minizip/unzip.h" ++#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include "third_party/zlib/contrib/minizip/unzip.h" + #include "flatbuffers/flatbuffers.h" // from @flatbuffers + #include "tensorflow/lite/schema/schema_generated.h" + #include "tensorflow_lite_support/cc/common.h" +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc +@@ -19,8 +19,8 @@ limitations under the License. + #include + #include + +-#include "contrib/minizip/ioapi.h" +-#include "contrib/minizip/zip.h" ++#include "third_party/zlib/contrib/minizip/ioapi.h" ++#include "third_party/zlib/contrib/minizip/zip.h" + #include "flatbuffers/flatbuffers.h" // from @flatbuffers + #include "tensorflow/lite/schema/schema_generated.h" + #include "tensorflow_lite_support/cc/common.h" +--- 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 + + #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 { +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #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 { +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #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 { +--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h ++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h +@@ -19,7 +19,7 @@ limitations under the License. + #include + + #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/chromium.spec b/chromium.spec index c714c94..00c42cd 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1,8 +1,8 @@ %define MAJver %(echo %version | cut -d. -f1) -%define gcc_patchset 5 +%define gcc_patchset 2 Name: chromium Epoch: 3 -Version: 102.0.5005.115 +Version: 104.0.5112.101 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 @@ -49,8 +49,10 @@ Patch29: chromium-97.0.4692.71-fix-tag-dragging-in-Mutter.patch Patch30: chromium-98.0.4758.102-libdrm-2.4.110.patch Patch31: chromium-101.0.4951.41-libxml-unbundle.patch Patch32: chromium-102.0.5005.61-remove-no-opaque-pointers-flag.patch -Patch33: chromium-102.0.5005.61-roll-src-third_party-ffmpeg.patch -Patch34: chromium-102.0.5005.61-iwyu-add-utility-for-std-exchange.patch +Patch33: chromium-104.0.5112.79-roll-src-third_party-ffmpeg.patch +Patch34: chromium-102.0.5005.61-iwyu-add-utility-for-std-exchange.patch +Patch35: chromium-104.0.5112.79-remove-no-opaque-pointers-flag.patch +Patch36: chromium-104.0.5112.79-tflite-system-zlib.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -147,6 +149,8 @@ Chromium is an open-source browser project that aims to build a safer, faster, a #% setup -q -a2 %setup -q -D -T :<< ___EOF + +%define _default_patch_fuzz 2 %global __provides_exclude_from ^%{_libdir}/chromium/.*$ # Allow building against system libraries in official builds @@ -156,33 +160,18 @@ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ %ifarch %{ix86} %patch3 -p1 %endif -%patch6 -p1 -b .clang-11-nomerge %patch7 -p1 -b .use-oauth2-client-switches-as-default -#%patch19 -p1 -b .ffmpeg-4.4 -#%patch20 -Rp1 -b .ffmpeg-roll -%patch21 -p0 -b .unexpire-accelerated-video-decode-flag -#%patch17 -Rp1 -b .replace-blacklist-with-ignorelist -%patch22 -Rp1 -b .add-a-TODO-about-a-missing-pnacl-flag -%patch18 -Rp1 -b .use-ffile-compilation-dir -%patch12 -p1 -b .sql-make-VirtualCursor-standard-layout-type -#%patch26 -p1 -b .gcc-2.34 -#%patch27 -p1 -b .unbundle-ffmpeg-av_stream_get_first_dts -#%patch28 -p1 -b .fix-tag-dragging-in-KWin -#%patch29 -p1 -b .fix-tag-dragging-in-Mutter -#%patch30 -p1 -b .libdrm-2.4.110 -%patch31 -p1 -b .libxml-unbundle -%patch32 -p1 -b .remove-no-opaque-pointers-flag +%patch35 -p1 -b .remove-no-opaque-pointers-flag +#%patch21 -p0 -b .unexpire-accelerated-video-decode-flag +#%patch22 -Rp1 -b .add-a-TODO-about-a-missing-pnacl-flag +#%patch18 -Rp1 -b .use-ffile-compilation-dir +%patch36 -p1 -b .tflite-system-zlib %patch33 -Rp1 -b .roll-src-third_party-ffmpeg -%patch34 -p1 -b .iwyu-add-utility-for-std-exchange +%patch12 -p1 -b .sql-make-VirtualCursor-standard-layout-type # Fixes for building with libstdc++ instead of libc++ -patch -Np1 -i patches/chromium-102-fenced_frame_utils-include.patch -patch -Np1 -i patches/chromium-102-regex_pattern-array.patch - -#patch -Np1 -i patches/chromium-96-CommandLine-include.patch -#patch -Np1 -i patches/chromium-96-RestrictedCookieManager-tuple.patch -#patch -Np1 -i patches/chromium-96-DrmRenderNodePathFinder-include.patch -#patch -Np1 -i patches/chromium-96-CouponDB-include.patch +#patch -Np1 -i patches/chromium-102-fenced_frame_utils-include.patch +#patch -Np1 -i patches/chromium-102-regex_pattern-array.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 @@ -446,6 +435,9 @@ ln -s %{_libdir}/chromium/chromedriver %{buildroot}%{_bindir}/chromedriver %{_mandir}/man1/chromium.1* %changelog +* Mon Aug 29 2022 Silvan Calarco 104.0.5112.101-1mamba +- update to 104.0.5112.101 + * Tue Jul 05 2022 Silvan Calarco 102.0.5005.115-1mamba - update to 102.0.5005.115