<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc545e38323be057659fbf12cb49643c19e0e375">https://github.com/macports/macports-ports/commit/fc545e38323be057659fbf12cb49643c19e0e375</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 fc545e38323 qt5*-qtbase: patch cleanup
</span>fc545e38323 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fc545e38323be057659fbf12cb49643c19e0e375
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Sep 10 10:25:05 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtbase: patch cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Patches for Xcode 11.4 should work with Clang 9 on older macOS
</span><span style='display:block; white-space:pre;color:#404040;'> Update qt53-qtbase patch for consistency
</span>---
aqua/phantomjs-qt/Portfile | 13 ++-----------
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 11 -----------
.../files/patch-qtbase-intel_intrinsics.diff | 4 ++--
aqua/qt53/files/patch-qtbase-intel_intrinsics.diff | 4 ++--
aqua/qt55/Portfile | 13 ++-----------
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 11 -----------
aqua/qt55/files/patch-qtbase-intel_intrinsics.diff | 4 ++--
aqua/qt56/Portfile | 14 +++-----------
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 11 -----------
aqua/qt56/files/patch-qtbase-intel_intrinsics.diff | 4 ++--
aqua/qt57/Portfile | 13 ++-----------
.../patch-qtbase-intel_intrinsics-xcode11.4.diff | 20 --------------------
aqua/qt57/files/patch-qtbase-intel_intrinsics.diff | 6 +++---
13 files changed, 20 insertions(+), 108 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/Portfile b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75e9ddc3544..205355442f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,19 +269,10 @@ foreach {module module_info} [array get modules] {
</span>
# Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
# this assumption is incorrect for Clang 9.0 and later
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (which Xcode 11.4 and later are also based on)
</span> # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364 https://trac.macports.org/ticket/62051
</span> patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8335979ad1f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -329,7 +329,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics.diff b/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 316c9b1af05..8335979ad1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2019-10-15 07:35:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span> @@ -329,7 +329,7 @@
_BitScanForward(&result, val);
return result;
}
-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span> && !defined(Q_CC_INTEL)
// Clang is missing the intrinsic for _bit_scan_reverse
// GCC only added it in version 4.5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cb18f2034fd..1b9914b21ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- src/corelib/tools/qsimd_p.h.orig 2014-09-11 03:48:05.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2019-10-16 11:28:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span> @@ -260,7 +260,7 @@
_BitScanForward(&result, val);
return result;
}
-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && __GNUC__ * 100 + __GNUC_MINOR__ < 405)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && __clang_major__ * 100 + __clang_minor__ < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && __GNUC__ * 100 + __GNUC_MINOR__ < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && __GNUC__ * 100 + __GNUC_MINOR__ < 405)) \
</span> && !defined(Q_CC_INTEL)
// Clang is missing the intrinsic for _bit_scan_reverse
// GCC only added it in version 4.5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52da4d857ba..a504138321b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -764,19 +764,10 @@ foreach {module module_info} [array get modules] {
</span>
# Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
# this assumption is incorrect for Clang 9.0 and later
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (which Xcode 11.4 and later are also based on)
</span> # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364 https://trac.macports.org/ticket/62051
</span> patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/qt55/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8335979ad1f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -329,7 +329,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 316c9b1af05..8335979ad1f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2019-10-15 07:35:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span> @@ -329,7 +329,7 @@
_BitScanForward(&result, val);
return result;
}
-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span> && !defined(Q_CC_INTEL)
// Clang is missing the intrinsic for _bit_scan_reverse
// GCC only added it in version 4.5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e465255679c..47cd7850e41 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -808,19 +808,11 @@ foreach {module module_info} [array get modules] {
</span>
# Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
# this assumption is incorrect for Clang 9.0 and later
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (which Xcode 11.4 and later are also based on)
</span> # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364 https://trac.macports.org/ticket/62051
</span> patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/qt56/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c5b25cc92a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -452,7 +452,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 914baf97593..9c5b25cc92a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2019-10-15 07:35:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span> @@ -452,7 +452,7 @@
_BitScanForward(&result, val);
return result;
}
-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span> && !defined(Q_CC_INTEL)
// Clang is missing the intrinsic for _bit_scan_reverse
// GCC only added it in version 4.5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1488ee73dfd..5cfa9f9ced6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -879,19 +879,10 @@ foreach {module module_info} [array get modules] {
</span>
# Qt assumes Clang's x86intrin.h does not provide _bit_scan_reverse
# this assumption is incorrect for Clang 9.0 and later
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (which Xcode 11.4 and later are also based on)
</span> # see https://github.com/llvm/llvm-project/commit/88f4054f48c5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364 https://trac.macports.org/ticket/62051
</span> patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode 11.4 is also based on Clang 9.0, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch-qtbase-intel_intrinsics.diff does not work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for Xcode clang; use an alternative approach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (not tested on older macOS but may work)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/62051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
# ICU now requires C++11
# see https://trac.macports.org/ticket/59434
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtbase-intel_intrinsics-xcode11.4.diff b/aqua/qt57/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8ae7d2d9bb8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-qtbase-intel_intrinsics-xcode11.4.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/corelib/tools/qsimd_p.h.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -465,7 +465,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define qCpuHasFeature(feature) ((qCompilerCpuFeatures & (Q_UINT64_C(1) << CpuFeature ## feature)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (qCpuFeatures() & (Q_UINT64_C(1) << CpuFeature ## feature)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && (defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Q_ALWAYS_INLINE unsigned _bit_scan_reverse(unsigned val)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_ASSERT(val != 0); // if val==0, the result is undefined.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,7 +503,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e6629128a1f..8ae7d2d9bb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- src/corelib/tools/qsimd_p.h.orig 2016-12-01 01:17:04.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/corelib/tools/qsimd_p.h 2019-10-17 08:18:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2021-01-12 23:42:29.000000000 -0600
</span> @@ -465,7 +465,7 @@
#define qCpuHasFeature(feature) ((qCompilerCpuFeatures & (Q_UINT64_C(1) << CpuFeature ## feature)) \
|| (qCpuFeatures() & (Q_UINT64_C(1) << CpuFeature ## feature)))
-#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && (defined(Q_CC_CLANG) && Q_CC_CLANG < 900) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && (defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) && !defined(Q_CC_INTEL)
</span> static Q_ALWAYS_INLINE unsigned _bit_scan_reverse(unsigned val)
{
Q_ASSERT(val != 0); // if val==0, the result is undefined.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span> return result;
}
-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && !defined(_bit_scan_reverse)) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span> && !defined(Q_CC_INTEL)
// Clang is missing the intrinsic for _bit_scan_reverse
// GCC only added it in version 4.5
</pre><pre style='margin:0'>
</pre>