From d3e96e671b46f81f9fa7d5bd17631e7f06199b83 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 23 Oct 2019 11:19:54 -0400 Subject: [PATCH] more 78 fixes --- chromium-78.0.3904.70-gcc-sizet-fix.patch | 20 ++++++++++++++++++++ chromium.spec | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 chromium-78.0.3904.70-gcc-sizet-fix.patch diff --git a/chromium-78.0.3904.70-gcc-sizet-fix.patch b/chromium-78.0.3904.70-gcc-sizet-fix.patch new file mode 100644 index 00000000..b95b0ed5 --- /dev/null +++ b/chromium-78.0.3904.70-gcc-sizet-fix.patch @@ -0,0 +1,20 @@ +diff -up chromium-78.0.3904.70/base/containers/intrusive_heap.h.gcc-sizet chromium-78.0.3904.70/base/containers/intrusive_heap.h +--- chromium-78.0.3904.70/base/containers/intrusive_heap.h.gcc-sizet 2019-10-23 11:02:56.767907986 -0400 ++++ chromium-78.0.3904.70/base/containers/intrusive_heap.h 2019-10-23 11:04:58.317351636 -0400 +@@ -131,6 +131,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -149,7 +150,7 @@ namespace base { + // in place. + class BASE_EXPORT HeapHandle { + public: +- enum : size_t { kInvalidIndex = -1 }; ++ enum : size_t { kInvalidIndex = std::numeric_limits::max() }; + + constexpr HeapHandle() = default; + constexpr HeapHandle(const HeapHandle& other) = default; diff --git a/chromium.spec b/chromium.spec index 675a54bb..3f62331d 100644 --- a/chromium.spec +++ b/chromium.spec @@ -218,6 +218,8 @@ Patch57: chromium-77.0.3865.120-gcc-fix-zlib-symbol-visibility.patch Patch58: chromium-78.0.3904.70-gcc-fix-invalid-pragma.patch # https://chromium.googlesource.com/chromium/src/+/2db67d40ef766c63a73896866a2d66e834cb9716 Patch59: chromium-78.0.3904.70-gcc-mark-CheckOpResult-constexpr.patch +# https://chromium.googlesource.com/chromium/src/+/9662ec844017690d5fd56bf0f05ef6a540dd29c1 +Patch60: chromium-78.0.3904.70-gcc-sizet-fix.patch # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch @@ -741,6 +743,7 @@ udev. %patch57 -p1 -b .gcc-fix-zlib-symbol-visibility %patch58 -p1 -b .gcc-invalid-pragma %patch59 -p1 -b .gcc-mark-CheckOpResult-constexpr +%patch60 -p1 -b .gcc-sizet # Fedora branded user agent %if 0%{?fedora} @@ -903,7 +906,7 @@ ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node # Gentoo's Chromium ebuild) are the libraries that needs to be preserved. build/linux/unbundle/remove_bundled_libraries.py \ 'base/third_party/cityhash' \ - 'base/third_party/dmg_fp' \ + 'base/third_party/double_conversion' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ 'base/third_party/libevent' \