<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/58b839d4d50093a9d9daee39a83621e38669abcb">https://github.com/macports/macports-ports/commit/58b839d4d50093a9d9daee39a83621e38669abcb</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 58b839d fontconfig: Update to 2.13.0
</span>58b839d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58b839d4d50093a9d9daee39a83621e38669abcb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 19 02:20:08 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> fontconfig: Update to 2.13.0
</span>---
graphics/fontconfig/Portfile | 27 ++++++++++++++--------
.../fontconfig/files/patch-src-fcweight.c.diff | 14 -----------
2 files changed, 17 insertions(+), 24 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 c43860e..edeb821 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,8 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name fontconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.12.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.13.0
</span> categories graphics
maintainers {ryandesign @ryandesign}
license fontconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,14 +20,17 @@ 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 d6e7a5c0dbd658b39701fda897414640d032cdb1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cbc9a9b34f10b72e09d425557b156cf46c675a05 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 91dde8492155b7f34bb95079e79be92f1df353fcc682c19be90762fd3e12eeb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1700500
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ossp-uuid
</span>
if {${os.platform} eq "darwin" && ${os.major} < 9} {
set add_fonts /usr/X11R6/lib/X11/fonts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,16 +41,21 @@ lappend add_fonts ${prefix}/share/fonts
</span> set docdir ${prefix}/share/doc/${name}
patchfiles patch-docbook-4.2.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-fcweight.c.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules HASDOCBOOK=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-iconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-expat=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libiconv=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libiconv-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libintl-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HASDOCBOOK=no
</span>
# We put this into a pre-configure block so it can be evaluated _after_ platform selection.
pre-configure {
configure.args-append --with-add-fonts=[join ${add_fonts} ,]
# Fix building for older macOS versions via MACOSX_DEPLOYMENT_TARGET
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/macports/macports-ports/pull/802
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.freedesktop.org/show_bug.cgi?id=102986
</span> if {${os.platform} eq "darwin" && [vercmp $macosx_version 10.12] >= 0} {
if {[vercmp $macosx_deployment_target 10.12] < 0 } {
ui_info "Disabling mkostemp for older versions of macOS..."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontconfig/files/patch-src-fcweight.c.diff b/graphics/fontconfig/files/patch-src-fcweight.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0be1b50..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontconfig/files/patch-src-fcweight.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,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Revert a 2.12 change in fcweight.c that introduced a bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.freedesktop.org/show_bug.cgi?id=96609
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fcweight.c.orig 2016-07-01 14:58:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fcweight.c 2016-07-01 14:58:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Loosely based on WPF Font Selection Model's advice. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ot_weight < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ot_weight < 0 || ot_weight >1000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (1 <= ot_weight && ot_weight <= 9)
</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>