<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a110ec094fdeb1e5b720f9e092fab557ee9785e4">https://github.com/macports/macports-ports/commit/a110ec094fdeb1e5b720f9e092fab557ee9785e4</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 a110ec094fd qt5-qtwebkit: Add logic to allow compiling on ARM64 architectures
</span>a110ec094fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a110ec094fdeb1e5b720f9e092fab557ee9785e4
</span>Author: John Hoyt <jhoyt@miniM1.home.jgh4.com>
AuthorDate: Sat Feb 27 17:56:58 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebkit: Add logic to allow compiling on ARM64 architectures
</span>---
aqua/qt5/Portfile | 5 ++-
aqua/qt5/files/patch-qtwebkit-FastMalloc.diff | 16 +++++++--
.../patch-qtwebkit-MachineStackMarker.cpp.diff | 38 ++++++++++++++++++++++
aqua/qt5/files/patch-qtwebkit-Platform.h.diff | 14 ++++++++
4 files changed, 70 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19790a91353..ff4f611b513 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -657,7 +658,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1532,6 +1533,8 @@ foreach {module module_info} [array get modules] {
</span> # the 11.0 + SDK defines that only if MAC_OS_X_VERSION_MIN_REQUIRED is < 101600 (to support arm64 after that)
if {${os.platform} eq "darwin" && ${os.major} >= 20} {
patchfiles-append patch-qtwebkit-FastMalloc.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebkit-Platform.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebkit-MachineStackMarker.cpp.diff
</span> }
# qtwebkit uses
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit-FastMalloc.diff b/aqua/qt5/files/patch-qtwebkit-FastMalloc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b5f3fa8eacd..fe195bb2d11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-qtwebkit-FastMalloc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebkit-FastMalloc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,28 @@
</span> --- Source/WTF/wtf/FastMalloc.cpp
+++ Source/WTF/wtf/FastMalloc.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -628,7 +628,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,6 +93,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <malloc/malloc.h>
</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;'>++#if OS(DARWIN) && CPU(ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <arm/param.h>
</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;'>+ #ifndef NO_TCMALLOC_SAMPLES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WTF_CHANGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NO_TCMALLOC_SAMPLES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -628,7 +632,13 @@
</span> // sense. In particular, if kMaxSize increases, you may have to
// increase kNumClasses as well.
#if OS(DARWIN)
-# define K_PAGE_SHIFT PAGE_SHIFT
+# if CPU(X86_64)
+# define K_PAGE_SHIFT I386_PGSHIFT
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif CPU(ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define K_PAGE_SHIFT PGSHIFT
</span> +# else
+# define K_PAGE_SHIFT PAGE_SHIFT
+# endif
# if (K_PAGE_SHIFT == 12)
# define K_NUM_CLASSES 68
# elif (K_PAGE_SHIFT == 14)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit-MachineStackMarker.cpp.diff b/aqua/qt5/files/patch-qtwebkit-MachineStackMarker.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ccf457a04f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebkit-MachineStackMarker.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,7 +301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ppc_thread_state_t PlatformThreadRegisters;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif CPU(PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ppc_thread_state64_t PlatformThreadRegisters;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif CPU(ARM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif CPU(ARM) || CPU(ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef arm_thread_state_t PlatformThreadRegisters;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error Unknown Architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,7 +333,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif CPU(PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned user_count = PPC_THREAD_STATE64_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thread_state_flavor_t flavor = PPC_THREAD_STATE64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif CPU(ARM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif CPU(ARM) || CPU(ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned user_count = ARM_THREAD_STATE_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thread_state_flavor_t flavor = ARM_THREAD_STATE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,7 +396,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return reinterpret_cast<void*>(regs.__rsp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif CPU(PPC) || CPU(PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return reinterpret_cast<void*>(regs.__r1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif CPU(ARM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif CPU(ARM) || CPU(ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return reinterpret_cast<void*>(regs.__sp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error Unknown Architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -410,6 +410,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return reinterpret_cast<void*>(regs.rsp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif CPU(PPC) || CPU(PPC64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return reinterpret_cast<void*>(regs.r1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif CPU(ARM) || CPU(ARM64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return reinterpret_cast<void*>(regs.__sp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #error Unknown Architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit-Platform.h.diff b/aqua/qt5/files/patch-qtwebkit-Platform.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..28bc673cad7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtwebkit-Platform.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/Platform.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/Platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,6 +186,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>++/* CPU(ARM64) - Apple */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WTF_CPU_ARM64 1
</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;'>+ /* CPU(ARM) - ARM, any version*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>