<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/844d4b96230957c70e97303395f8a3f597dee688">https://github.com/macports/macports-ports/commit/844d4b96230957c70e97303395f8a3f597dee688</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 844d4b9 harfbuzz: Fix build on 32-bit systems
</span>844d4b9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 844d4b96230957c70e97303395f8a3f597dee688
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 30 11:55:04 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> harfbuzz: Fix build on 32-bit systems
</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/56189
</span>---
graphics/harfbuzz/Portfile | 2 ++
graphics/harfbuzz/files/32bit.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
<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 4906095..0c88f69 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;'>@@ -23,6 +23,8 @@ checksums rmd160 bfd237407c3b8eea5a59f1c6bbab4a467549c767 \
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 32bit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Remove this on an update to >1.7.6 as https://github.com/harfbuzz/harfbuzz/commit/2a2360
compiler.blacklist *llvm-gcc-4.2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz/files/32bit.patch b/graphics/harfbuzz/files/32bit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4cf9336
</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/32bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build on 32-bit systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/harfbuzz/harfbuzz/issues/901
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/harfbuzz/harfbuzz/commit/7ec3ba21f0dc43f9f8ea1fc4344d3ea4524841b1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/harfbuzz/harfbuzz/commit/ebccd019749e24e6c045518ee1ffbfc947744204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/hb-private.hh.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/hb-private.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,7 +414,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sizeof (T) <= 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* "bithacks" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const uint64_t b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000, 0xFFFFFFFF00000000};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const uint64_t b[] = {0x2ULL, 0xCULL, 0xF0ULL, 0xFF00ULL, 0xFFFF0000ULL, 0xFFFFFFFF00000000ULL};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const unsigned int S[] = {1, 2, 4, 8, 16, 32};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int r = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 5; i >= 0; i--)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -489,12 +489,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int c = 64;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ v &= - (int64_t) (v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (v) c--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (v & 0x00000000FFFFFFFF) c -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (v & 0x0000FFFF0000FFFF) c -= 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (v & 0x00FF00FF00FF00FF) c -= 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (v & 0x0F0F0F0F0F0F0F0F) c -= 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (v & 0x3333333333333333) c -= 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (v & 0x5555555555555555) c -= 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v & 0x00000000FFFFFFFFULL) c -= 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v & 0x0000FFFF0000FFFFULL) c -= 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v & 0x00FF00FF00FF00FFULL) c -= 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v & 0x0F0F0F0F0F0F0F0FULL) c -= 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v & 0x3333333333333333ULL) c -= 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (v & 0x5555555555555555ULL) c -= 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sizeof (T) == 16)
</span></pre><pre style='margin:0'>
</pre>