From 3ad11e5ab4fbf88e66c1744a22028850deb3ddec Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 1 Mar 2005 23:38:14 +0000 Subject: Update to 2.3.0: Fix memory leak of patterns rejected by configuration (#2518) Create prototype $PREFIX/etc/fontconfig/conf.d directory and populate it with a few sample files. These samples are unused as the file names don't start with numbers. Update documentation. --- fonts/fontconfig/Makefile | 9 +- fonts/fontconfig/PLIST | 233 ++++++++++++++++++++------------------ fonts/fontconfig/distinfo | 9 +- fonts/fontconfig/patches/patch-ac | 22 ++++ 4 files changed, 155 insertions(+), 118 deletions(-) create mode 100644 fonts/fontconfig/patches/patch-ac (limited to 'fonts') diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 7450e669a84..1f5603818ff 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.37 2005/02/26 16:39:51 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2005/03/01 23:38:14 wiz Exp $ # -DISTNAME= fontconfig-2.2.99 +DISTNAME= fontconfig-2.3.0 CATEGORIES= fonts gnome MASTER_SITES= http://www.fontconfig.org/release/ @@ -44,7 +44,10 @@ CONFIGURE_ARGS+= --with-add-fonts=${FONT_PATH}${FONT_PATH2} EGDIR= ${PREFIX}/share/examples/fontconfig CONF_FILES= ${EGDIR}/fonts.conf ${PKG_SYSCONFDIR}/fonts.conf CONF_FILES+= ${EGDIR}/fonts.dtd ${PKG_SYSCONFDIR}/fonts.dtd -CONF_FILES+= ${EGDIR}/local.conf ${PKG_SYSCONFDIR}/local.conf +MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf.d +CONF_FILES+= ${EGDIR}/conf.d/no-bitmaps.conf ${PKG_SYSCONFDIR}/conf.d/no-bitmaps.conf +CONF_FILES+= ${EGDIR}/conf.d/sub-pixel.conf ${PKG_SYSCONFDIR}/conf.d/sub-pixel.conf +CONF_FILES+= ${EGDIR}/conf.d/yes-bitmaps.conf ${PKG_SYSCONFDIR}/conf.d/yes-bitmaps.conf .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/fonts/fontconfig/PLIST b/fonts/fontconfig/PLIST index 545df8a5714..8ac32d3a53b 100644 --- a/fonts/fontconfig/PLIST +++ b/fonts/fontconfig/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2005/01/18 12:15:46 drochner Exp $ +@comment $NetBSD: PLIST,v 1.9 2005/03/01 23:38:14 wiz Exp $ bin/fc-cache bin/fc-list bin/fc-match @@ -117,6 +117,7 @@ man/man3/FcStrCmpIgnoreCase.3 man/man3/FcStrCopy.3 man/man3/FcStrCopyFilename.3 man/man3/FcStrDirname.3 +man/man3/FcStrDowncase.3 man/man3/FcStrListCreate.3 man/man3/FcStrListDone.3 man/man3/FcStrListNext.3 @@ -126,6 +127,8 @@ man/man3/FcStrSetCreate.3 man/man3/FcStrSetDel.3 man/man3/FcStrSetDestroy.3 man/man3/FcStrSetMember.3 +man/man3/FcStrStr.3 +man/man3/FcStrStrIgnoreCase.3 man/man3/FcUcs4ToUtf8.3 man/man3/FcUtf16Len.3 man/man3/FcUtf16ToUcs4.3 @@ -134,141 +137,149 @@ man/man3/FcUtf8ToUcs4.3 man/man3/FcValueDestroy.3 man/man3/FcValueSave.3 man/man5/fonts-conf.5 +share/doc/fontconfig/fontconfig-devel.pdf share/doc/fontconfig/fontconfig-devel.txt share/doc/fontconfig/fontconfig-devel/index.html -share/doc/fontconfig/fontconfig-devel/r1009.html -share/doc/fontconfig/fontconfig-devel/r1040.html -share/doc/fontconfig/fontconfig-devel/r1062.html -share/doc/fontconfig/fontconfig-devel/r1088.html -share/doc/fontconfig/fontconfig-devel/r1110.html -share/doc/fontconfig/fontconfig-devel/r1133.html -share/doc/fontconfig/fontconfig-devel/r1157.html -share/doc/fontconfig/fontconfig-devel/r1180.html +share/doc/fontconfig/fontconfig-devel/r1011.html +share/doc/fontconfig/fontconfig-devel/r1042.html +share/doc/fontconfig/fontconfig-devel/r1064.html +share/doc/fontconfig/fontconfig-devel/r1090.html +share/doc/fontconfig/fontconfig-devel/r1112.html +share/doc/fontconfig/fontconfig-devel/r1135.html +share/doc/fontconfig/fontconfig-devel/r1159.html +share/doc/fontconfig/fontconfig-devel/r1182.html share/doc/fontconfig/fontconfig-devel/r120.html -share/doc/fontconfig/fontconfig-devel/r1205.html -share/doc/fontconfig/fontconfig-devel/r1230.html -share/doc/fontconfig/fontconfig-devel/r1255.html -share/doc/fontconfig/fontconfig-devel/r1280.html -share/doc/fontconfig/fontconfig-devel/r1305.html -share/doc/fontconfig/fontconfig-devel/r1327.html -share/doc/fontconfig/fontconfig-devel/r1352.html -share/doc/fontconfig/fontconfig-devel/r1377.html -share/doc/fontconfig/fontconfig-devel/r1402.html +share/doc/fontconfig/fontconfig-devel/r1207.html +share/doc/fontconfig/fontconfig-devel/r1232.html +share/doc/fontconfig/fontconfig-devel/r1257.html +share/doc/fontconfig/fontconfig-devel/r1282.html +share/doc/fontconfig/fontconfig-devel/r1307.html +share/doc/fontconfig/fontconfig-devel/r1329.html +share/doc/fontconfig/fontconfig-devel/r1354.html +share/doc/fontconfig/fontconfig-devel/r1379.html +share/doc/fontconfig/fontconfig-devel/r1404.html share/doc/fontconfig/fontconfig-devel/r141.html -share/doc/fontconfig/fontconfig-devel/r1429.html -share/doc/fontconfig/fontconfig-devel/r1460.html -share/doc/fontconfig/fontconfig-devel/r1483.html -share/doc/fontconfig/fontconfig-devel/r1506.html -share/doc/fontconfig/fontconfig-devel/r1532.html -share/doc/fontconfig/fontconfig-devel/r1561.html -share/doc/fontconfig/fontconfig-devel/r1591.html +share/doc/fontconfig/fontconfig-devel/r1431.html +share/doc/fontconfig/fontconfig-devel/r1462.html +share/doc/fontconfig/fontconfig-devel/r1485.html +share/doc/fontconfig/fontconfig-devel/r1508.html +share/doc/fontconfig/fontconfig-devel/r1534.html +share/doc/fontconfig/fontconfig-devel/r1563.html +share/doc/fontconfig/fontconfig-devel/r1593.html share/doc/fontconfig/fontconfig-devel/r162.html -share/doc/fontconfig/fontconfig-devel/r1621.html -share/doc/fontconfig/fontconfig-devel/r1654.html -share/doc/fontconfig/fontconfig-devel/r1675.html -share/doc/fontconfig/fontconfig-devel/r1696.html -share/doc/fontconfig/fontconfig-devel/r1718.html -share/doc/fontconfig/fontconfig-devel/r1739.html -share/doc/fontconfig/fontconfig-devel/r1761.html -share/doc/fontconfig/fontconfig-devel/r1782.html -share/doc/fontconfig/fontconfig-devel/r1804.html -share/doc/fontconfig/fontconfig-devel/r1826.html +share/doc/fontconfig/fontconfig-devel/r1623.html +share/doc/fontconfig/fontconfig-devel/r1656.html +share/doc/fontconfig/fontconfig-devel/r1677.html +share/doc/fontconfig/fontconfig-devel/r1698.html +share/doc/fontconfig/fontconfig-devel/r1720.html +share/doc/fontconfig/fontconfig-devel/r1741.html +share/doc/fontconfig/fontconfig-devel/r1763.html +share/doc/fontconfig/fontconfig-devel/r1784.html +share/doc/fontconfig/fontconfig-devel/r1806.html +share/doc/fontconfig/fontconfig-devel/r1828.html share/doc/fontconfig/fontconfig-devel/r183.html -share/doc/fontconfig/fontconfig-devel/r1848.html -share/doc/fontconfig/fontconfig-devel/r1869.html -share/doc/fontconfig/fontconfig-devel/r1893.html -share/doc/fontconfig/fontconfig-devel/r1914.html -share/doc/fontconfig/fontconfig-devel/r1936.html -share/doc/fontconfig/fontconfig-devel/r1959.html -share/doc/fontconfig/fontconfig-devel/r1982.html -share/doc/fontconfig/fontconfig-devel/r2005.html -share/doc/fontconfig/fontconfig-devel/r2026.html +share/doc/fontconfig/fontconfig-devel/r1850.html +share/doc/fontconfig/fontconfig-devel/r1871.html +share/doc/fontconfig/fontconfig-devel/r1895.html +share/doc/fontconfig/fontconfig-devel/r1916.html +share/doc/fontconfig/fontconfig-devel/r1938.html +share/doc/fontconfig/fontconfig-devel/r1961.html +share/doc/fontconfig/fontconfig-devel/r1984.html +share/doc/fontconfig/fontconfig-devel/r2007.html +share/doc/fontconfig/fontconfig-devel/r2028.html share/doc/fontconfig/fontconfig-devel/r204.html -share/doc/fontconfig/fontconfig-devel/r2055.html -share/doc/fontconfig/fontconfig-devel/r2080.html -share/doc/fontconfig/fontconfig-devel/r2108.html -share/doc/fontconfig/fontconfig-devel/r2145.html -share/doc/fontconfig/fontconfig-devel/r2176.html -share/doc/fontconfig/fontconfig-devel/r2203.html -share/doc/fontconfig/fontconfig-devel/r2227.html +share/doc/fontconfig/fontconfig-devel/r2057.html +share/doc/fontconfig/fontconfig-devel/r2082.html +share/doc/fontconfig/fontconfig-devel/r2110.html +share/doc/fontconfig/fontconfig-devel/r2147.html +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/r2253.html -share/doc/fontconfig/fontconfig-devel/r2277.html -share/doc/fontconfig/fontconfig-devel/r2301.html -share/doc/fontconfig/fontconfig-devel/r2326.html -share/doc/fontconfig/fontconfig-devel/r2350.html -share/doc/fontconfig/fontconfig-devel/r2374.html -share/doc/fontconfig/fontconfig-devel/r2396.html -share/doc/fontconfig/fontconfig-devel/r2424.html -share/doc/fontconfig/fontconfig-devel/r2445.html -share/doc/fontconfig/fontconfig-devel/r2466.html -share/doc/fontconfig/fontconfig-devel/r2489.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/r249.html -share/doc/fontconfig/fontconfig-devel/r2515.html -share/doc/fontconfig/fontconfig-devel/r2537.html -share/doc/fontconfig/fontconfig-devel/r2559.html -share/doc/fontconfig/fontconfig-devel/r2581.html -share/doc/fontconfig/fontconfig-devel/r2603.html -share/doc/fontconfig/fontconfig-devel/r2625.html -share/doc/fontconfig/fontconfig-devel/r2646.html -share/doc/fontconfig/fontconfig-devel/r2667.html -share/doc/fontconfig/fontconfig-devel/r2692.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/r270.html -share/doc/fontconfig/fontconfig-devel/r2728.html -share/doc/fontconfig/fontconfig-devel/r2763.html -share/doc/fontconfig/fontconfig-devel/r2791.html -share/doc/fontconfig/fontconfig-devel/r2816.html -share/doc/fontconfig/fontconfig-devel/r2837.html -share/doc/fontconfig/fontconfig-devel/r2862.html -share/doc/fontconfig/fontconfig-devel/r2887.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/r291.html -share/doc/fontconfig/fontconfig-devel/r2912.html -share/doc/fontconfig/fontconfig-devel/r2938.html -share/doc/fontconfig/fontconfig-devel/r2960.html -share/doc/fontconfig/fontconfig-devel/r2982.html -share/doc/fontconfig/fontconfig-devel/r3004.html -share/doc/fontconfig/fontconfig-devel/r3029.html -share/doc/fontconfig/fontconfig-devel/r3058.html -share/doc/fontconfig/fontconfig-devel/r3083.html -share/doc/fontconfig/fontconfig-devel/r3115.html -share/doc/fontconfig/fontconfig-devel/r3148.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/r316.html -share/doc/fontconfig/fontconfig-devel/r3184.html -share/doc/fontconfig/fontconfig-devel/r3207.html -share/doc/fontconfig/fontconfig-devel/r3230.html -share/doc/fontconfig/fontconfig-devel/r3255.html -share/doc/fontconfig/fontconfig-devel/r3277.html +share/doc/fontconfig/fontconfig-devel/r3186.html +share/doc/fontconfig/fontconfig-devel/r3209.html +share/doc/fontconfig/fontconfig-devel/r3231.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/r344.html share/doc/fontconfig/fontconfig-devel/r365.html share/doc/fontconfig/fontconfig-devel/r393.html share/doc/fontconfig/fontconfig-devel/r422.html share/doc/fontconfig/fontconfig-devel/r497.html -share/doc/fontconfig/fontconfig-devel/r525.html -share/doc/fontconfig/fontconfig-devel/r612.html -share/doc/fontconfig/fontconfig-devel/r653.html -share/doc/fontconfig/fontconfig-devel/r676.html -share/doc/fontconfig/fontconfig-devel/r701.html -share/doc/fontconfig/fontconfig-devel/r722.html -share/doc/fontconfig/fontconfig-devel/r750.html -share/doc/fontconfig/fontconfig-devel/r772.html -share/doc/fontconfig/fontconfig-devel/r796.html -share/doc/fontconfig/fontconfig-devel/r817.html -share/doc/fontconfig/fontconfig-devel/r838.html -share/doc/fontconfig/fontconfig-devel/r864.html -share/doc/fontconfig/fontconfig-devel/r885.html -share/doc/fontconfig/fontconfig-devel/r908.html -share/doc/fontconfig/fontconfig-devel/r929.html -share/doc/fontconfig/fontconfig-devel/r963.html -share/doc/fontconfig/fontconfig-devel/r986.html +share/doc/fontconfig/fontconfig-devel/r527.html +share/doc/fontconfig/fontconfig-devel/r614.html +share/doc/fontconfig/fontconfig-devel/r655.html +share/doc/fontconfig/fontconfig-devel/r678.html +share/doc/fontconfig/fontconfig-devel/r703.html +share/doc/fontconfig/fontconfig-devel/r724.html +share/doc/fontconfig/fontconfig-devel/r752.html +share/doc/fontconfig/fontconfig-devel/r774.html +share/doc/fontconfig/fontconfig-devel/r798.html +share/doc/fontconfig/fontconfig-devel/r819.html +share/doc/fontconfig/fontconfig-devel/r840.html +share/doc/fontconfig/fontconfig-devel/r866.html +share/doc/fontconfig/fontconfig-devel/r887.html +share/doc/fontconfig/fontconfig-devel/r910.html +share/doc/fontconfig/fontconfig-devel/r931.html +share/doc/fontconfig/fontconfig-devel/r965.html +share/doc/fontconfig/fontconfig-devel/r988.html share/doc/fontconfig/fontconfig-devel/r99.html share/doc/fontconfig/fontconfig-devel/x19.html share/doc/fontconfig/fontconfig-devel/x31.html 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/fonts.conf share/examples/fontconfig/fonts.dtd -share/examples/fontconfig/local.conf +share/examples/fontconfig/conf.d/no-bitmaps.conf +share/examples/fontconfig/conf.d/sub-pixel.conf +share/examples/fontconfig/conf.d/yes-bitmaps.conf +@dirrm share/examples/fontconfig/conf.d @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 067f1ea803f..118447c98c3 100644 --- a/fonts/fontconfig/distinfo +++ b/fonts/fontconfig/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2005/02/26 16:39:51 wiz Exp $ +$NetBSD: distinfo,v 1.12 2005/03/01 23:38:14 wiz Exp $ -SHA1 (fontconfig-2.2.99.tar.gz) = f0cbc742b3724e2edba22ae18a26f479e18ddb46 -RMD160 (fontconfig-2.2.99.tar.gz) = fdaf8af8d16d1676aea57d41ee1e0c6f14fc502a -Size (fontconfig-2.2.99.tar.gz) = 756924 bytes +SHA1 (fontconfig-2.3.0.tar.gz) = f5ed812fc1ba2ea6ee36da4976d8dd44c361b956 +RMD160 (fontconfig-2.3.0.tar.gz) = 026f55789c0a56ec77322ca587be906c9aa07b1f +Size (fontconfig-2.3.0.tar.gz) = 940705 bytes SHA1 (patch-aa) = 45cc9535d2ca35de6ed9f651776d6d2731867bba SHA1 (patch-ab) = 5609c3b19c8ef5b57d7ba932b91da09b9e47b3a3 +SHA1 (patch-ac) = e8435f0287eecce1a5d665b862c393dd3ba2500a diff --git a/fonts/fontconfig/patches/patch-ac b/fonts/fontconfig/patches/patch-ac new file mode 100644 index 00000000000..68faab0bccd --- /dev/null +++ b/fonts/fontconfig/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.5 2005/03/01 23:38:27 wiz Exp $ + +--- conf.d/Makefile.in.orig 2005-03-01 21:48:52.000000000 +0100 ++++ conf.d/Makefile.in +@@ -195,7 +195,7 @@ prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-sysconfdir = @sysconfdir@ ++sysconfdir = $(prefix)/share/examples/fontconfig + target_alias = @target_alias@ + + CONF_FILES = \ +@@ -207,7 +207,7 @@ CONF_FILES = \ + EXTRA_DIST = $(CONF_FILES) + + configdir = $(CONFDIR) +-confddir = $(configdir)/conf.d ++confddir = $(sysconfdir)/conf.d + + confd_DATA = $(CONF_FILES) + subdir = conf.d -- cgit v1.2.3