This diff, taken from
https://github.com/freebsd/freebsd-ports/commit/0ddd6468fb3cb9ba390973520517cb1ca2cd690d
fixes the build on amd64 with llvm 19 and also builds on arm64-current.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebengine/Makefile,v
diff -u -p -r1.67 Makefile
--- Makefile 23 Dec 2024 12:50:35 -0000 1.67
+++ Makefile 28 Jan 2025 17:14:49 -0000
@@ -9,6 +9,7 @@ USE_NOBTCFI = Yes
QT5NAME = QtWebEngine
KDE_COMMIT = 17fd3176988586168bee8654008a097a5f23ec1d
KDE_VERSION = 11
+REVISION = 0
# Override
VERSION = ${QT5_WEBENGINE_VERSION}
Index: patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_wtf_hash_table_h
===================================================================
RCS file: patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_wtf_hash_table_h
diff -N patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_wtf_hash_table_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_3rdparty_chromium_third_party_blink_renderer_platform_wtf_hash_table_h 28 Jan 2025 17:14:36 -0000
@@ -0,0 +1,34 @@
+https://github.com/freebsd/freebsd-ports/commit/0ddd6468fb3cb9ba390973520517cb1ca2cd690d
+
+Index: src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h.orig
++++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h
+@@ -1786,7 +1786,7 @@ HashTable<Key, Value, Extractor, HashFunctions, Traits
+ }
+ }
+ table_ = temporary_table;
+- Allocator::template BackingWriteBarrier(&table_);
++ Allocator::template BackingWriteBarrier<>(&table_);
+
+ if (Traits::kEmptyValueIsZero) {
+ memset(original_table, 0, new_table_size * sizeof(ValueType));
+@@ -1844,7 +1844,7 @@ HashTable<Key, Value, Extractor, HashFunctions, Traits
+ // 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::template BackingWriteBarrier<>(&table_);
+ table_size_ = new_table_size;
+
+ new_hash_table.table_ = old_table;
+@@ -2012,8 +2012,8 @@ void HashTable<Key,
+ // 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::template BackingWriteBarrier<>(&table_);
++ Allocator::template 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.
Index: patches/patch-src_3rdparty_chromium_third_party_perfetto_include_perfetto_tracing_internal_track_event_data_source_h
===================================================================
RCS file: patches/patch-src_3rdparty_chromium_third_party_perfetto_include_perfetto_tracing_internal_track_event_data_source_h
diff -N patches/patch-src_3rdparty_chromium_third_party_perfetto_include_perfetto_tracing_internal_track_event_data_source_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_3rdparty_chromium_third_party_perfetto_include_perfetto_tracing_internal_track_event_data_source_h 28 Jan 2025 17:14:36 -0000
@@ -0,0 +1,50 @@
+https://github.com/freebsd/freebsd-ports/commit/0ddd6468fb3cb9ba390973520517cb1ca2cd690d
+
+Index: src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h
+--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h.orig
++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h
+@@ -107,7 +107,7 @@ class TrackEventDataSource
+ }
+
+ static void Flush() {
+- Base::template Trace([](typename Base::TraceContext ctx) { ctx.Flush(); });
++ Base::Trace([](typename Base::TraceContext ctx) { ctx.Flush(); });
+ }
+
+ // Determine if tracing for the given static category is enabled.
+@@ -121,7 +121,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 = IsDynamicCategoryEnabled(&ctx, dynamic_category);
+ });
+ return enabled;
+@@ -428,7 +428,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());
+ });
+@@ -545,7 +545,7 @@ class TrackEventDataSource
+ static void TraceWithInstances(uint32_t instances,
+ Lambda lambda) PERFETTO_ALWAYS_INLINE {
+ if (CategoryIndex == TrackEventCategoryRegistry::kDynamicCategoryIndex) {
+- Base::template TraceWithInstances(instances, std::move(lambda));
++ Base::TraceWithInstances(instances, std::move(lambda));
+ } else {
+ Base::template TraceWithInstances<
+ CategoryTracePointTraits<CategoryIndex>>(instances,
+@@ -560,7 +560,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());
+ });
Index: patches/patch-src_3rdparty_chromium_v8_src_inspector_string-16_cc
===================================================================
RCS file: patches/patch-src_3rdparty_chromium_v8_src_inspector_string-16_cc
diff -N patches/patch-src_3rdparty_chromium_v8_src_inspector_string-16_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_3rdparty_chromium_v8_src_inspector_string-16_cc 28 Jan 2025 17:14:36 -0000
@@ -0,0 +1,34 @@
+https://github.com/freebsd/freebsd-ports/commit/0ddd6468fb3cb9ba390973520517cb1ca2cd690d
+
+Index: src/3rdparty/chromium/v8/src/inspector/string-16.cc
+--- src/3rdparty/chromium/v8/src/inspector/string-16.cc.orig
++++ src/3rdparty/chromium/v8/src/inspector/string-16.cc
+@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) {
+ return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9));
+ }
+
+-int64_t charactersToInteger(const UChar* characters, size_t length,
++int64_t charactersToInteger(const uint16_t* characters, size_t length,
+ bool* ok = nullptr) {
+ std::vector<char> buffer;
+ buffer.reserve(length + 1);
+@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* characters, s
+
+ String16::String16(const UChar* characters, size_t size)
+ : m_impl(characters, size) {}
++String16::String16(const uint16_t* characters, size_t size)
++ : m_impl(reinterpret_cast<const UChar*>(characters), size) {}
+
+ String16::String16(const UChar* characters) : m_impl(characters) {}
+
+@@ -231,6 +233,10 @@ String16 String16::fromUTF16LE(const UChar* stringStar
+ // No need to do anything on little endian machines.
+ return String16(stringStart, length);
+
No comments:
Post a Comment