diff options
| author | pho <pho> | 2014-05-27 14:23:58 +0000 |
|---|---|---|
| committer | pho <pho> | 2014-05-27 14:23:58 +0000 |
| commit | c8a2d7cacf6f816e4b125ae39b65a77778785a12 (patch) | |
| tree | 332a4bd079cedab1f606762f6502039ef9acf213 /fonts | |
| parent | e56fe8bb245aaa5848b37ef805214c6f3fdd10df (diff) | |
| download | pkgsrc-c8a2d7cacf6f816e4b125ae39b65a77778785a12.tar.gz | |
Don't use buggy CoreText in MacOS X 10.5
CTLineCreateWithAttributedString() seemingly fails when trying to use a
font which isn't installed into the system standard path.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/harfbuzz/Makefile | 26 | ||||
| -rw-r--r-- | fonts/harfbuzz/PLIST | 3 | ||||
| -rw-r--r-- | fonts/harfbuzz/PLIST.Darwin | 2 |
3 files changed, 25 insertions, 6 deletions
diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile index 2c2f95a05c3..c41b8193f55 100644 --- a/fonts/harfbuzz/Makefile +++ b/fonts/harfbuzz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2014/05/05 00:47:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.34 2014/05/27 14:23:58 pho Exp $ DISTNAME= harfbuzz-0.9.28 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= fonts MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ EXTRACT_SUFX= .tar.bz2 @@ -18,7 +18,6 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-cairo=no -CONFIGURE_ARGS+= --with-coretext=auto PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in @@ -34,6 +33,27 @@ LDFLAGS.OpenBSD+= -lz BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden .endif +PLIST_VARS+= coretext + +.if ${OPSYS} == "Darwin" +. if !empty(OS_VERSION:M[0-8].*) +# MacOS X < 10.5 does not have CoreText. +CONFIGURE_ARGS+= --with-coretext=no + +. elif !empty(OS_VERSION:M9.*) +# MacOS X 10.5 has CoreText but it's +# buggy. CTLineCreateWithAttributedString() seemingly fails when +# trying to use a font which isn't installed into the system standard +# path. +# See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5 +CONFIGURE_ARGS+= --with-coretext=no + +. else +CONFIGURE_ARGS+= --with-coretext=yes +PLIST.coretext= yes +. endif +.endif + .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" #cairo is only needed for the hb-view command line utility diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST index 4773b0a04e8..ce5e95bab7b 100644 --- a/fonts/harfbuzz/PLIST +++ b/fonts/harfbuzz/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.9 2014/05/04 16:58:45 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2014/05/27 14:23:58 pho Exp $ bin/hb-ot-shape-closure bin/hb-shape include/harfbuzz/hb-blob.h include/harfbuzz/hb-buffer.h include/harfbuzz/hb-common.h +${PLIST.coretext}include/harfbuzz/hb-coretext.h include/harfbuzz/hb-deprecated.h include/harfbuzz/hb-face.h include/harfbuzz/hb-font.h diff --git a/fonts/harfbuzz/PLIST.Darwin b/fonts/harfbuzz/PLIST.Darwin deleted file mode 100644 index ff20fb4d694..00000000000 --- a/fonts/harfbuzz/PLIST.Darwin +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2012/10/08 19:20:33 adam Exp $ -include/harfbuzz/hb-coretext.h |