Date: Thu, 31 Oct 2024 10:58:24 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 5d2dc5802e1e - 2024Q4 - devel/electron30: fix build with clang 19 Message-ID: <202410311058.49VAwOcr096096@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d2dc5802e1e837ee531c8301b790229159fefa2 commit 5d2dc5802e1e837ee531c8301b790229159fefa2 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2024-10-31 10:53:13 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> 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>(args)...); + } + +- const T* get() const { +- return const_cast<PlacementStorage*>(this)->storage(); +- } ++ const T* get() const { return const_cast<PlacementStorage*>(this)->get(); } + T* get() { return reinterpret_cast<T*>(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<ui::KeyboardCode, + + using CodeAndShiftedChar = std::pair<ui::KeyboardCode, std::optional<char16_t>>; + +-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<Key, Value, Extractor, Traits, KeyTraits, Al + } + } + table_ = temporary_table; +- Allocator::template BackingWriteBarrier(&table_); ++ Allocator::BackingWriteBarrier(&table_); + + HashTableBucketInitializer<Traits, Allocator, Value>::InitializeTable( + original_table, new_table_size); +@@ -1686,7 +1686,7 @@ Value* HashTable<Key, Value, Extractor, Traits, KeyTra + // This swaps the newly allocated buffer with the current one. The store to + // the current table has to be atomic to prevent races with concurrent marker. + AsAtomicPtr(&table_)->store(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<Key, Value, Extractor, Traits, KeyTrait + // on the mutator thread, which is also the only one that writes to them, so + // there is *no* risk of data races when reading. + AtomicWriteSwap(table_, other.table_); +- Allocator::template BackingWriteBarrier(&table_); +- Allocator::template BackingWriteBarrier(&other.table_); ++ Allocator::BackingWriteBarrier(&table_); ++ Allocator::BackingWriteBarrier(&other.table_); + if (IsWeak<ValueType>::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<CategoryType>; + if (CatTraits::kIsDynamic) { +- Base::template TraceWithInstances(instances, std::move(lambda)); ++ Base::TraceWithInstances(instances, std::move(lambda)); + } else { + Base::template TraceWithInstances<CategoryTracePointTraits>( + instances, std::move(lambda), {CatTraits::GetStaticIndex(category)}); +@@ -1061,7 +1061,7 @@ class TrackEventDataSource + const TrackType& track, + std::function<void(protos::pbzero::TrackDescriptor*)> 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());
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410311058.49VAwOcr096096>