From nobody Sun Sep 29 07:07:40 2024 X-Original-To: dev-commits-ports-all@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 4XGZz02GR6z5XFVT; Sun, 29 Sep 2024 07:07:40 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XGZz01Nx3z4t90; Sun, 29 Sep 2024 07:07:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727593660; 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=1+S8X1LgOgDkiL/1Xcudai6h7dyzm00TfhzwATH3kyQ=; b=E3qTrrB2gxTcufV8qNJ8I+mrt7FEE2E4NPpuHHD78PXgNe3SSXnqqtLyU7Ea9YVUWDwufO LcY0f7SwH9LMV2Nfb4j3YTOrl7oSNn7Yy9C9Qmi1xGHbNPOG9sbc9jgjGSVsJaCVOw9LRa luJLKCPk62Xa1FdcREbkgl2uVEjSHTqi8EPiLcCn9pmZtR4EGZ7kylDLW4JlkaPw6+2HEj M2/FJQqxOhJYa7V+RzXu6O52AT75ljYX5HL0dN9yu4u/UseAY1kKaSPfsxEp8XTGYjmKM+ PqYRPNv9mu+dFL9emlazFQAvccWUD0elSTqCqYV1L1owTCBNHAUqJiOT1AE/7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727593660; 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=1+S8X1LgOgDkiL/1Xcudai6h7dyzm00TfhzwATH3kyQ=; b=yjJtrdNMlS/faplRKD/+d6bbEFwVuCUnYVzslxplY/e9RzhSuYGXgX/t1Voy+46gayO/V0 vCa5cEZDOB38S8ulfbaX0fbrt6WNnw9oVkjueoVsnu/CG6CT4soerEFhVBq9nx9NfMwOoI OBswv/ku+vbwi2B/eVTW7s4hNXuSjDL3mkWIDJLhACKhmtmMwKm30M4Sy9SJi6v5Urq355 FbgLv2FvUTQEgaiop2aztQJA57M7Et8wKXeIw22zUll/mtalB8RbubFg1ekhWn8uX5gigG y21xsDbNt0COKmmfMj1DGBFdbkMfrQ4W/VwrfdYSdXakuwq9AtXQHqp/4oZvtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727593660; a=rsa-sha256; cv=none; b=l/CsqZg0rb+LKLQhELqdrHKVbOKz2sE3oR04aSGxnK75Xy1G5zGrOUxYL7PfMUhMLXCZRl dLrkayuVqw6QDmRuDW+XZQkFROaO2i8+uNB3NpGGL86op5gsl+lHtT3KrUTB8X17x+ySYW Irq2SY9ZkvBzLnKSXw199/UjsdZ8v8IYw8PjL7hDCCaQdQ+CHdl4zymw67M75RxZM+HGrv gyH2cjQuQQfZTEn1jSqd5TMPsDWsQ4cxFSNoaUtcQY9qapGAzj08P4jsZyVVemnq4mPFVq 5ryaBFuQuZWZ27JmfV2Wl0KynB7TebJGJw+/x5yTEl3KnuLWqY8i3m693rjgGw== 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 4XGZz010Hqz10Bs; Sun, 29 Sep 2024 07:07:40 +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 48T77ecC085950; Sun, 29 Sep 2024 07:07:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48T77eO5085947; Sun, 29 Sep 2024 07:07:40 GMT (envelope-from git) Date: Sun, 29 Sep 2024 07:07:40 GMT Message-Id: <202409290707.48T77eO5085947@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: c0fea1a13c66 - main - Revert "www/qt6-webengine: fix build with clang and libc++ 19" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0fea1a13c668491fad6db899397c22fa2b75df3 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0fea1a13c668491fad6db899397c22fa2b75df3 commit c0fea1a13c668491fad6db899397c22fa2b75df3 Author: Jason E. Hale AuthorDate: 2024-09-28 07:17:30 +0000 Commit: Jason E. Hale CommitDate: 2024-09-29 07:05:39 +0000 Revert "www/qt6-webengine: fix build with clang and libc++ 19" These changes are included in the 6.7.3 release of qt6-webengine. This reverts commit 2c14b6e0b4af03bff9cefe5a9288d6b7450755d8. --- ...src_3rdparty_chromium_base_containers_id__map.h | 13 ----- ...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 | 55 ---------------------- 4 files changed, 116 deletions(-) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_id__map.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_id__map.h deleted file mode 100644 index 6d81906f06b8..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_id__map.h +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/base/containers/id_map.h.orig 2024-06-10 11:34:19 UTC -+++ src/3rdparty/chromium/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/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_src_quiche_quic_core_quic__interval__deque.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_src_quiche_quic_core_quic__interval__deque.h deleted file mode 100644 index fb5cfb95ade4..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_third__party_quiche_src_quiche_quic_core_quic__interval__deque.h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h.orig 2024-06-10 11:34:19 UTC -+++ src/3rdparty/chromium/net/third_party/quiche/src/quiche/quic/core/quic_interval_deque.h -@@ -198,12 +198,12 @@ class QUIC_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/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_hash__table.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_hash__table.h deleted file mode 100644 index 85db2a3579b7..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_hash__table.h +++ /dev/null @@ -1,31 +0,0 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h.orig 2024-06-10 11:34:19 UTC -+++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/hash_table.h -@@ -1646,7 +1646,7 @@ HashTable(&table_); - - HashTableBucketInitializer::InitializeTable( - original_table, new_table_size); -@@ -1700,7 +1700,7 @@ Value* HashTablestore(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; -@@ -1852,8 +1852,8 @@ void HashTable(&table_); -+ Allocator::template BackingWriteBarrier<>(&other.table_); - if (IsWeak::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/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h deleted file mode 100644 index 742c873632b9..000000000000 --- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__data__source.h +++ /dev/null @@ -1,55 +0,0 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h.orig 2024-06-10 11:34:19 UTC -+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -@@ -328,14 +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( -- [&](uint32_t /*instances*/) { enabled = true; }); -+ Base::CallIfEnabled([&](uint32_t /*instances*/) { enabled = true; }); - return enabled; - } - -@@ -349,7 +348,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 +495,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 +1046,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 +1060,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());