<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/8a454b21e0c62ca88b2b1445ef02f885293e770b">https://github.com/macports/macports-ports/commit/8a454b21e0c62ca88b2b1445ef02f885293e770b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8a454b21e0c62ca88b2b1445ef02f885293e770b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 18 04:06:52 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> fontconfig: Update to 2.14.0
</span>---
graphics/fontconfig/Portfile | 26 ++++++++--------------
.../fontconfig/files/fc_atomic_ptr_cmpexch.patch | 17 --------------
graphics/fontconfig/files/no-json-c.patch | 12 +++++-----
3 files changed, 15 insertions(+), 40 deletions(-)
<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 639ce02df52..5638c878f15 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;'>@@ -4,25 +4,15 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name fontconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.13.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.14.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a971903874fb0395a7ab2d5705378af1ffce2b2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1723639
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update this patch and include it unconditionally when updating to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# next version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${version} eq {2.13.1}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incr revision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append fc_atomic_ptr_cmpexch.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5c28b8285625aec377bd13178c62a274e303330a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1431056
</span>
categories graphics
maintainers {ryandesign @ryandesign}
license fontconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> use_parallel_build yes
description An XML-based font configuration API for X Windows
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,13 +22,14 @@ long_description Fontconfig is a library for configuring and \
</span>
homepage https://www.freedesktop.org/wiki/Software/fontconfig/
master_sites https://www.freedesktop.org/software/fontconfig/release/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:expat \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> port:libiconv \
port:ossp-uuid
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +44,7 @@ set docdir ${prefix}/share/doc/${name}
</span> patchfiles-append patch-docbook-4.2.diff
patchfiles-append no-json-c.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span> configure.args --disable-silent-rules \
--enable-iconv \
--enable-shared \
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9af20126778..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontconfig/files/fc_atomic_ptr_cmpexch.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix fc_atomic_ptr_cmpexch on arm64 so that it does not crash.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Upstream fixed it in a different way that removed support for Tiger.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We will want to be careful to patch that back in.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/freedesktop/fontconfig/commit/6def66164a36eed968aae872d76acfac3173d44a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fcatomic.h.orig 2016-12-01 21:22:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fcatomic.h 2020-09-04 00:25:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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:#ffe0e0;'>- #define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __ppc64__ || __x86_64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontconfig/files/no-json-c.patch b/graphics/fontconfig/files/no-json-c.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e9b4e7ca163..7a9e95db3ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontconfig/files/no-json-c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontconfig/files/no-json-c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,22 @@
</span> Do not look for json-c.
https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/108
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-08-30 03:24:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-09-02 05:02:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17639,7 +17639,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2022-03-31 02:41:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2022-05-18 03:57:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19084,7 +19084,7 @@
</span>
if test -n "$JSONC_CFLAGS"; then
pkg_cv_JSONC_CFLAGS="$JSONC_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
+ elif test -n ""; then
if test -n "$PKG_CONFIG" && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
</span> ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17656,7 +17656,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19101,7 +19101,7 @@
</span> fi
if test -n "$JSONC_LIBS"; then
pkg_cv_JSONC_LIBS="$JSONC_LIBS"
- elif test -n "$PKG_CONFIG"; then
+ elif test -n ""; then
if test -n "$PKG_CONFIG" && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
</span> ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
</pre><pre style='margin:0'>
</pre>