<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/fe9cb6f0df10e5d3ebb233fcbe38555de78f9ac1">https://github.com/macports/macports-ports/commit/fe9cb6f0df10e5d3ebb233fcbe38555de78f9ac1</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 fe9cb6f fontconfig: Update to 2.12.3
</span>fe9cb6f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fe9cb6f0df10e5d3ebb233fcbe38555de78f9ac1
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Fri Jun 2 17:45:41 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> fontconfig: Update to 2.12.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/54270
</span>---
graphics/fontconfig/Portfile | 10 +++---
graphics/fontconfig/files/patch-src-fccache.c.diff | 37 ----------------------
2 files changed, 4 insertions(+), 43 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 2fde729..51bd495 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,10 +4,9 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name fontconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.12.3
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign}
</span> license fontconfig
platforms darwin
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +20,8 @@ homepage https://www.freedesktop.org/wiki/Software/fontconfig
</span> master_sites https://www.freedesktop.org/software/fontconfig/release/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 66907dbb317309bcb5013ea45c53dbf5050e6376 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b8538f7f6865747ff09016a6a1b908c740485d50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd24bf6602731a11295c025909d918180e98385625182d3b999fd6f1ab34f8bd
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +39,6 @@ set docdir ${prefix}/share/doc/${name}
</span>
patchfiles patch-docbook-4.2.diff
patchfiles-append patch-src-fcweight.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-fccache.c.diff
</span>
configure.args --disable-silent-rules HASDOCBOOK=no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontconfig/files/patch-src-fccache.c.diff b/graphics/fontconfig/files/patch-src-fccache.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 65e5df7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontconfig/files/patch-src-fccache.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Validate cache correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.freedesktop.org/show_bug.cgi?id=97546
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fccache.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fccache.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -640,6 +640,8 @@ FcCacheOffsetsValid (FcCache *cache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FcPattern *font = FcFontSetFont (fs, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FcPatternElt *e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FcValueListPtr l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ssize_t c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char *begin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((char *) font < base ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (char *) font > end - sizeof (FcFontSet) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -653,11 +655,18 @@ FcCacheOffsetsValid (FcCache *cache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (e->values != 0 && !FcIsEncodedOffset(e->values))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FcFalse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (j = font->num, l = FcPatternEltValues(e); j >= 0 && l; j--, l = FcValueListNext(l))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (l->next != NULL && !FcIsEncodedOffset(l->next))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (j < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return FcFalse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (j = 0; j < font->num; j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ begin = (char *)FcPatternEltValues(&e[j]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c = (end - begin) / sizeof (FcValueList);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (l = FcPatternEltValues(&e[j]); l; l = FcValueListNext(l))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((char *) l < begin || (char *)l > end - sizeof (*l) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (l->next != NULL && !FcIsEncodedOffset(l->next)) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c-- <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return FcFalse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>