<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/392e1b6c6c27d15b070dd3a6037eed4781357f0d">https://github.com/macports/macports-ports/commit/392e1b6c6c27d15b070dd3a6037eed4781357f0d</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 392e1b6 harfbuzz: Update to 1.7.7
</span>392e1b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 392e1b6c6c27d15b070dd3a6037eed4781357f0d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jun 28 07:12:09 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> harfbuzz: Update to 1.7.7
</span>---
graphics/harfbuzz/Portfile | 15 +++-----
graphics/harfbuzz/files/32bit.patch | 34 -------------------
graphics/harfbuzz/files/coretext.patch | 62 ----------------------------------
3 files changed, 5 insertions(+), 106 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 9c779fa..014f58f 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name harfbuzz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.7.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.7.7
</span> categories graphics
platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,17 +18,12 @@ homepage https://www.freedesktop.org/wiki/Software/HarfBuzz/
</span> master_sites https://www.freedesktop.org/software/harfbuzz/release/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bfd237407c3b8eea5a59f1c6bbab4a467549c767 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da7bed39134826cd51e57c29f1dfbe342ccedb4f4773b1c951ff05ff383e2e9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2586909
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0fc64230010ea43fe11be33bddce4d4b67bc314c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6e1a56db1b8335cb8f7cb625536d6443fc34801ae419d66e445efea885a62128 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3791280
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 32bit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coretext.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove this on an update to >1.7.6 as https://github.com/harfbuzz/harfbuzz/commit/2a2360
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *llvm-gcc-4.2
</span> # clang 211.10.1 and earlier are known to fail. Assume 300 works?
compiler.blacklist-append {clang < 300}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +31,7 @@ configure.args --disable-silent-rules \
</span> ac_cv_prog_AWK=/usr/bin/awk
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
depends_lib-append \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz/files/32bit.patch b/graphics/harfbuzz/files/32bit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4cf9336..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/harfbuzz/files/32bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build on 32-bit systems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/harfbuzz/harfbuzz/issues/901
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/harfbuzz/harfbuzz/commit/7ec3ba21f0dc43f9f8ea1fc4344d3ea4524841b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/harfbuzz/harfbuzz/commit/ebccd019749e24e6c045518ee1ffbfc947744204
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hb-private.hh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hb-private.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -414,7 +414,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sizeof (T) <= 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* "bithacks" */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const uint64_t b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000, 0xFFFFFFFF00000000};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const uint64_t b[] = {0x2ULL, 0xCULL, 0xF0ULL, 0xFF00ULL, 0xFFFF0000ULL, 0xFFFFFFFF00000000ULL};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned int S[] = {1, 2, 4, 8, 16, 32};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int r = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 5; i >= 0; i--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -489,12 +489,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int c = 64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v &= - (int64_t) (v);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (v) c--;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (v & 0x00000000FFFFFFFF) c -= 32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (v & 0x0000FFFF0000FFFF) c -= 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (v & 0x00FF00FF00FF00FF) c -= 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (v & 0x0F0F0F0F0F0F0F0F) c -= 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (v & 0x3333333333333333) c -= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (v & 0x5555555555555555) c -= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (v & 0x00000000FFFFFFFFULL) c -= 32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (v & 0x0000FFFF0000FFFFULL) c -= 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (v & 0x00FF00FF00FF00FFULL) c -= 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (v & 0x0F0F0F0F0F0F0F0FULL) c -= 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (v & 0x3333333333333333ULL) c -= 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (v & 0x5555555555555555ULL) c -= 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sizeof (T) == 16)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz/files/coretext.patch b/graphics/harfbuzz/files/coretext.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d257ef8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/harfbuzz/files/coretext.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with CoreText on OS X 10.7 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/harfbuzz/harfbuzz/pull/952
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/hb-coretext.cc.orig 2018-02-18 13:36:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/hb-coretext.cc 2018-04-04 02:57:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,6 +168,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay")))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define kCTFontUIFontSystem kCTFontSystemFontType
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CTFontUIFontType font_type = kCTFontUIFontSystem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CFStringHasSuffix (cg_postscript_name, CFSTR ("-Bold")))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- font_type = kCTFontUIFontEmphasizedSystem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -206,7 +210,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ct_font;
</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;'>-- CFURLRef original_url = (CFURLRef)CTFontCopyAttribute(ct_font, kCTFontURLAttribute);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFURLRef original_url = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ATSFontRef atsFont;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef fsref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OSStatus status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ atsFont = CTFontGetPlatformFont (ct_font, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = ATSFontGetFileReference (atsFont, &fsref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (status == noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ original_url = CFURLCreateFromFSRef (NULL, &fsref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ original_url = (CFURLRef) CTFontCopyAttribute (ct_font, kCTFontURLAttribute);
</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;'>- /* Create font copy with cascade list that has LastResort first; this speeds up CoreText
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * font fallback which we don't need anyway. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,7 +240,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * system locations that we cannot access from the sandboxed renderer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * process in Blink. This can be detected by the new file URL location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * that the newly found font points to. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFURLRef new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, kCTFontURLAttribute);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFURLRef new_url = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ atsFont = CTFontGetPlatformFont (new_ct_font, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = ATSFontGetFileReference (atsFont, &fsref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (status == noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ new_url = CFURLCreateFromFSRef (NULL, &fsref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, kCTFontURLAttribute);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Keep reconfigured font if URL cannot be retrieved (seems to be the case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // on Mac OS 10.12 Sierra), speculative fix for crbug.com/625606
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!original_url || !new_url || CFEqual (original_url, new_url)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -944,6 +967,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (const void **) &kCTTypesetterOptionForcedEmbeddingLevel,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (const void **) &level_number,
</span></pre><pre style='margin:0'>
</pre>