From 59be97e3a26482cbe81beec34eeed2688d9ef09a Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 7 Jul 2013 10:19:03 +0000 Subject: Update to 0.9.18. Overview of changes leading to 0.9.18 Tuesday, May 28, 2013 ===================================== New build system: - All unneeded code is all disabled by default, - Uniscribe and CoreText shapers can be enabled with their --with options, - icu_le and old shapers cannot be enabled for now, - glib, freetype, and cairo will be detected automatically. They can be force on/off'ed with their --with options, - icu and graphite2 are default off, can be enabled with their --with options, Moreover, ICU support is now build into a separate library: libharfbuzz-icu.so, and a new harfbuzz-icu.pc is shipped for it. Distros can enable ICU now without every application on earth getting linked to via libharfbuzz.so. For distros I recommend that they make sure they are building --with-glib --with-freetype --with-cairo, --with-icu, and optionally --with-graphite2; And package harfbuzz and harfbuzz-icu separately. --- fonts/harfbuzz/Makefile | 12 +++++++----- fonts/harfbuzz/PLIST | 2 +- fonts/harfbuzz/distinfo | 9 +++++---- fonts/harfbuzz/patches/patch-test_api_Makefile.in | 24 +++++++++++++++++++++++ 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 fonts/harfbuzz/patches/patch-test_api_Makefile.in (limited to 'fonts') diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile index 296fd429f0c..9934ca3bcdb 100644 --- a/fonts/harfbuzz/Makefile +++ b/fonts/harfbuzz/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2013/06/04 22:16:03 tron Exp $ +# $NetBSD: Makefile,v 1.18 2013/07/07 10:19:03 wiz Exp $ -DISTNAME= harfbuzz-0.9.17 -PKGREVISION= 2 +DISTNAME= harfbuzz-0.9.18 CATEGORIES= fonts MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ EXTRACT_SUFX= .tar.bz2 @@ -18,7 +17,9 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= harfbuzz.pc.in -CONFIGURE_ENV+= ICU_CONFIG=no + +CONFIGURE_ARGS+= --with-cairo=no +CONFIGURE_ARGS+= --with-icu=no LDFLAGS.OpenBSD+= -lz @@ -31,7 +32,8 @@ BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -#cairo is only needed for some cmd line utility +#cairo is only needed for the hb-view command line utility +#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.8.0 #.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST index 366a057975c..e2e900e91b1 100644 --- a/fonts/harfbuzz/PLIST +++ b/fonts/harfbuzz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2013/03/14 19:10:29 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/07/07 10:19:03 wiz Exp $ bin/hb-ot-shape-closure bin/hb-shape include/harfbuzz/hb-blob.h diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo index 0d18c26a1d5..4eba769475a 100644 --- a/fonts/harfbuzz/distinfo +++ b/fonts/harfbuzz/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.11 2013/05/26 18:01:16 wiz Exp $ +$NetBSD: distinfo,v 1.12 2013/07/07 10:19:03 wiz Exp $ -SHA1 (harfbuzz-0.9.17.tar.bz2) = 7021db9d4522480a0902f8a9d8eedae20353bc10 -RMD160 (harfbuzz-0.9.17.tar.bz2) = ccaaa6e26c5446a036587f528ede3a84f182ca9d -Size (harfbuzz-0.9.17.tar.bz2) = 902229 bytes +SHA1 (harfbuzz-0.9.18.tar.bz2) = 621943fa0cadbc5514d8c8cdf985b7158baebc2d +RMD160 (harfbuzz-0.9.18.tar.bz2) = 846129218febad5dcdcb914ef943bb19dd9c310b +Size (harfbuzz-0.9.18.tar.bz2) = 902395 bytes SHA1 (patch-src_hb-open-type-private.hh) = b8700b88b02c36d659af0ef151c477aa42043c6f +SHA1 (patch-test_api_Makefile.in) = f19f3b2f96b93e8d3c1aa64d5c6f78cfc385e177 diff --git a/fonts/harfbuzz/patches/patch-test_api_Makefile.in b/fonts/harfbuzz/patches/patch-test_api_Makefile.in new file mode 100644 index 00000000000..37bf68676ef --- /dev/null +++ b/fonts/harfbuzz/patches/patch-test_api_Makefile.in @@ -0,0 +1,24 @@ +$NetBSD: patch-test_api_Makefile.in,v 1.1 2013/07/07 10:19:04 wiz Exp $ + +If not linking against icu, we need to link against libharfbuzz itself. + +--- test/api/Makefile.in.orig 2013-05-28 21:20:43.000000000 +0000 ++++ test/api/Makefile.in +@@ -148,6 +148,9 @@ test_unicode_OBJECTS = test_unicode-test + @HAVE_GLIB_TRUE@am__DEPENDENCIES_2 = \ + @HAVE_GLIB_TRUE@ $(top_builddir)/src/libharfbuzz.la \ + @HAVE_GLIB_TRUE@ $(am__DEPENDENCIES_1) ++@HAVE_GLIB_TRUE@@HAVE_ICU_FALSE@test_unicode_DEPENDENCIES = \ ++@HAVE_GLIB_TRUE@@HAVE_ICU_FALSE@ $(am__DEPENDENCIES_2) \ ++@HAVE_GLIB_TRUE@@HAVE_ICU_FALSE@ $(top_builddir)/src/libharfbuzz.la + @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@test_unicode_DEPENDENCIES = \ + @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@ $(am__DEPENDENCIES_2) \ + @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@ $(top_builddir)/src/libharfbuzz-icu.la +@@ -390,6 +393,7 @@ MAINTAINERCLEANFILES = + @HAVE_GLIB_TRUE@test_unicode_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) \ + @HAVE_GLIB_TRUE@ $(am__append_2) + @HAVE_GLIB_TRUE@@HAVE_ICU_TRUE@test_unicode_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz-icu.la ++@HAVE_GLIB_TRUE@@HAVE_ICU_FALSE@test_unicode_LDADD = $(LDADD) $(top_builddir)/src/libharfbuzz.la + @HAVE_GLIB_TRUE@test_cplusplus_SOURCES = test-cplusplus.cc + @HAVE_GLIB_TRUE@test_c_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_4) \ + @HAVE_GLIB_TRUE@ $(am__append_6) -- cgit v1.2.3