From nobody Fri Nov 01 20:51:32 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XgChN6Kdlz5cRrf; Fri, 01 Nov 2024 20:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XgChN5prPz4ZPx; Fri, 1 Nov 2024 20:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730494292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2gDRu3dv8ewOw+1vKuVpI1zRUkv25NuAUb6eKw8rd4=; b=h85Ia30UQ2hByOr9qfhIDxx3pA2udCHJZmwKF6PLopx+aVHgzFTQyky+250/bJ9EJ/LCVh ObA3TrqIHFK1L9A4Agpdr+KwOa8KBEYr+9P30ADzsClZU6vKI6TWss9avSMVPtF2v1Qefg wDr1QKB1t0VwY+RIUzrK5w9ounN1KXPNZ1kSRPb99pXLbQdEJAMMwCEJxOLMXVO86/sYLu FeuBcWLcbvEinWfg/gVXy7xu3Nkdb0RCVCqGXkkco7EJHDWuaeqXLTxXymUv75PrxwwJS/ 7hMlyJkOy6004Vm2rW9+5yuWggYtSTxe1LEfpc+cw1Qr0mSn3MnDHRTvIuIJiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730494292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2gDRu3dv8ewOw+1vKuVpI1zRUkv25NuAUb6eKw8rd4=; b=S2ajoihy6EkesGQ4bzZ9VAD2Sm4HQapQTpsj4j+6A5yL/nEyqobeoTDDd5kN4S2lCtg7zP vavkm6Ueseypu3qWZS7KrIH5EPPQsSQjSb6v8osL9IIEiBm1KCC3YMd/5EZEOvpfPTeO8x XguvFdi05wvZzAyl7vY5pNYNUciUR/h+CPD6io0XvAJP54ybqWhqyQlyAih5ZtJZUdSz3s anWtu4AdcSzGa0TDNkxRt6XZqMmRRwtVMLP6uUTxtcMvnKnyrPwnab7dtjwZL7sIoXMFdj XjyBHYw+Kw/t2AxFOj/KYvFfItEDeqMRLB0uYDV4XfQPFfN4y54Z2fEmvIGYDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730494292; a=rsa-sha256; cv=none; b=gbHd5jALOH3+KarCOj/eG+ohqXURHr1HLEzMOhHqNT9vqSVNE2Oo8EPmRZVrbVFMLXHeVW tL26feOAwUxPGXWjmAyc+o03XNvHNol4MaI6/2glMgBNaFeW4oqck8KLzOWCJQfnoqEO2e CvC7EAxAhANoUNqi/el2pFp+6kekmiVFoMfKVe5A5mF09iZi/i8UE5I6cGp421r9pf3d1Z /bCAtLRGOxBnm+9FD8fp2TUZNd3ervpxSGmCafqaeUxWZIbpXYyol7Xg1N1SPXfoRL9rrM sBrV1U2eGA5WPQmY+gn5qTHAQks+rgkt4qxFH3ZVT0BHNPtK8VPiwqFtQ9Mwcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XgChN50k2zbt6; Fri, 1 Nov 2024 20:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A1KpWHR001218; Fri, 1 Nov 2024 20:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A1KpW8s001212; Fri, 1 Nov 2024 20:51:32 GMT (envelope-from git) Date: Fri, 1 Nov 2024 20:51:32 GMT Message-Id: <202411012051.4A1KpW8s001212@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 2457237c15a3 - main - devel/electron31: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2457237c15a3db2b496a1e5660e9f0d4a6d56e64 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=2457237c15a3db2b496a1e5660e9f0d4a6d56e64 commit 2457237c15a3db2b496a1e5660e9f0d4a6d56e64 Author: Guido Falsi AuthorDate: 2024-11-01 20:50:10 +0000 Commit: Hiroki Tagato CommitDate: 2024-11-01 20:51:19 +0000 devel/electron31: fix build with clang 19 PR: 282370 Reported by: madpilot MFH: 2024Q4 --- .../patch-electron_shell_common_keyboard__util.cc | 11 +++++ ...party_blink_renderer_platform_wtf_hash__table.h | 31 +++++++++++++ ...o_tracing_internal_track__event__data__source.h | 54 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/devel/electron31/files/patch-electron_shell_common_keyboard__util.cc b/devel/electron31/files/patch-electron_shell_common_keyboard__util.cc new file mode 100644 index 000000000000..977f0dea72a5 --- /dev/null +++ b/devel/electron31/files/patch-electron_shell_common_keyboard__util.cc @@ -0,0 +1,11 @@ +--- electron/shell/common/keyboard_util.cc.orig 2024-10-23 21:18:11 UTC ++++ electron/shell/common/keyboard_util.cc +@@ -16,7 +16,7 @@ using CodeAndShiftedChar = std::pair>; + +-constexpr CodeAndShiftedChar KeyboardCodeFromKeyIdentifier( ++CodeAndShiftedChar KeyboardCodeFromKeyIdentifier( + const std::string_view str) { + #if BUILDFLAG(IS_MAC) + constexpr auto CommandOrControl = ui::VKEY_COMMAND; diff --git a/devel/electron31/files/patch-third__party_blink_renderer_platform_wtf_hash__table.h b/devel/electron31/files/patch-third__party_blink_renderer_platform_wtf_hash__table.h new file mode 100644 index 000000000000..831809a8e908 --- /dev/null +++ b/devel/electron31/files/patch-third__party_blink_renderer_platform_wtf_hash__table.h @@ -0,0 +1,31 @@ +--- third_party/blink/renderer/platform/wtf/hash_table.h.orig 2024-08-19 05:20:52 UTC ++++ third_party/blink/renderer/platform/wtf/hash_table.h +@@ -1639,7 +1639,7 @@ HashTable::InitializeTable( + original_table, new_table_size); +@@ -1693,7 +1693,7 @@ Value* HashTablestore(new_hash_table.table_, std::memory_order_relaxed); +- Allocator::template BackingWriteBarrier(&table_); ++ Allocator::BackingWriteBarrier(&table_); + table_size_ = new_table_size; + + new_hash_table.table_ = old_table; +@@ -1845,8 +1845,8 @@ void HashTable::value) { + // Weak processing is omitted when no backing store is present. In case such + // an empty table is later on used it needs to be strongified. diff --git a/devel/electron31/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h b/devel/electron31/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h new file mode 100644 index 000000000000..96a551155ab9 --- /dev/null +++ b/devel/electron31/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h @@ -0,0 +1,54 @@ +--- third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h.orig 2024-08-19 05:26:12 UTC ++++ third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h +@@ -328,13 +328,13 @@ class TrackEventDataSource + } + + static void Flush() { +- Base::template Trace([](typename Base::TraceContext ctx) { ctx.Flush(); }); ++ Base::Trace([](typename Base::TraceContext ctx) { ctx.Flush(); }); + } + + // Determine if *any* tracing category is enabled. + static bool IsEnabled() { + bool enabled = false; +- Base::template CallIfEnabled( ++ Base::CallIfEnabled( + [&](uint32_t /*instances*/) { enabled = true; }); + return enabled; + } +@@ -349,7 +349,7 @@ class TrackEventDataSource + static bool IsDynamicCategoryEnabled( + const DynamicCategory& dynamic_category) { + bool enabled = false; +- Base::template Trace([&](typename Base::TraceContext ctx) { ++ Base::Trace([&](typename Base::TraceContext ctx) { + enabled = enabled || IsDynamicCategoryEnabled(&ctx, dynamic_category); + }); + return enabled; +@@ -496,7 +496,7 @@ class TrackEventDataSource + const protos::gen::TrackDescriptor& desc) { + PERFETTO_DCHECK(track.uuid == desc.uuid()); + TrackRegistry::Get()->UpdateTrack(track, desc.SerializeAsString()); +- Base::template Trace([&](typename Base::TraceContext ctx) { ++ Base::Trace([&](typename Base::TraceContext ctx) { + TrackEventInternal::WriteTrackDescriptor( + track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), + *ctx.GetCustomTlsState(), TrackEventInternal::GetTraceTime()); +@@ -1047,7 +1047,7 @@ class TrackEventDataSource + Lambda lambda) PERFETTO_ALWAYS_INLINE { + using CatTraits = CategoryTraits; + if (CatTraits::kIsDynamic) { +- Base::template TraceWithInstances(instances, std::move(lambda)); ++ Base::TraceWithInstances(instances, std::move(lambda)); + } else { + Base::template TraceWithInstances( + instances, std::move(lambda), {CatTraits::GetStaticIndex(category)}); +@@ -1061,7 +1061,7 @@ class TrackEventDataSource + const TrackType& track, + std::function callback) { + TrackRegistry::Get()->UpdateTrack(track, std::move(callback)); +- Base::template Trace([&](typename Base::TraceContext ctx) { ++ Base::Trace([&](typename Base::TraceContext ctx) { + TrackEventInternal::WriteTrackDescriptor( + track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), + *ctx.GetCustomTlsState(), TrackEventInternal::GetTraceTime());