[chromium-freeworld: 7/10] fix bool issue triggered by newer gcc

commit 8cfa28d97447ac6c323c3576d5efffc5bf8fca19 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Thu Mar 15 13:12:01 2018 -0400 fix bool issue triggered by newer gcc chromium-65.0.3325.162-boolfix.patch | 36 ++++++++++++++++++++++++++++++++++++ chromium.spec | 3 +++ 2 files changed, 39 insertions(+) --- diff --git a/chromium-65.0.3325.162-boolfix.patch b/chromium-65.0.3325.162-boolfix.patch new file mode 100644 index 0000000..325d649 --- /dev/null +++ b/chromium-65.0.3325.162-boolfix.patch @@ -0,0 +1,36 @@ +diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h +--- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-03-15 13:07:54.999428755 -0400 ++++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-03-15 13:08:21.270794252 -0400 +@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { + + bool is_valid() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return static_cast<bool> (handle_); } + + ScopedInterfaceEndpointHandle PassHandle() { + return std::move(handle_); +diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h +--- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-03-15 13:07:09.680523296 -0400 ++++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h 2018-03-15 13:07:44.429684037 -0400 +@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { + // handle. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return static_cast<bool> (handle_); } + + ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } + +diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h +--- chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-03-15 13:08:33.494499025 -0400 ++++ chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h 2018-03-15 13:10:39.218462546 -0400 +@@ -54,7 +54,7 @@ class InterfaceRequest { + // Indicates whether the request currently contains a valid message pipe. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return static_cast<bool> (handle_); } + + // Removes the message pipe from the request and returns it. + ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } diff --git a/chromium.spec b/chromium.spec index db28101..ce61034 100644 --- a/chromium.spec +++ b/chromium.spec @@ -238,6 +238,8 @@ Patch82: chromium-65.0.3325.146-GCC-explicitely-std-move-to-base-Optional-instea Patch83: chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch # https://github.com/lgsvl/meta-lgsvl-browser/blob/ac93e7622be66946c76504be... Patch84: chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.patch +# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return +Patch85: chromium-65.0.3325.162-boolfix.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -697,6 +699,7 @@ udev. %patch82 -p1 -b .explicit-std-move %patch83 -p1 -b .GetString %patch84 -p1 -b .fully-declare +%patch85 -p1 -b .boolfix %if 0%{?asan} export CC="clang"