<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/b08f58899aadd9c12de950815ed8bc0d3e8f9c56">https://github.com/macports/macports-ports/commit/b08f58899aadd9c12de950815ed8bc0d3e8f9c56</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 b08f588 harfbuzz: Update to 2.5.1
</span>b08f588 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b08f58899aadd9c12de950815ed8bc0d3e8f9c56
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jun 1 10:19:06 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> harfbuzz: Update to 2.5.1
</span>---
graphics/harfbuzz/Portfile | 12 +++---
graphics/harfbuzz/files/CGFloat.patch | 71 +++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz/Portfile b/graphics/harfbuzz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19eda07..4525a3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/harfbuzz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/harfbuzz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,10 @@ PortSystem 1.0
</span> PortGroup cxx11 1.1
name harfbuzz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 884745083c4dcaa9acdde63c6eabf009488c4eaa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b470eff9dd5b596edf078596b46a1f83c179449f051a469430afc15869db336f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17919355
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8c8c2e64492cd8d167de11f2b176f1437286748b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6d4834579abd5f7ab3861c085b4c55129f78b27fe47961fd96769d3704f6719e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5636068
</span>
categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +22,12 @@ long_description HarfBuzz is an ${description}.
</span>
homepage https://www.freedesktop.org/wiki/Software/HarfBuzz/
master_sites https://www.freedesktop.org/software/harfbuzz/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>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles CGFloat.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-silent-rules \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz/files/CGFloat.patch b/graphics/harfbuzz/files/CGFloat.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8c10853
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/harfbuzz/files/CGFloat.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix "error: implicit conversion increases floating-point precision"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+when building for 32-bit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/harfbuzz/harfbuzz/issues/1740
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hb-coretext.cc.orig 2019-05-13 19:28:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hb-coretext.cc 2019-06-01 09:26:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,7 +341,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const hb_coretext_font_data_t *data = font->data.coretext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unlikely (!data)) return nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) > .5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (hb_CGFloat_abs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) > (CGFloat).5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* XXX-MT-bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Note that evaluating condition above can be dangerous if another thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -817,7 +817,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buffer->len = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t status_and = ~0, status_or = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double advances_so_far = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGFloat advances_so_far = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* For right-to-left runs, CoreText returns the glyphs positioned such that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * any trailing whitespace is to the left of (0,0). Adjust coordinate system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * to fix for that. Test with any RTL string with trailing spaces.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -839,10 +839,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status_or |= run_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status_and &= run_status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ run_advance = -run_advance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEBUG_MSG (CORETEXT, run, "Run advance: %g", run_advance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DEBUG_MSG (CORETEXT, run, "Run advance: %g", (double)run_advance);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* CoreText does automatic font fallback (AKA "cascading") for characters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * not supported by the requested font, and provides no way to turn it off,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1021,7 +1021,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_position_t x_offset = (positions[0].x - advances_so_far) * x_mult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned int j = 0; j < num_glyphs; j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double advance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGFloat advance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (likely (j + 1 < num_glyphs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ advance = positions[j + 1].x - positions[j].x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else /* last glyph */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1037,7 +1037,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hb_position_t y_offset = (positions[0].y - advances_so_far) * y_mult;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned int j = 0; j < num_glyphs; j++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- double advance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGFloat advance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (likely (j + 1 < num_glyphs))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ advance = positions[j + 1].y - positions[j].y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else /* last glyph */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hb-coretext.h.orig 2019-05-06 14:14:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hb-coretext.h 2019-06-01 09:26:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,6 +40,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HB_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* The macOS macro `ABS` should be equivalent, but I can't figure out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ which header to include to get that macro. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if CGFLOAT_IS_DOUBLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define hb_CGFloat_abs(x) fabs(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define hb_CGFloat_abs(x) fabsf(x)
</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;'>+ #define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HB_CORETEXT_TAG_KERX HB_TAG('k','e','r','x')
</span></pre><pre style='margin:0'>
</pre>