From nobody Sat Nov 11 09:46:42 2023 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 4SS9nb1XSSz50snC; Sat, 11 Nov 2023 09:46:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SS9nb12sKz4Tw6; Sat, 11 Nov 2023 09:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699696003; 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=QqOu8ooNjSVlxtfymgWplmXo5VR40X+kcJX9OdnLSSY=; b=xzWBmUVddJ2BCyhiT51WMhW24E7PVai7KFfxFQvvYKAlPf8nBC+mkKopzODH4JlhJeondk Rcic7dikwovEXmVgB+F4UkE/6NyIlm+DWPWr8onE6Art3f8RI2AqIMBVI1zLSxxEP8IkI2 ucR79lca5lezMT3mmH+OEhyacoaB6/ELXe3YbiI8DPXDfJCGe5Z7TxycE1o9h8OLi7pq1g tMlSGgTNTI7K6jrKYjIU003vAC4XyYwGEFt8mKSjYn65SsDFD4wQzDzmlkOurDP+mPkD8l WVniTwBJoyukw2b9bgamFUd1uDBVjDx9+lmmKwWxlNNA1q9Ak8oPUVhbBh8jlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699696003; 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=QqOu8ooNjSVlxtfymgWplmXo5VR40X+kcJX9OdnLSSY=; b=vvVPCyZKoJfksAYyTfYV+Fx49VE5UHL4b56/S6sZm0eXZUshsZxAxbrQ9u7WTCDXkjb5gI o6NxTaXyoSAVcfPEpNHkiKJQPokplxrVtTXHoaWN5T3PJcwLxv6afENuixwPRQxLEpgQi1 azJB6zvQppoh05PLvkM4OPiuEVy9owTSH78f7sjOQCG5qHXdS0FGiUny1bMHft9V4P8zoE AvdZGlyz+IM//JI9ps8PINh2OiN17IR0l7S5V8dEZ/7V2FwkGi7Bk91gIQoa/62+21My2r Mjjrru+A0eri2O0w/E8+SnqwJetXQDk2yZcpF1OJthEQzBpDYR+MqvM64Uy4Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699696003; a=rsa-sha256; cv=none; b=dxftF3A9An3fx5UD+nOIj0DBN06v68OLR0r0hgtzj7MzfXknbfw4fiLs+fja/0Tx30DXFN dDEAKsWiexBJmlkGmcof0aoT+iiplY9xlSKuaTTpMbqr54sspJltv6AmeeVBz7b81aKZZ5 cTTjkZ4px4qseUh6Dz/TL/SpiMHFnk5A6Gh5Rd7pXEHElg1FnkNNTHOJH3xKOZu9By+JfL mdiGWVxLG2SGo6243prHM7TxHcp9O7CBoFMubjNjidZePiEcl8oWNx75N4qCR2DyeLq8Mf vWrDkQsLE+VhIweQeND6pnosI5SU5YrMinqUwAKlLj60I4N0eFRaqQWzbB75Dw== 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 4SS9nb01V2zc77; Sat, 11 Nov 2023 09:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AB9kgvl086027; Sat, 11 Nov 2023 09:46:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AB9kgXj086024; Sat, 11 Nov 2023 09:46:42 GMT (envelope-from git) Date: Sat, 11 Nov 2023 09:46:42 GMT Message-Id: <202311110946.3AB9kgXj086024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 660b01aa59ee - main - www/qt6-webengine: fix build with libc++ 17 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 660b01aa59ee1266ce0faf5718dc5c90abfa4f31 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=660b01aa59ee1266ce0faf5718dc5c90abfa4f31 commit 660b01aa59ee1266ce0faf5718dc5c90abfa4f31 Author: Dimitry Andric AuthorDate: 2023-11-11 09:35:15 +0000 Commit: Dimitry Andric CommitDate: 2023-11-11 09:46:07 +0000 www/qt6-webengine: fix build with libc++ 17 Building www/qt6-webengine with libc++ 17 results in the following compile errors: In file included from gen/base/base_jumbo_2.cc:7: In file included from ./../../../../../qtwebengine-everywhere-src-6.5.3/src/3rdparty/chromium/base/check.cc:17: In file included from ../../../../../qtwebengine-everywhere-src-6.5.3/src/3rdparty/chromium/base/debug/crash_logging.h:16: In file included from ../../../../../qtwebengine-everywhere-src-6.5.3/src/3rdparty/chromium/base/strings/string_number_conversions.h:15: In file included from ../../../../../qtwebengine-everywhere-src-6.5.3/src/3rdparty/chromium/base/containers/span.h:18: ../../../../../qtwebengine-everywhere-src-6.5.3/src/3rdparty/chromium/base/containers/checked_iterators.h:241:8: error: no template named '__is_cpp17_contiguous_iterator'; did you mean '__libcpp_is_contiguous_iterator'? 241 | struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | __libcpp_is_contiguous_iterator /usr/include/c++/v1/__iterator/iterator_traits.h:476:8: note: '__libcpp_is_contiguous_iterator' declared here 476 | struct __libcpp_is_contiguous_iterator : _Or< | ^ This is because the copy of chromium in qt6-webengine is missing an upstream fix for recent libc++ changes, in particular: https://chromium.googlesource.com/chromium/src/+/9bfbbffdba73668fdb483e5a850911d2b64c35d7 and its dependency: https://chromium.googlesource.com/chromium/src/+/5b5551edd3961481e617e510276b9f015a35b861 Apply these patches to work around the compile error. PR: 273753 MFH: 2023Q4 --- ...y_chromium_base_containers_checked__iterators.h | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h new file mode 100644 index 000000000000..5a63712a10bb --- /dev/null +++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_containers_checked__iterators.h @@ -0,0 +1,75 @@ +--- src/3rdparty/chromium/base/containers/checked_iterators.h.orig 2023-09-07 16:02:00 UTC ++++ src/3rdparty/chromium/base/containers/checked_iterators.h +@@ -23,6 +23,9 @@ class CheckedContiguousIterator { + using pointer = T*; + using reference = T&; + using iterator_category = std::random_access_iterator_tag; ++#if __cplusplus >= 202002L ++ using iterator_concept = std::contiguous_iterator_tag; ++#endif + + // Required for converting constructor below. + template +@@ -30,10 +33,8 @@ class CheckedContiguousIterator { + + // Required for certain libc++ algorithm optimizations that are not available + // for NaCl. +-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) + template + friend struct std::pointer_traits; +-#endif + + constexpr CheckedContiguousIterator() = default; + +@@ -217,7 +218,6 @@ using CheckedContiguousConstIterator = CheckedContiguo + + } // namespace base + +-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL) + // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits + // for CCI in case we compile with libc++ outside of NaCl. The former is + // required to enable certain algorithm optimizations (e.g. std::copy can be a +@@ -235,13 +235,35 @@ using CheckedContiguousConstIterator = CheckedContiguo + // [1] https://wg21.link/iterator.concept.contiguous + // [2] https://wg21.link/std.iterator.tags + // [3] https://wg21.link/pointer.traits.optmem +-namespace std { + ++#if defined(_LIBCPP_VERSION) ++ ++// TODO(crbug.com/1284275): Remove when C++20 is on by default, as the use ++// of `iterator_concept` above should suffice. ++_LIBCPP_BEGIN_NAMESPACE_STD ++ ++// TODO(crbug.com/1449299): https://reviews.llvm.org/D150801 renamed this from ++// `__is_cpp17_contiguous_iterator` to `__libcpp_is_contiguous_iterator`. Clean ++// up the old spelling after libc++ rolls. + template ++struct __is_cpp17_contiguous_iterator; ++template + struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator> + : true_type {}; + + template ++struct __libcpp_is_contiguous_iterator; ++template ++struct __libcpp_is_contiguous_iterator<::base::CheckedContiguousIterator> ++ : true_type {}; ++ ++_LIBCPP_END_NAMESPACE_STD ++ ++#endif ++ ++namespace std { ++ ++template + struct pointer_traits<::base::CheckedContiguousIterator> { + using pointer = ::base::CheckedContiguousIterator; + using element_type = T; +@@ -260,6 +282,5 @@ struct pointer_traits<::base::CheckedContiguousIterato + }; + + } // namespace std +-#endif + + #endif // BASE_CONTAINERS_CHECKED_ITERATORS_H_