From nobody Thu Oct 31 10:58:24 2024 X-Original-To: dev-commits-ports-branches@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 4XfLZT1z5qz5bgXZ; Thu, 31 Oct 2024 10:58:25 +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 4XfLZT0nXrz4Y6d; Thu, 31 Oct 2024 10:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730372305; 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=0brM//KI9izBdjevP1S+ahnzhfI85/JkKI8Xx7dB+RE=; b=ZV+ZGS/Fwq0dHQ6pU+IggFRxAzL+yLRAplGryWDYcL3dJwEoCIW/8I3nZm70VjZHfEESIL CfJa71YCihpzoSfyk4L7/H55YdNDgI9WVd8Own5gnwF+pAKur8XgJlpLGFw8rv3qD4k8Bj U0GICgFVVi2ukhTkGGD7KkhpbZPXbaOaqlSpxHBnmK4sCLP06rITxoDnG1XRUMTcxGDdmT dqrCC1sDGKLHhx0ErLNaoksGJ/hQPeq2KHPw6HO2EFWW8nfqD3xSU6gWodq5AcbmblrzuW hFAZMFuEPnSxPsnre+Z9lzVWYoHGPA6obB0wc7PdKF0B+AdGVLH57alkRfpsFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730372305; 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=0brM//KI9izBdjevP1S+ahnzhfI85/JkKI8Xx7dB+RE=; b=H/iwB9aPTO+nXYXLqppYyP/aXZDCTEbLrC3a63up1ykzzFVtRhGwXdrF1in7g5wQ0nOQjf GXWITmh9P3BGVGl//gb0LfqHKJQzp0ItN84k5t8KzEJGBoqaV7nyS1/ZGCdmjVZe8cWrH8 DeErPOvflBbygJvHC60Ny01Y0eovnLXHAL7A6cmIlMaLu+YYVhm527j+Xo6IX3g0ccGUp/ /HIz9DtDxyFQXHA/bK5p4pTXV2kFmy5Oz+G1NCYZ5MpAqhXkqGhZeuafGcqrIdibbi32Rv 9AjF0SG6gyjY8NAZUi8kQkNsLqB8cLNvswkQzxQbO/DFF5g9ewtIbGUyiMR8JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730372305; a=rsa-sha256; cv=none; b=gMPAto+fZNrAQRVk7kpXYgz1EsBbyMxwDWe/hLNxv4Zn8GvojyYAxU+fc8moMqhx85NSIB Erkv+IMMss00dNzDCF9s/6PJQrmIIvSdYflFlvjx6YDXvIphz6dyTDHoGkFmBX7ytvbeKM NT8VhMtlyGs5qwC6WzTY6Xsc4apy3+O3DhcTVW6qpCvyfN2o6068U4CTT2pde9kcwh2ng3 5eqI47v8tvEWyLpXawChD/juDnbrd7udoxXS6h5x6yfN6poIAeadmXKxfiRK0I0o2qy06A kblUNK5Z2f2ndRFPfXo8Luv/lLScGttG/zrwKWlspLNFVi1/CzlbGEKsXYp7Dg== 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 4XfLZT0FL0zYy6; Thu, 31 Oct 2024 10:58:25 +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 49VAwOD5096099; Thu, 31 Oct 2024 10:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VAwOcr096096; Thu, 31 Oct 2024 10:58:24 GMT (envelope-from git) Date: Thu, 31 Oct 2024 10:58:24 GMT Message-Id: <202410311058.49VAwOcr096096@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: 5d2dc5802e1e - 2024Q4 - devel/electron30: fix build with clang 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 5d2dc5802e1e837ee531c8301b790229159fefa2 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d2dc5802e1e837ee531c8301b790229159fefa2 commit 5d2dc5802e1e837ee531c8301b790229159fefa2 Author: Guido Falsi AuthorDate: 2024-10-31 10:53:13 +0000 Commit: Hiroki Tagato CommitDate: 2024-10-31 10:58:12 +0000 devel/electron30: fix build with clang 19 PR: 282370 Reported by: madpilot MFH: 2024Q4 (cherry picked from commit 85e785bd0f4e3e3b979448594b986ee7174acc4a) --- ...__alloc_partition__alloc__base_no__destructor.h | 13 ++++++ .../files/patch-base_containers_id__map.h | 13 ++++++ .../patch-electron_shell_common_keyboard__util.cc | 11 +++++ ...he_src_quiche_quic_core_quic__interval__deque.h | 17 +++++++ ...party_blink_renderer_platform_wtf_hash__table.h | 31 +++++++++++++ ...o_tracing_internal_track__event__data__source.h | 54 ++++++++++++++++++++++ 6 files changed, 139 insertions(+) diff --git a/devel/electron30/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_no__destructor.h b/devel/electron30/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_no__destructor.h new file mode 100644 index 000000000000..44b13a9aa52c --- /dev/null +++ b/devel/electron30/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__base_no__destructor.h @@ -0,0 +1,13 @@ +--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h.orig 2024-06-13 07:40:39 UTC ++++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/no_destructor.h +@@ -122,9 +122,7 @@ class NoDestructor { + new (storage_) T(std::forward(args)...); + } + +- const T* get() const { +- return const_cast(this)->storage(); +- } ++ const T* get() const { return const_cast(this)->get(); } + T* get() { return reinterpret_cast(storage_); } + + private: diff --git a/devel/electron30/files/patch-base_containers_id__map.h b/devel/electron30/files/patch-base_containers_id__map.h new file mode 100644 index 000000000000..d935c0a1a498 --- /dev/null +++ b/devel/electron30/files/patch-base_containers_id__map.h @@ -0,0 +1,13 @@ +--- base/containers/id_map.h.orig 2024-06-13 07:40:39 UTC ++++ base/containers/id_map.h +@@ -178,8 +178,8 @@ class IDMap final { + } + + const Iterator& operator=(const Iterator& iter) { +- map_ = iter.map; +- iter_ = iter.iter; ++ map_ = iter.map_; ++ iter_ = iter.iter_; + Init(); + return *this; + } diff --git a/devel/electron30/files/patch-electron_shell_common_keyboard__util.cc b/devel/electron30/files/patch-electron_shell_common_keyboard__util.cc new file mode 100644 index 000000000000..4d581e85bd9a --- /dev/null +++ b/devel/electron30/files/patch-electron_shell_common_keyboard__util.cc @@ -0,0 +1,11 @@ +--- electron/shell/common/keyboard_util.cc.orig 2024-09-10 16:10:30 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/electron30/files/patch-net_third__party_quiche_src_quiche_quic_core_quic__interval__deque.h b/devel/electron30/files/patch-net_third__party_quiche_src_quiche_quic_core_quic__interval__deque.h new file mode 100644 index 000000000000..284b13052bd1 --- /dev/null +++ b/devel/electron30/files/patch-net_third__party_quiche_src_quiche_quic_core_quic__interval__deque.h @@ -0,0 +1,17 @@ +--- net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h.orig 2024-06-13 07:42:15 UTC ++++ net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h +@@ -198,12 +198,12 @@ class QUICHE_NO_EXPORT QuicIntervalDeque { + Iterator operator+(difference_type amount) const { + Iterator copy = *this; + copy.index_ += amount; +- QUICHE_DCHECK(copy.index_ < copy.deque_->size()); ++ QUICHE_DCHECK(copy.index_ < copy.deque_->Size()); + return copy; + } + Iterator& operator+=(difference_type amount) { + index_ += amount; +- QUICHE_DCHECK(index_ < deque_->size()); ++ QUICHE_DCHECK(index_ < deque_->Size()); + return *this; + } + difference_type operator-(const Iterator& rhs) const { diff --git a/devel/electron30/files/patch-third__party_blink_renderer_platform_wtf_hash__table.h b/devel/electron30/files/patch-third__party_blink_renderer_platform_wtf_hash__table.h new file mode 100644 index 000000000000..2fb091d1cc9c --- /dev/null +++ b/devel/electron30/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-06-13 07:40:54 UTC ++++ third_party/blink/renderer/platform/wtf/hash_table.h +@@ -1632,7 +1632,7 @@ HashTable::InitializeTable( + original_table, new_table_size); +@@ -1686,7 +1686,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; +@@ -1838,8 +1838,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/electron30/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h b/devel/electron30/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h new file mode 100644 index 000000000000..add6aba0feea --- /dev/null +++ b/devel/electron30/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-06-13 07:45:23 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());