<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1f459e222b4bfd6eb79eea4d83d77798fd152b67">https://github.com/macports/macports-ports/commit/1f459e222b4bfd6eb79eea4d83d77798fd152b67</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 1f459e222b4 fontconfig: Fix crash on arm64
</span>1f459e222b4 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 1f459e222b4bfd6eb79eea4d83d77798fd152b67
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 4 00:42:19 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    fontconfig: Fix crash on arm64
</span>---
 graphics/fontconfig/Portfile                          | 12 +++++++++++-
 graphics/fontconfig/files/fc_atomic_ptr_cmpexch.patch | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontconfig/Portfile b/graphics/fontconfig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7321b2b1d4c..639ce02df52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontconfig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,20 @@ PortGroup                   muniversal 1.0
</span> 
 name                        fontconfig
 version                     2.13.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                    0
</span> checksums                   rmd160  a971903874fb0395a7ab2d5705378af1ffce2b2c \
                             sha256  f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 \
                             size    1723639
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Update this patch and include it unconditionally when updating to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# next version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${version} eq {2.13.1}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        incr revision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append       fc_atomic_ptr_cmpexch.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories                  graphics
 maintainers                 {ryandesign @ryandesign}
 license                     fontconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +50,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 9} {
</span> lappend add_fonts           ${prefix}/share/fonts
 set docdir                  ${prefix}/share/doc/${name}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles                  patch-docbook-4.2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-docbook-4.2.diff
</span> patchfiles-append           no-json-c.patch
 
 configure.args              --disable-silent-rules \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontconfig/files/fc_atomic_ptr_cmpexch.patch b/graphics/fontconfig/files/fc_atomic_ptr_cmpexch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9af20126778
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontconfig/files/fc_atomic_ptr_cmpexch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix fc_atomic_ptr_cmpexch on arm64 so that it does not crash.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream fixed it in a different way that removed support for Tiger.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We will want to be careful to patch that back in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/freedesktop/fontconfig/commit/6def66164a36eed968aae872d76acfac3173d44a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/fcatomic.h.orig    2016-12-01 21:22:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/fcatomic.h 2020-09-04 00:25:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define fc_atomic_ptr_cmpexch(P,O,N)      OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __ppc64__ || __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define fc_atomic_ptr_cmpexch(P,O,N)      OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define fc_atomic_ptr_cmpexch(P,O,N)      OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P))
</span></pre><pre style='margin:0'>

</pre>