Commit 8dd6e48c authored by Martin Storsjö's avatar Martin Storsjö Committed by Hugo Beauzée-Luyssen

contribs: harfbuzz: Fix compilation with clang on win64

Clang errors out on casting from a pointer to a smaller integer
type.

This is an adapted backport of a newer upstream harfbuzz
commit 03b7a221f701a9b003890878e730ad175c3fdd86.
Signed-off-by: default avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent 05d812e4
......@@ -24,6 +24,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-coretext.patch
$(APPLY) $(SRC)/harfbuzz/win64.patch
$(MOVE)
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
......
diff -urN harfbuzz-orig/src/hb-private.hh harfbuzz/src/hb-private.hh
--- harfbuzz-orig/src/hb-private.hh 2017-01-10 06:18:28.000000000 +0000
+++ harfbuzz/src/hb-private.hh 2017-12-21 21:46:12.254147419 +0000
@@ -684,7 +684,7 @@
fprintf (stderr, "%-10s", what ? what : "");
if (obj)
- fprintf (stderr, "(%0*lx) ", (unsigned int) (2 * sizeof (void *)), (unsigned long) obj);
+ fprintf (stderr, "(%0*p) ", (unsigned int) (2 * sizeof (void *)), obj);
else
fprintf (stderr, " %*s ", (unsigned int) (2 * sizeof (void *)), "");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment