Sun Feb 12 01:29:30 2017 UTC ()
Disable graphite2 support. Bump PKGREVISION

Enabling graphite2 causes segfault in graphics/librsvg
and SVG support in GTK2 is required for some packages.


(ryoon)
diff -r1.76 -r1.77 pkgsrc/fonts/harfbuzz/Makefile
diff -r1.19 -r1.20 pkgsrc/fonts/harfbuzz/PLIST
cvs diff -r1.76 -r1.77 pkgsrc/fonts/harfbuzz/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/harfbuzz/Makefile 2017/02/06 12:45:09 1.76
+++ pkgsrc/fonts/harfbuzz/Makefile 2017/02/12 01:29:30 1.77
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.76 2017/02/06 12:45:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.77 2017/02/12 01:29:30 ryoon Exp $
2 2
3DISTNAME= harfbuzz-1.4.2 3DISTNAME= harfbuzz-1.4.2
 4PKGREVISION= 1
4CATEGORIES= fonts 5CATEGORIES= fonts
5MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ 6MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://harfbuzz.org/ 10HOMEPAGE= http://harfbuzz.org/
10COMMENT= OpenType text shaping engine 11COMMENT= OpenType text shaping engine
11LICENSE= mit 12LICENSE= mit
12 13
13USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-cairo=no 18CONFIGURE_ARGS+= --with-cairo=no
18CONFIGURE_ARGS+= --with-graphite2=yes 19CONFIGURE_ARGS+= --with-graphite2=no
19 20
20PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in 21PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in
21PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in 22PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in
22 23
23LDFLAGS.OpenBSD+= -lz 24LDFLAGS.OpenBSD+= -lz
24 25
25.include "options.mk" 26.include "options.mk"
26 27
27.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
28 29
29# gcc too old 30# gcc too old
30BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility-inlines-hidden 31BUILDLINK_TRANSFORM.MirBSD+= rm:-fvisibility-inlines-hidden
31 32
@@ -46,15 +47,16 @@ CONFIGURE_ARGS+= --with-coretext=no @@ -46,15 +47,16 @@ CONFIGURE_ARGS+= --with-coretext=no
46 47
47. else 48. else
48CONFIGURE_ARGS+= --with-coretext=yes 49CONFIGURE_ARGS+= --with-coretext=yes
49PLIST.coretext= yes 50PLIST.coretext= yes
50. endif 51. endif
51.endif 52.endif
52 53
53.include "../../devel/glib2/buildlink3.mk" 54.include "../../devel/glib2/buildlink3.mk"
54.include "../../devel/zlib/buildlink3.mk" 55.include "../../devel/zlib/buildlink3.mk"
55#cairo is only needed for the hb-view command line utility 56#cairo is only needed for the hb-view command line utility
56#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0 57#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0
57#.include "../../graphics/cairo/buildlink3.mk" 58#.include "../../graphics/cairo/buildlink3.mk"
58.include "../../graphics/freetype2/buildlink3.mk" 59.include "../../graphics/freetype2/buildlink3.mk"
59.include "../../graphics/graphite2/buildlink3.mk" 60# graphite2 support breaks graphics/librsvg
 61#.include "../../graphics/graphite2/buildlink3.mk"
60.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/fonts/harfbuzz/PLIST (expand / switch to unified diff)

--- pkgsrc/fonts/harfbuzz/PLIST 2017/02/06 12:45:09 1.19
+++ pkgsrc/fonts/harfbuzz/PLIST 2017/02/12 01:29:30 1.20
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1@comment $NetBSD: PLIST,v 1.19 2017/02/06 12:45:09 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.20 2017/02/12 01:29:30 ryoon Exp $
2bin/hb-ot-shape-closure 2bin/hb-ot-shape-closure
3bin/hb-shape 3bin/hb-shape
4include/harfbuzz/hb-blob.h 4include/harfbuzz/hb-blob.h
5include/harfbuzz/hb-buffer.h 5include/harfbuzz/hb-buffer.h
6include/harfbuzz/hb-common.h 6include/harfbuzz/hb-common.h
7${PLIST.coretext}include/harfbuzz/hb-coretext.h 7${PLIST.coretext}include/harfbuzz/hb-coretext.h
8include/harfbuzz/hb-deprecated.h 8include/harfbuzz/hb-deprecated.h
9include/harfbuzz/hb-face.h 9include/harfbuzz/hb-face.h
10include/harfbuzz/hb-font.h 10include/harfbuzz/hb-font.h
11include/harfbuzz/hb-ft.h 11include/harfbuzz/hb-ft.h
12include/harfbuzz/hb-glib.h 12include/harfbuzz/hb-glib.h
13include/harfbuzz/hb-graphite2.h 
14${PLIST.icu}include/harfbuzz/hb-icu.h 13${PLIST.icu}include/harfbuzz/hb-icu.h
15include/harfbuzz/hb-ot-font.h 14include/harfbuzz/hb-ot-font.h
16include/harfbuzz/hb-ot-layout.h 15include/harfbuzz/hb-ot-layout.h
17include/harfbuzz/hb-ot-math.h 16include/harfbuzz/hb-ot-math.h
18include/harfbuzz/hb-ot-shape.h 17include/harfbuzz/hb-ot-shape.h
19include/harfbuzz/hb-ot-tag.h 18include/harfbuzz/hb-ot-tag.h
20include/harfbuzz/hb-ot-var.h 19include/harfbuzz/hb-ot-var.h
21include/harfbuzz/hb-ot.h 20include/harfbuzz/hb-ot.h
22include/harfbuzz/hb-set.h 21include/harfbuzz/hb-set.h
23include/harfbuzz/hb-shape-plan.h 22include/harfbuzz/hb-shape-plan.h
24include/harfbuzz/hb-shape.h 23include/harfbuzz/hb-shape.h
25include/harfbuzz/hb-unicode.h 24include/harfbuzz/hb-unicode.h
26include/harfbuzz/hb-version.h 25include/harfbuzz/hb-version.h