svn commit: r546139 - head/devel/electron7/files

Tobias C. Berner tcberner at FreeBSD.org
Tue Aug 25 05:53:35 UTC 2020


Author: tcberner
Date: Tue Aug 25 05:53:34 2020
New Revision: 546139
URL: https://svnweb.freebsd.org/changeset/ports/546139

Log:
  devel/electron7: fix build on current
  
  Obtained from:	https://github.com/google/perfetto/commit/46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb

Added:
  head/devel/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc   (contents, props changed)

Added: 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/electron7/files/patch-third__party_perfetto_src_tracing_core_virtual__destructors.cc	Tue Aug 25 05:53:34 2020	(r546139)
@@ -0,0 +1,28 @@
+Backport of:
+
+From 46f0abc66c1d78c60a0415c5cb46852ef3bfa9bb Mon Sep 17 00:00:00 2001
+From: Nico Weber <thakis at 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;


More information about the svn-ports-head mailing list