[arch-commits] Commit in electron6/trunk (PKGBUILD perfetto-clang11.patch)

[Evangelos Foutras]

    Date: Monday, December 14, 2020 @ 14:59:43
  Author: foutrelis
Revision: 775067

upgpkg: electron6 6.1.12-2: re2 20201101 rebuild

Still had to build with clang 10 because of errors like:

    ../../base/optional.h:346:61: error: no member named 'value' in
    'std::is_constructible<blink::LayoutUnit, const
        base::Optional<blink::LayoutUnit> &>'
              std::is_constructible<T, const Optional<U>&>::value ||
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^

Added:
  electron6/trunk/perfetto-clang11.patch
Modified:
  electron6/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    5 ++++-
 perfetto-clang11.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-14 14:59:04 UTC (rev 775066)
+++ PKGBUILD	2020-12-14 14:59:43 UTC (rev 775067)
@@ -4,7 +4,7 @@
 pkgver=6.1.12
 _commit=cb408dbb5bc2e98b22690a22bf3e14d233d76676
 _chromiumver=76.0.3809.146
-pkgrel=1
+pkgrel=2
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
 url='https://electronjs.org/'
@@ -26,6 +26,7 @@
         'icu67.patch'
         'chromium-gcc10.patch'
         'angle-gcc10.patch'
+        'perfetto-clang11.patch'
         'perfetto-gcc10.patch'
         'webrtc-gcc10.patch'
         'glslang-remove-setAllocator.patch'
@@ -41,6 +42,7 @@
             'b46eeef32c7c773babe15da0c118ca55bf3c084142592695853a73f80b5dc55336cad72636f8ed2308fe9c10bcab953e37ca7ab08f20f545b881fe99a543d247'
             '682cbc25a332ea30e2475fc39fa8e6ce395f65b974520121ccf7be90b7744b0f9b98313e2d9ac0e56a0e41fd444e8dec80a7e8565b7e91508bfe8234e4105f6b'
             'fd8e523b657205ed1cb64581bd9e5597183c1575f0d0523dcc708e3b67e4ff2dcb962b41254b7ad7b180a317161ab47b7e262d2321ac1b21718c3b1bccc54c3e'
+            'd9d232c98cf80d2b337e85883fa07a845fa2f4ffdc73b890f46aa5abba14efadba80d964995b3088476dc93237c203b8bfa91f3bc5f95ab3eb71b57dc3c127b0'
             '047606dacc67dc689bac9d30540331c4f4a56f5ff664115c779b13376918a0279fa0466099aa5e36a6541faa7479ae567ac50a4d4b482cdc34c95ae04aceb51d'
             'a4340a6b338768d51600853d101f7b4e06c7b733bda71f1e193c457edac3bb07887f7c307e60e26edf2fda47986788df8c4645b6ce26dae0d1e0b091f4520e91'
             'e34562b4b6cf4f0afa3f23afe7336fed4614201b39bfb73871899081161f5927d273c1da14b3ab7edeeb803300ba6e07c1ddf7261e8be12555cbfc4fe0a0d23c'
@@ -145,6 +147,7 @@
   patch -Np1 -d v8 <../icu67.patch
   patch -Np1 -i ../chromium-gcc10.patch
   patch -Np1 -d third_party/angle <../angle-gcc10.patch
+  patch -Np1 -d third_party/perfetto <../perfetto-clang11.patch
   patch -Np1 -d third_party/perfetto <../perfetto-gcc10.patch
   patch -Np1 -d third_party/webrtc <../webrtc-gcc10.patch
   patch -Np1 -d third_party/glslang/src <../glslang-remove-setAllocator.patch

Added: perfetto-clang11.patch
===================================================================
--- perfetto-clang11.patch	                        (rev 0)
+++ perfetto-clang11.patch	2020-12-14 14:59:43 UTC (rev 775067)
@@ -0,0 +1,32 @@
+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
+Change-Id: Icc1a8cca06b72ee3322924dc0825ebb62086f730
+---
+ src/tracing/core/virtual_destructors.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tracing/core/virtual_destructors.cc b/src/tracing/core/virtual_destructors.cc
+index 75fc806a5..2f8bb3cef 100644
+--- a/src/tracing/core/virtual_destructors.cc
++++ b/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;