Index: head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc =================================================================== --- head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc (nonexistent) +++ head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc (revision 546139) @@ -0,0 +1,28 @@ +Backport of: + +From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001 +From: Nico Weber +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; Property changes on: head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property