From a589e7082866b0e8b2a6fa8c80a103715ee91967 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 11 Sep 2006 18:53:16 +0000 Subject: Update to 2.4.0: Fontconfig version 2.4 is API and ABI compatible with the 2.3 release, although some significant internal restructuring has occurred. Major changes from the 2.3 series: * Shared mmap'ed cache files. All font cache files are mapped read-only and shared across multiple processes. Startup performance and memory footprint of the library have, as a result, been significantly improved. * Configuration split into multiple files. While 2.3 provided the ability to incorporate additional configuration files from a directory, it didn't use them extensively. The new configuration structure places most of the configuration into separate files and provides conventions for naming them that are designed to permit user and distribution customization of the library without needing to edit the master config file. * Eliminate internal symbols from shared library symbol table. The shared library now exports precisely the list of symbols present in the public header files. Use of private symbols, always unsupported, will now result in failure to link and run. Thanks to all who have made this release possible, especially Patrick Lam who built the shared cache file code and performed most of the maintenance over the last year. Keith Packard 2006-9-9 --- fonts/fontconfig/Makefile | 30 ++++---- fonts/fontconfig/PLIST | 141 ++++++++++++++++++++++++-------------- fonts/fontconfig/distinfo | 15 ++-- fonts/fontconfig/patches/patch-aa | 17 +++-- fonts/fontconfig/patches/patch-ac | 20 +++--- 5 files changed, 133 insertions(+), 90 deletions(-) (limited to 'fonts/fontconfig') diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index e6a67b70b55..31d287348b6 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.54 2006/07/23 01:09:11 minskim Exp $ +# $NetBSD: Makefile,v 1.55 2006/09/11 18:53:16 wiz Exp $ -DISTNAME= fontconfig-2.3.2 -PKGREVISION= 3 +DISTNAME= fontconfig-2.4.0 CATEGORIES= fonts MASTER_SITES= http://www.fontconfig.org/release/ @@ -9,10 +8,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fontconfig.org/ COMMENT= Library for configuring and customizing font access -PATCH_SITES= http://www.freetype.org/freetype2/patches/ -PATCHFILES= fontconfig-2.3.2-noftinternals.patch -PATCH_DIST_STRIP= -p1 - PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES @@ -42,12 +37,21 @@ EGDIR= ${PREFIX}/share/examples/fontconfig CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d -CONF_FILES+= ${EGDIR}/conf.d/autohint.conf ${PKG_SYSCONFDIR}/conf.d/autohint.conf -CONF_FILES+= ${EGDIR}/conf.d/no-bitmaps.conf ${PKG_SYSCONFDIR}/conf.d/no-bitmaps.conf -CONF_FILES+= ${EGDIR}/conf.d/no-sub-pixel.conf ${PKG_SYSCONFDIR}/conf.d/no-sub-pixel.conf -CONF_FILES+= ${EGDIR}/conf.d/sub-pixel.conf ${PKG_SYSCONFDIR}/conf.d/sub-pixel.conf -CONF_FILES+= ${EGDIR}/conf.d/unhinted.conf ${PKG_SYSCONFDIR}/conf.d/unhinted.conf -CONF_FILES+= ${EGDIR}/conf.d/yes-bitmaps.conf ${PKG_SYSCONFDIR}/conf.d/yes-bitmaps.conf +CONF_FILES+= ${EGDIR}/conf.d/20-fix-globaladvance.conf ${PKG_SYSCONFDIR}/conf.d/20-fix-globaladvance.conf +CONF_FILES+= ${EGDIR}/conf.d/20-lohit-gujarati.conf ${PKG_SYSCONFDIR}/conf.d/20-lohit-gujarati.conf +CONF_FILES+= ${EGDIR}/conf.d/20-unhint-small-vera.conf ${PKG_SYSCONFDIR}/conf.d/20-unhint-small-vera.conf +CONF_FILES+= ${EGDIR}/conf.d/30-amt-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-amt-aliases.conf +CONF_FILES+= ${EGDIR}/conf.d/30-urw-aliases.conf ${PKG_SYSCONFDIR}/conf.d/30-urw-aliases.conf +CONF_FILES+= ${EGDIR}/conf.d/40-generic.conf ${PKG_SYSCONFDIR}/conf.d/40-generic.conf +CONF_FILES+= ${EGDIR}/conf.d/49-sansserif.conf ${PKG_SYSCONFDIR}/conf.d/49-sansserif.conf +CONF_FILES+= ${EGDIR}/conf.d/50-user.conf ${PKG_SYSCONFDIR}/conf.d/50-user.conf +CONF_FILES+= ${EGDIR}/conf.d/51-local.conf ${PKG_SYSCONFDIR}/conf.d/51-local.conf +CONF_FILES+= ${EGDIR}/conf.d/60-latin.conf ${PKG_SYSCONFDIR}/conf.d/60-latin.conf +CONF_FILES+= ${EGDIR}/conf.d/65-fonts-persian.conf ${PKG_SYSCONFDIR}/conf.d/65-fonts-persian.conf +CONF_FILES+= ${EGDIR}/conf.d/65-nonlatin.conf ${PKG_SYSCONFDIR}/conf.d/65-nonlatin.conf +CONF_FILES+= ${EGDIR}/conf.d/69-unifont.conf ${PKG_SYSCONFDIR}/conf.d/69-unifont.conf +CONF_FILES+= ${EGDIR}/conf.d/80-delicious.conf ${PKG_SYSCONFDIR}/conf.d/80-delicious.conf +CONF_FILES+= ${EGDIR}/conf.d/90-synthetic.conf ${PKG_SYSCONFDIR}/conf.d/90-synthetic.conf LIBS+= ${BUILDLINK_LDADD.iconv} diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index 6b6491578c9..a4efb866987 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.11 2005/03/22 14:05:54 wiz Exp $ +@comment $NetBSD: PLIST,v 1.12 2006/09/11 18:53:16 wiz Exp $ bin/fc-cache +bin/fc-cat bin/fc-list bin/fc-match include/fontconfig/fcfreetype.h @@ -7,7 +8,6 @@ include/fontconfig/fcprivate.h include/fontconfig/fontconfig.h lib/libfontconfig.la lib/pkgconfig/fontconfig.pc -man/man1/fc-match.1 man/man3/FcAtomicCreate.3 man/man3/FcAtomicDeleteNew.3 man/man3/FcAtomicDestroy.3 @@ -50,6 +50,7 @@ man/man3/FcConfigGetCurrent.3 man/man3/FcConfigGetFontDirs.3 man/man3/FcConfigGetFonts.3 man/man3/FcConfigGetRescanInverval.3 +man/man3/FcConfigNormalizeFontDir.3 man/man3/FcConfigParseAndLoad.3 man/man3/FcConfigSetCurrent.3 man/man3/FcConfigSetRescanInverval.3 @@ -196,55 +197,56 @@ share/doc/fontconfig/fontconfig-devel/r2178.html share/doc/fontconfig/fontconfig-devel/r2205.html share/doc/fontconfig/fontconfig-devel/r2229.html share/doc/fontconfig/fontconfig-devel/r225.html -share/doc/fontconfig/fontconfig-devel/r2255.html -share/doc/fontconfig/fontconfig-devel/r2279.html -share/doc/fontconfig/fontconfig-devel/r2303.html -share/doc/fontconfig/fontconfig-devel/r2328.html -share/doc/fontconfig/fontconfig-devel/r2352.html -share/doc/fontconfig/fontconfig-devel/r2376.html -share/doc/fontconfig/fontconfig-devel/r2398.html -share/doc/fontconfig/fontconfig-devel/r2426.html -share/doc/fontconfig/fontconfig-devel/r2447.html -share/doc/fontconfig/fontconfig-devel/r2468.html +share/doc/fontconfig/fontconfig-devel/r2252.html +share/doc/fontconfig/fontconfig-devel/r2278.html +share/doc/fontconfig/fontconfig-devel/r2302.html +share/doc/fontconfig/fontconfig-devel/r2326.html +share/doc/fontconfig/fontconfig-devel/r2351.html +share/doc/fontconfig/fontconfig-devel/r2375.html +share/doc/fontconfig/fontconfig-devel/r2399.html +share/doc/fontconfig/fontconfig-devel/r2421.html +share/doc/fontconfig/fontconfig-devel/r2449.html +share/doc/fontconfig/fontconfig-devel/r2470.html share/doc/fontconfig/fontconfig-devel/r249.html share/doc/fontconfig/fontconfig-devel/r2491.html -share/doc/fontconfig/fontconfig-devel/r2517.html -share/doc/fontconfig/fontconfig-devel/r2539.html -share/doc/fontconfig/fontconfig-devel/r2561.html -share/doc/fontconfig/fontconfig-devel/r2583.html -share/doc/fontconfig/fontconfig-devel/r2605.html -share/doc/fontconfig/fontconfig-devel/r2627.html -share/doc/fontconfig/fontconfig-devel/r2648.html -share/doc/fontconfig/fontconfig-devel/r2669.html -share/doc/fontconfig/fontconfig-devel/r2694.html +share/doc/fontconfig/fontconfig-devel/r2514.html +share/doc/fontconfig/fontconfig-devel/r2540.html +share/doc/fontconfig/fontconfig-devel/r2562.html +share/doc/fontconfig/fontconfig-devel/r2584.html +share/doc/fontconfig/fontconfig-devel/r2606.html +share/doc/fontconfig/fontconfig-devel/r2628.html +share/doc/fontconfig/fontconfig-devel/r2650.html +share/doc/fontconfig/fontconfig-devel/r2671.html +share/doc/fontconfig/fontconfig-devel/r2692.html share/doc/fontconfig/fontconfig-devel/r270.html -share/doc/fontconfig/fontconfig-devel/r2730.html -share/doc/fontconfig/fontconfig-devel/r2765.html -share/doc/fontconfig/fontconfig-devel/r2793.html -share/doc/fontconfig/fontconfig-devel/r2818.html -share/doc/fontconfig/fontconfig-devel/r2839.html -share/doc/fontconfig/fontconfig-devel/r2864.html -share/doc/fontconfig/fontconfig-devel/r2889.html +share/doc/fontconfig/fontconfig-devel/r2717.html +share/doc/fontconfig/fontconfig-devel/r2753.html +share/doc/fontconfig/fontconfig-devel/r2788.html +share/doc/fontconfig/fontconfig-devel/r2816.html +share/doc/fontconfig/fontconfig-devel/r2841.html +share/doc/fontconfig/fontconfig-devel/r2862.html +share/doc/fontconfig/fontconfig-devel/r2887.html share/doc/fontconfig/fontconfig-devel/r291.html -share/doc/fontconfig/fontconfig-devel/r2914.html -share/doc/fontconfig/fontconfig-devel/r2940.html -share/doc/fontconfig/fontconfig-devel/r2962.html -share/doc/fontconfig/fontconfig-devel/r2984.html -share/doc/fontconfig/fontconfig-devel/r3006.html -share/doc/fontconfig/fontconfig-devel/r3031.html -share/doc/fontconfig/fontconfig-devel/r3060.html -share/doc/fontconfig/fontconfig-devel/r3085.html -share/doc/fontconfig/fontconfig-devel/r3117.html -share/doc/fontconfig/fontconfig-devel/r3150.html +share/doc/fontconfig/fontconfig-devel/r2912.html +share/doc/fontconfig/fontconfig-devel/r2937.html +share/doc/fontconfig/fontconfig-devel/r2963.html +share/doc/fontconfig/fontconfig-devel/r2985.html +share/doc/fontconfig/fontconfig-devel/r3007.html +share/doc/fontconfig/fontconfig-devel/r3029.html +share/doc/fontconfig/fontconfig-devel/r3054.html +share/doc/fontconfig/fontconfig-devel/r3083.html +share/doc/fontconfig/fontconfig-devel/r3108.html +share/doc/fontconfig/fontconfig-devel/r3140.html share/doc/fontconfig/fontconfig-devel/r316.html -share/doc/fontconfig/fontconfig-devel/r3186.html +share/doc/fontconfig/fontconfig-devel/r3173.html share/doc/fontconfig/fontconfig-devel/r3209.html -share/doc/fontconfig/fontconfig-devel/r3231.html +share/doc/fontconfig/fontconfig-devel/r3232.html share/doc/fontconfig/fontconfig-devel/r3254.html -share/doc/fontconfig/fontconfig-devel/r3279.html -share/doc/fontconfig/fontconfig-devel/r3306.html -share/doc/fontconfig/fontconfig-devel/r3333.html -share/doc/fontconfig/fontconfig-devel/r3355.html +share/doc/fontconfig/fontconfig-devel/r3277.html +share/doc/fontconfig/fontconfig-devel/r3302.html +share/doc/fontconfig/fontconfig-devel/r3329.html +share/doc/fontconfig/fontconfig-devel/r3356.html +share/doc/fontconfig/fontconfig-devel/r3378.html share/doc/fontconfig/fontconfig-devel/r344.html share/doc/fontconfig/fontconfig-devel/r365.html share/doc/fontconfig/fontconfig-devel/r393.html @@ -274,15 +276,54 @@ share/doc/fontconfig/fontconfig-devel/x93.html share/doc/fontconfig/fontconfig-user.html share/doc/fontconfig/fontconfig-user.pdf share/doc/fontconfig/fontconfig-user.txt -share/examples/fontconfig/conf.d/autohint.conf -share/examples/fontconfig/conf.d/no-bitmaps.conf -share/examples/fontconfig/conf.d/no-sub-pixel.conf -share/examples/fontconfig/conf.d/sub-pixel.conf -share/examples/fontconfig/conf.d/unhinted.conf -share/examples/fontconfig/conf.d/yes-bitmaps.conf +share/examples/fontconfig/conf.avail/10-autohint.conf +share/examples/fontconfig/conf.avail/10-no-sub-pixel.conf +share/examples/fontconfig/conf.avail/10-sub-pixel-bgr.conf +share/examples/fontconfig/conf.avail/10-sub-pixel-rgb.conf +share/examples/fontconfig/conf.avail/10-sub-pixel-vbgr.conf +share/examples/fontconfig/conf.avail/10-sub-pixel-vrgb.conf +share/examples/fontconfig/conf.avail/10-unhinted.conf +share/examples/fontconfig/conf.avail/20-fix-globaladvance.conf +share/examples/fontconfig/conf.avail/20-lohit-gujarati.conf +share/examples/fontconfig/conf.avail/20-unhint-small-vera.conf +share/examples/fontconfig/conf.avail/30-amt-aliases.conf +share/examples/fontconfig/conf.avail/30-urw-aliases.conf +share/examples/fontconfig/conf.avail/40-generic.conf +share/examples/fontconfig/conf.avail/49-sansserif.conf +share/examples/fontconfig/conf.avail/50-user.conf +share/examples/fontconfig/conf.avail/51-local.conf +share/examples/fontconfig/conf.avail/60-latin.conf +share/examples/fontconfig/conf.avail/65-fonts-persian.conf +share/examples/fontconfig/conf.avail/65-nonlatin.conf +share/examples/fontconfig/conf.avail/69-unifont.conf +share/examples/fontconfig/conf.avail/70-no-bitmaps.conf +share/examples/fontconfig/conf.avail/70-yes-bitmaps.conf +share/examples/fontconfig/conf.avail/80-delicious.conf +share/examples/fontconfig/conf.avail/90-synthetic.conf +share/examples/fontconfig/conf.avail/README +share/examples/fontconfig/conf.d/20-fix-globaladvance.conf +share/examples/fontconfig/conf.d/20-lohit-gujarati.conf +share/examples/fontconfig/conf.d/20-unhint-small-vera.conf +share/examples/fontconfig/conf.d/30-amt-aliases.conf +share/examples/fontconfig/conf.d/30-urw-aliases.conf +share/examples/fontconfig/conf.d/40-generic.conf +share/examples/fontconfig/conf.d/49-sansserif.conf +share/examples/fontconfig/conf.d/50-user.conf +share/examples/fontconfig/conf.d/51-local.conf +share/examples/fontconfig/conf.d/60-latin.conf +share/examples/fontconfig/conf.d/65-fonts-persian.conf +share/examples/fontconfig/conf.d/65-nonlatin.conf +share/examples/fontconfig/conf.d/69-unifont.conf +share/examples/fontconfig/conf.d/80-delicious.conf +share/examples/fontconfig/conf.d/90-synthetic.conf share/examples/fontconfig/fonts.conf share/examples/fontconfig/fonts.dtd +@exec ${MKDIR} %D/var/cache/fontconfig +@unexec ${RMDIR} %D/var/cache/fontconfig 2> /dev/null || ${TRUE} +@unexec ${RMDIR} %D/var/cache 2> /dev/null || ${TRUE} +@unexec ${RMDIR} %D/var 2> /dev/null || ${TRUE} @dirrm share/examples/fontconfig/conf.d +@dirrm share/examples/fontconfig/conf.avail @dirrm share/examples/fontconfig @dirrm share/doc/fontconfig/fontconfig-devel @dirrm share/doc/fontconfig diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo index 45639e37142..f19a8aed1b8 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.15 2006/05/29 22:38:06 tron Exp $ +$NetBSD: distinfo,v 1.16 2006/09/11 18:53:16 wiz Exp $ -SHA1 (fontconfig-2.3.2.tar.gz) = 8ec60da668618383b539db9d70b8e320bd7dd031 -RMD160 (fontconfig-2.3.2.tar.gz) = 42668475cca88f265a3b12c289eea2ff61ddaa2b -Size (fontconfig-2.3.2.tar.gz) = 964045 bytes -SHA1 (fontconfig-2.3.2-noftinternals.patch) = c89e63ef691a779ae1ee5f8a4bda2cc55cd280c6 -RMD160 (fontconfig-2.3.2-noftinternals.patch) = 69c409a41708662bd04b9ba998e5d2b5a77b1016 -Size (fontconfig-2.3.2-noftinternals.patch) = 18275 bytes -SHA1 (patch-aa) = 4f39b7726c11cc9d91fba0c840f26404702c0353 -SHA1 (patch-ac) = df8b145c38476e5caa1f4636be4eb56654bd11d0 +SHA1 (fontconfig-2.4.0.tar.gz) = 132b0567740a04d89cd1eef0dd66b43ca32538c0 +RMD160 (fontconfig-2.4.0.tar.gz) = 96badf68a351018d99cb432939b4f8966f0b334d +Size (fontconfig-2.4.0.tar.gz) = 1269266 bytes +SHA1 (patch-aa) = 6d2e24ad8db33eb71a39ef288d7329559307d9dc +SHA1 (patch-ac) = 965087ba6e457daf17c55fc3573b51fd6425be93 diff --git a/fonts/fontconfig/patches/patch-aa b/fonts/fontconfig/patches/patch-aa index 9a6a605d69e..e7833327dff 100644 --- a/fonts/fontconfig/patches/patch-aa +++ b/fonts/fontconfig/patches/patch-aa @@ -1,18 +1,17 @@ -$NetBSD: patch-aa,v 1.8 2005/03/22 14:05:54 wiz Exp $ +$NetBSD: patch-aa,v 1.9 2006/09/11 18:53:16 wiz Exp $ ---- Makefile.in.orig 2005-03-09 00:42:10.000000000 +0100 +--- Makefile.in.orig 2006-09-10 05:04:47.000000000 +0000 +++ Makefile.in -@@ -248,11 +248,12 @@ EXTRA_DIST = \ +@@ -274,10 +274,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal + -type f -name Makefile.in -print` ChangeLog pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fontconfig.pc - -configdir = $(CONFDIR) +configdir = $(prefix)/share/examples/fontconfig config_DATA = fonts.dtd - - @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)" + @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false +RUN_FC_CACHE_TEST = false - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac index 23fc656a686..56aa969cdf7 100644 --- a/fonts/fontconfig/patches/patch-ac +++ b/fonts/fontconfig/patches/patch-ac @@ -1,22 +1,24 @@ -$NetBSD: patch-ac,v 1.6 2005/03/22 14:05:54 wiz Exp $ +$NetBSD: patch-ac,v 1.7 2006/09/11 18:53:16 wiz Exp $ ---- conf.d/Makefile.in.orig 2005-03-09 00:42:10.000000000 +0100 +--- conf.d/Makefile.in.orig 2006-09-10 05:04:45.000000000 +0000 +++ conf.d/Makefile.in -@@ -195,7 +195,7 @@ prefix = @prefix@ - program_transform_name = @program_transform_name@ +@@ -228,7 +228,7 @@ program_transform_name = @program_transf + psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ +sysconfdir = $(prefix)/share/examples/fontconfig target_alias = @target_alias@ - CONF_FILES = \ -@@ -210,7 +210,7 @@ CONF_FILES = \ - EXTRA_DIST = $(CONF_FILES) + README \ +@@ -276,8 +276,8 @@ CONF_LINKS = \ + EXTRA_DIST = $(CONF_FILES) configdir = $(CONFDIR) +-confavaildir = $(configdir)/conf.avail -confddir = $(configdir)/conf.d ++confavaildir = $(sysconfdir)/conf.avail +confddir = $(sysconfdir)/conf.d + confavail_DATA = $(CONF_FILES) + all: all-am - confd_DATA = $(CONF_FILES) - subdir = conf.d -- cgit v1.2.3