<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/debfb6c2ad44008d4c6e472c6cfd09f5cd5bfff5">https://github.com/macports/macports-ports/commit/debfb6c2ad44008d4c6e472c6cfd09f5cd5bfff5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new debfb6c2ad4 qt6-qtbase: fix build with LLVM clang 16
</span>debfb6c2ad4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit debfb6c2ad44008d4c6e472c6cfd09f5cd5bfff5
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Aug 17 14:09:31 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt6-qtbase: fix build with LLVM clang 16
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67980
</span>---
aqua/qt6/Portfile | 3 +
aqua/qt6/files/patch-qtbase-memory_resource.diff | 80 ++++++++++++++++++++++++
2 files changed, 83 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 55e4517c75a..86ae9e13d79 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1006,6 +1006,9 @@ if { ${subport} eq "${name}-qtbase" || ${subport} eq "${name}-qtbase-docs" } {
</span> # see https://trac.macports.org/ticket/67802
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/67980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-memory_resource.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args-replace --prefix=${prefix} \
"-prefix ${qt6.dir}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/patch-qtbase-memory_resource.diff b/aqua/qt6/files/patch-qtbase-memory_resource.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..99027d4476e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/patch-qtbase-memory_resource.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,80 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c70145c6bf54cda9723cccdc7ca07f8d8fd321cd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 7 Jun 2023 02:31:42 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Opt out of standard library memory_resource on macOS < 14 and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ iOS < 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Although the header is available, and the compiler reports that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+standard library supports memory_resource, the feature is only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+available on macOS 14 and iOS 17, as reported by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://developer.apple.com/xcode/cpp/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As long as our deployment target is lower we can't unconditionally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use this feature. It's not clear whether the expectation is that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+consumers of the standard library on these platforms will have to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+runtime check their uses of these APIs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Includes e84c0df50f51c61aa49b47823582b0f8de406e3d for fixing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+missing line continuations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-114316
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I50c1425334b9b9842b253442e2b3aade637783ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit f7c8ff511c30dc4310a72b3da4b4a345efe1fba0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/corelib/global/qcompilerdetection.h | 20 +++++++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/corelib/tools/qduplicatetracker_p.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 14 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1218934412..70fa7f6c9f7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/global/qcompilerdetection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/global/qcompilerdetection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -895,16 +895,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif // !_HAS_CONSTEXPR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif // !__GLIBCXX__ && !_LIBCPP_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif // Q_OS_QNX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if defined(Q_CC_CLANG) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(Q_CC_CLANG) && defined(Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Apple has not updated libstdc++ since 2007, which means it does not have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // <initializer_list> or std::move. Let's disable these features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_INITIALIZER_LISTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_RVALUE_REFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_REF_QUALIFIERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_INITIALIZER_LISTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_RVALUE_REFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_REF_QUALIFIERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Also disable <atomic>, since it's clearly not there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_ATOMICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_ATOMICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__cpp_lib_memory_resource) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Don't break code that is already using Q_COMPILER_DEFAULT_DELETE_MEMBERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 950220184f8..23465ecffed 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qduplicatetracker_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qduplicatetracker_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <private/qglobal_p.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __has_include(<memory_resource>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __cpp_lib_memory_resource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <unordered_set>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <memory_resource>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <qhash.h> // for the hashing helpers
</span></pre><pre style='margin:0'>
</pre>