<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/a609101463444b46e7dcf21bc14aa4d70f80854f">https://github.com/macports/macports-ports/commit/a609101463444b46e7dcf21bc14aa4d70f80854f</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 a609101 harfbuzz: Update to 2.6.1
</span>a609101 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a609101463444b46e7dcf21bc14aa4d70f80854f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Sep 21 00:55:58 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> harfbuzz: Update to 2.6.1
</span>---
graphics/harfbuzz/Portfile | 10 ++---
graphics/harfbuzz/files/CGFloat.patch | 71 -----------------------------------
2 files changed, 4 insertions(+), 77 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 c0fecae..35f9192 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;'>@@ -10,10 +10,10 @@ PortGroup compiler_blacklist_versions 1.0
</span> compiler.blacklist-append {clang < 700}
name harfbuzz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 993fc58ca1f793a97ef6c37a8f2aee1c37856599 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5736808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 97129dd1c2235c0e3d8cac1d8a763166cbaa9bab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c651fb3faaa338aeb280726837c2384064cdc17ef40539228d88a1260960844f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5741372
</span>
categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,6 @@ use_xz yes
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles CGFloat.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8c10853..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/harfbuzz/files/CGFloat.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,71 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix "error: implicit conversion increases floating-point precision"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-when building for 32-bit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/harfbuzz/harfbuzz/issues/1740
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hb-coretext.cc.orig 2019-05-13 19:28:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hb-coretext.cc 2019-06-01 09:26:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -341,7 +341,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const hb_coretext_font_data_t *data = font->data.coretext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unlikely (!data)) return nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) > .5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* XXX-MT-bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Note that evaluating condition above can be dangerous if another thread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -817,7 +817,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buffer->len = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint32_t status_and = ~0, status_or = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double advances_so_far = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFloat advances_so_far = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* For right-to-left runs, CoreText returns the glyphs positioned such that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * any trailing whitespace is to the left of (0,0). Adjust coordinate system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * to fix for that. Test with any RTL string with trailing spaces.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -839,10 +839,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status_or |= run_status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status_and &= run_status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run_advance = -run_advance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DEBUG_MSG (CORETEXT, run, "Run advance: %g", run_advance);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DEBUG_MSG (CORETEXT, run, "Run advance: %g", (double)run_advance);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CoreText does automatic font fallback (AKA "cascading") for characters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * not supported by the requested font, and provides no way to turn it off,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1021,7 +1021,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hb_position_t x_offset = (positions[0].x - advances_so_far) * x_mult;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (unsigned int j = 0; j < num_glyphs; j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double advance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFloat advance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (likely (j + 1 < num_glyphs))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- advance = positions[j + 1].x - positions[j].x;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else /* last glyph */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1037,7 +1037,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hb_position_t y_offset = (positions[0].y - advances_so_far) * y_mult;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (unsigned int j = 0; j < num_glyphs; j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- double advance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGFloat advance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (likely (j + 1 < num_glyphs))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- advance = positions[j + 1].y - positions[j].y;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else /* last glyph */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hb-coretext.h.orig 2019-05-06 14:14:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hb-coretext.h 2019-06-01 09:26:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,6 +40,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HB_BEGIN_DECLS
</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;'>-+/* The macOS macro `ABS` should be equivalent, but I can't figure out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ which header to include to get that macro. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if CGFLOAT_IS_DOUBLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define hb_CGFloat_abs(x) fabs(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define hb_CGFloat_abs(x) fabsf(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HB_CORETEXT_TAG_KERX HB_TAG('k','e','r','x')
</span></pre><pre style='margin:0'>
</pre>