Date: Tue, 25 Aug 2020 07:18:30 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546142 - head/devel/electron6/files Message-ID: <202008250718.07P7IUsV025292@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Tue Aug 25 07:18:29 2020 New Revision: 546142 URL: https://svnweb.freebsd.org/changeset/ports/546142 Log: devel/electron6: copy fix for current from electron7 Note, this does not yet completely fix electron6: Next error: In file included from ../../third_party/blink/public/platform/web_string.h:36: ../../base/optional.h:346:61: error: no member named 'value' in 'std::__1::is_constructible<blink::LayoutUnit, const base::Optional<blink::LayoutUnit> &>' std::is_constructible<T, const Optional<U>&>::value || ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ Added: head/devel/electron6/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc - copied unchanged from r546139, head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc Copied: head/devel/electron6/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc (from r546139, head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/electron6/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc Tue Aug 25 07:18:29 2020 (r546142, copy of r546139, head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc) @@ -0,0 +1,28 @@ +Backport of: + +From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001 +From: Nico Weber <thakis@chromium.org> +Date: Sat, 8 Feb 2020 21:26:53 -0500 +Subject: [PATCH] Fix compile error emitted by trunk clang + +../../third_party/perfetto/src/tracing/core/virtual_destructors.cc:33:35: +error: destructor cannot be declared using a type alias + 'perfetto::TracingService::ConsumerEndpoint' (aka + 'perfetto::ConsumerEndpoint') of the class name +TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; + +Bug: chromium:1050372 + +--- third_party/perfetto/src/tracing/core/virtual_destructors.cc.orig 2020-08-24 19:11:33 UTC ++++ third_party/perfetto/src/tracing/core/virtual_destructors.cc +@@ -30,8 +30,8 @@ namespace perfetto { + Consumer::~Consumer() = default; + Producer::~Producer() = default; + TracingService::~TracingService() = default; +-TracingService::ConsumerEndpoint::~ConsumerEndpoint() = default; +-TracingService::ProducerEndpoint::~ProducerEndpoint() = default; ++ConsumerEndpoint::~ConsumerEndpoint() = default; ++ProducerEndpoint::~ProducerEndpoint() = default; + SharedMemory::~SharedMemory() = default; + SharedMemory::Factory::~Factory() = default; + SharedMemoryArbiter::~SharedMemoryArbiter() = default;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008250718.07P7IUsV025292>