[chromium-libs-media-freeworld: 222/259] Fix the build of remoting_all target

commit 05ed80ce7ee4f1c18ac322cf720e62d21ec15bbc Author: Tomas Popela <tpopela(a)redhat.com&gt; Date: Tue Aug 20 21:36:06 2019 +0200 Fix the build of remoting_all target ...mium-76.0.3809.100-gcc-remoting-constexpr.patch | 27 ++++++++++++++++++++++ ...ium-76.0.3809.100-vtable-symbol-undefined.patch | 11 +++++++++ chromium.spec | 11 ++++++--- 3 files changed, 46 insertions(+), 3 deletions(-) --- diff --git a/chromium-76.0.3809.100-gcc-remoting-constexpr.patch b/chromium-76.0.3809.100-gcc-remoting-constexpr.patch new file mode 100644 index 0000000..c59702f --- /dev/null +++ b/chromium-76.0.3809.100-gcc-remoting-constexpr.patch @@ -0,0 +1,27 @@ +diff -up chromium-76.0.3809.100/remoting/signaling/message_tracker.cc.gcc-constexpr chromium-76.0.3809.100/remoting/signaling/message_tracker.cc +--- chromium-76.0.3809.100/remoting/signaling/message_tracker.cc.gcc-constexpr 2019-08-09 16:48:08.000000000 +0200 ++++ chromium-76.0.3809.100/remoting/signaling/message_tracker.cc 2019-08-20 21:29:14.545465656 +0200 +@@ -9,8 +9,7 @@ + namespace remoting { + + // static +-const base::TimeDelta MessageTracker::kCleanupInterval = +- base::TimeDelta::FromMinutes(2); ++constexpr base::TimeDelta MessageTracker::kCleanupInterval; + + MessageTracker::MessageTracker() = default; + +diff -up chromium-76.0.3809.100/remoting/signaling/message_tracker.h.gcc-constexpr chromium-76.0.3809.100/remoting/signaling/message_tracker.h +--- chromium-76.0.3809.100/remoting/signaling/message_tracker.h.gcc-constexpr 2019-08-20 21:27:53.539653248 +0200 ++++ chromium-76.0.3809.100/remoting/signaling/message_tracker.h 2019-08-20 21:28:23.371952434 +0200 +@@ -36,7 +36,8 @@ class MessageTracker final { + + // All IDs older than now - kCleanupInterval will be eventually removed, but + // they are not guaranteed to be immediately removed after the interval. +- static constexpr base::TimeDelta kCleanupInterval; ++ static constexpr base::TimeDelta kCleanupInterval = ++ base::TimeDelta::FromMinutes(2); + + void RemoveExpiredIds(); + +diff -up chromium-76.0.3809.100/remoting/signaling/message_tracker_unittest.cc.gcc-constexpr chromium-76.0.3809.100/remoting/signaling/message_tracker_unittest.cc diff --git a/chromium-76.0.3809.100-vtable-symbol-undefined.patch b/chromium-76.0.3809.100-vtable-symbol-undefined.patch new file mode 100644 index 0000000..64532df --- /dev/null +++ b/chromium-76.0.3809.100-vtable-symbol-undefined.patch @@ -0,0 +1,11 @@ +diff -up chromium-76.0.3809.100/net/quic/platform/impl/quic_default_proof_providers_impl.cc.vtable-symbol-undefined chromium-76.0.3809.100/net/quic/platform/impl/quic_default_proof_providers_impl.cc +--- chromium-76.0.3809.100/net/quic/platform/impl/quic_default_proof_providers_impl.cc.vtable-symbol-undefined 2019-08-20 21:21:24.901899270 +0200 ++++ chromium-76.0.3809.100/net/quic/platform/impl/quic_default_proof_providers_impl.cc 2019-08-20 21:19:30.361746211 +0200 +@@ -18,6 +18,7 @@ + #include "net/quic/crypto/proof_verifier_chromium.h" + #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h" + #include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h" ++#include "net/quic/platform/impl/quic_flags_impl.cc" + + DEFINE_QUIC_COMMAND_LINE_FLAG(std::string, + certificate_file, diff --git a/chromium.spec b/chromium.spec index f003849..e06bcdd 100644 --- a/chromium.spec +++ b/chromium.spec @@ -297,10 +297,13 @@ Patch58: chromium-76.0.3809.100-gcc-history-move-noexcept.patch Patch59: chromium-76.0.3809.100-gcc-accountinfo-move-noexcept.patch # https://chromium.googlesource.com/chromium/src.git/+/5d7f227fa844e79568df... Patch60: chromium-76.0.3809.100-gcc-themeservice-includes.patch -# TBD - need to submit it -# In GCC one can't use alignas() for exported classes (as described in -# https://cs.chromium.org/chromium/src/base/compiler_specific.h?rcl=a5bcc05...) +# In GCC one can't use alignas() for exported classes +# https://chromium.googlesource.com/chromium/src.git/+/8148fd96ae04a1150a9c... Patch61: chromium-76.0.3809.100-gcc-no-alignas-and-export.patch +# Needs to be submitted.. +Patch62: chromium-76.0.3809.100-gcc-remoting-constexpr.patch +# Needs to be submitted.. (ugly hack, needs to be added properly to GN files) +Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch # Apply these changes to work around EPEL7 compiler issues Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch @@ -874,6 +877,8 @@ udev. %patch59 -p1 -b .gcc-accountinfo-move-noexcept %patch60 -p1 -b .gcc-themeservice-includes %patch61 -p1 -b .gcc-no-alignas-and-export +%patch62 -p1 -b .gcc-remoting-constexpr +%patch63 -p1 -b .vtable-symbol-undefined # EPEL specific patches %if 0%{?rhel} == 7