From 6920f45d16eda2eacac9e2d061affe442f0a6ee8 Mon Sep 17 00:00:00 2001 From: Alzim Date: Sat, 24 Oct 2020 19:02:46 +0300 Subject: [PATCH] Add chromium-86.0.4240.111-nearby-payload_manager.patch --- chromium-86.0.4240.111-nearby-payload_manager.patch | 11 +++++++++++ chromium-browser-stable.spec | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 chromium-86.0.4240.111-nearby-payload_manager.patch diff --git a/chromium-86.0.4240.111-nearby-payload_manager.patch b/chromium-86.0.4240.111-nearby-payload_manager.patch new file mode 100644 index 0000000..704ea20 --- /dev/null +++ b/chromium-86.0.4240.111-nearby-payload_manager.patch @@ -0,0 +1,11 @@ +--- dev.orig/third_party/nearby/src/cpp/core_v2/internal/payload_manager.cc ++++ dev/third_party/nearby/src/cpp/core_v2/internal/payload_manager.cc +@@ -946,7 +946,7 @@ PayloadManager::PendingPayload::PendingP + for (const auto& id : endpoint_ids) { + endpoints_.emplace(id, EndpointInfo{ + .id = id, +- .status {EndpointInfo::Status::kAvailable}, ++ .status = AtomicReference(EndpointInfo::Status::kAvailable), + }); + } + } diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 228a30f..30af49f 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -154,6 +154,8 @@ Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch Patch636: remove-dead-reloc-in-nonalloc-LD-flags.patch # Fix build /sandbox/policy/linux/bpf_gpu_policy_linux.cc Patch637: chromium-86.0.4240.80-fcntl-h.patch +# Fix build nearby/src/cpp/core_v2/internal/payload_manager.cc +Patch638: chromium-86.0.4240.111-nearby-payload_manager.patch BuildRequires: bison %if %{with clang} @@ -402,6 +404,9 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %endif %patch636 -p1 %patch637 -p1 -b .fcntl +%if %{mdvver} == 201905 +%patch638 -p1 +%endif # fatal error: 'fuzzer/FuzzedDataProvider.h' file not found # (Available in Clang10)