Date: Wed, 9 May 2018 03:50:46 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469428 - in head/x11-fonts: fontconfig fontconfig-reference fontconfig/files Message-ID: <201805090350.w493okwp059502@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Wed May 9 03:50:45 2018 New Revision: 469428 URL: https://svnweb.freebsd.org/changeset/ports/469428 Log: - Update to 2.12.6 PR: 225164 Submitted by: lightside <lightside@gmx.com> Test and tweaked by: Ting-Wei Lan <lantw44@gmail.com> Approved by: kwm (gnome@, maintainer) Modified: head/x11-fonts/fontconfig-reference/pkg-plist head/x11-fonts/fontconfig/Makefile head/x11-fonts/fontconfig/distinfo head/x11-fonts/fontconfig/files/patch-src_fclang.c head/x11-fonts/fontconfig/pkg-plist Modified: head/x11-fonts/fontconfig-reference/pkg-plist ============================================================================== --- head/x11-fonts/fontconfig-reference/pkg-plist Wed May 9 03:44:11 2018 (r469427) +++ head/x11-fonts/fontconfig-reference/pkg-plist Wed May 9 03:50:45 2018 (r469428) @@ -55,6 +55,7 @@ man/man3/FcConfigGetRescanInterval.3.gz man/man3/FcConfigGetSysRoot.3.gz man/man3/FcConfigHome.3.gz man/man3/FcConfigParseAndLoad.3.gz +man/man3/FcConfigParseAndLoadFromMemory.3.gz man/man3/FcConfigReference.3.gz man/man3/FcConfigSetCurrent.3.gz man/man3/FcConfigSetRescanInterval.3.gz @@ -152,6 +153,7 @@ man/man3/FcPatternFilter.3.gz man/man3/FcPatternFormat.3.gz man/man3/FcPatternGet-Type.3.gz man/man3/FcPatternGet.3.gz +man/man3/FcPatternGetWithBinding.3.gz man/man3/FcPatternHash.3.gz man/man3/FcPatternPrint.3.gz man/man3/FcPatternReference.3.gz Modified: head/x11-fonts/fontconfig/Makefile ============================================================================== --- head/x11-fonts/fontconfig/Makefile Wed May 9 03:44:11 2018 (r469427) +++ head/x11-fonts/fontconfig/Makefile Wed May 9 03:50:45 2018 (r469428) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= fontconfig -PORTVERSION= 2.12.1 -PORTREVISION?= 3 +PORTVERSION= 2.12.6 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/ @@ -14,7 +14,7 @@ COMMENT= XML-based font configuration API for X Window LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:bzip2 +USES= gperf tar:bzip2 .if !defined(REFERENCE_PORT) Modified: head/x11-fonts/fontconfig/distinfo ============================================================================== --- head/x11-fonts/fontconfig/distinfo Wed May 9 03:44:11 2018 (r469427) +++ head/x11-fonts/fontconfig/distinfo Wed May 9 03:50:45 2018 (r469428) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470376167 -SHA256 (fontconfig-2.12.1.tar.bz2) = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 -SIZE (fontconfig-2.12.1.tar.bz2) = 1608901 +TIMESTAMP = 1505981313 +SHA256 (fontconfig-2.12.6.tar.bz2) = cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 +SIZE (fontconfig-2.12.6.tar.bz2) = 1624683 Modified: head/x11-fonts/fontconfig/files/patch-src_fclang.c ============================================================================== --- head/x11-fonts/fontconfig/files/patch-src_fclang.c Wed May 9 03:44:11 2018 (r469427) +++ head/x11-fonts/fontconfig/files/patch-src_fclang.c Wed May 9 03:50:45 2018 (r469428) @@ -1,4 +1,4 @@ ---- src/fclang.c.orig 2014-01-20 08:14:20 UTC +--- src/fclang.c.orig 2017-09-21 04:44:27 UTC +++ src/fclang.c @@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang) { @@ -8,7 +8,7 @@ size_t llen, tlen = 0, mlen = 0; if (!lang || !*lang) -@@ -241,26 +242,32 @@ FcLangNormalize (const FcChar8 *lang) +@@ -246,27 +247,33 @@ FcLangNormalize (const FcChar8 *lang) modifier = encoding; } } @@ -39,7 +39,8 @@ + s, lang); goto bail0; } - if (territory && (tlen < 2 || tlen > 3)) + if (territory && (tlen < 2 || tlen > 3) && + !(territory[0] == 'z' && tlen < 5)) { - fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n", - lang); Modified: head/x11-fonts/fontconfig/pkg-plist ============================================================================== --- head/x11-fonts/fontconfig/pkg-plist Wed May 9 03:44:11 2018 (r469427) +++ head/x11-fonts/fontconfig/pkg-plist Wed May 9 03:50:45 2018 (r469428) @@ -24,12 +24,13 @@ etc/fonts/conf.avail/11-lcdfilter-light.conf etc/fonts/conf.avail/20-unhint-small-vera.conf etc/fonts/conf.avail/25-unhint-nonlatin.conf etc/fonts/conf.avail/30-metric-aliases.conf -etc/fonts/conf.avail/30-urw-aliases.conf etc/fonts/conf.avail/40-nonlatin.conf +etc/fonts/conf.avail/45-generic.conf etc/fonts/conf.avail/45-latin.conf etc/fonts/conf.avail/49-sansserif.conf etc/fonts/conf.avail/50-user.conf etc/fonts/conf.avail/51-local.conf +etc/fonts/conf.avail/60-generic.conf etc/fonts/conf.avail/60-latin.conf etc/fonts/conf.avail/65-fonts-persian.conf etc/fonts/conf.avail/65-khmer.conf @@ -43,12 +44,13 @@ etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf etc/fonts/conf.d/10-scale-bitmap-fonts.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf -etc/fonts/conf.d/30-urw-aliases.conf etc/fonts/conf.d/40-nonlatin.conf +etc/fonts/conf.d/45-generic.conf etc/fonts/conf.d/45-latin.conf etc/fonts/conf.d/49-sansserif.conf etc/fonts/conf.d/50-user.conf etc/fonts/conf.d/51-local.conf +etc/fonts/conf.d/60-generic.conf etc/fonts/conf.d/60-latin.conf etc/fonts/conf.d/65-fonts-persian.conf etc/fonts/conf.d/65-nonlatin.conf @@ -65,7 +67,7 @@ include/fontconfig/fontconfig.h lib/libfontconfig.a lib/libfontconfig.so lib/libfontconfig.so.1 -lib/libfontconfig.so.1.9.2 +lib/libfontconfig.so.1.10.1 libdata/pkgconfig/fontconfig.pc man/man1/fc-cache.1.gz man/man1/fc-cat.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805090350.w493okwp059502>