Attachment 191354 Details for Bug 225164 – Proposed patch for x11-fonts/fontconfig (since 463966 revision)

[patch] Proposed patch for x11-fonts/fontconfig (since 463966 revision)

fontconfig.diff (text/plain), 4.69 KB, created by lightside on 2018-03-09 20:58:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2018-03-09 20:58:10 UTC

Size: 4.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 463966)
>+++ Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	fontconfig
>-PORTVERSION=	2.12.1
>-PORTREVISION?=	2
>+PORTVERSION=	2.12.6
>+PORTREVISION?=	0
> PORTEPOCH?=	1
> CATEGORIES=	x11-fonts
> MASTER_SITES=	http://www.freedesktop.org/software/fontconfig/release/
>@@ -49,7 +49,12 @@
> PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
> PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=	DOCS NO_BITMAPS
>+OPTIONS_DEFAULT=	HINTING_SLIGHT NO_BITMAPS
>+OPTIONS_SUB=	yes
>+
>+NO_BITMAPS_DESC=	Reject bitmap fonts by default
>+
> OPTIONS_SINGLE=	HINTING
> HINTING_DESC=	Preferred pixel hinting configuration
> .for opt in NONE SLIGHT MEDIUM FULL
>@@ -57,8 +62,12 @@
> HINTING_${opt}_DESC=	${opt:tl}
> HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
> .endfor
>-OPTIONS_DEFAULT=	HINTING_SLIGHT
> 
>+post-patch-NO_BITMAPS-on:
>+	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
>+		'/^CONF_LINKS =/s|$$|\${.newline}	70-no-bitmaps.conf \\|' \
>+		${WRKSRC}/conf.d/Makefile.in
>+
> post-install:
> 	${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \
> 		${STAGEDIR}${PREFIX}/man/man1
>Index: distinfo
>===================================================================
>--- distinfo	(revision 463966)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-conf.d_Makefile.in
>===================================================================
>--- files/patch-conf.d_Makefile.in	(revision 463966)
>+++ files/patch-conf.d_Makefile.in	(nonexistent)
>@@ -1,10 +0,0 @@
>---- conf.d/Makefile.in.orig	2018-03-09 08:02:13 UTC
>-+++ conf.d/Makefile.in
>-@@ -364,6 +364,7 @@ CONF_LINKS = \
>- 	65-fonts-persian.conf \
>- 	65-nonlatin.conf \
>- 	69-unifont.conf \
>-+	70-no-bitmaps.conf \
>- 	80-delicious.conf \
>- 	90-synthetic.conf
>- 
>Index: files/patch-src_fclang.c
>===================================================================
>--- files/patch-src_fclang.c	(revision 463966)
>+++ files/patch-src_fclang.c	(working copy)
>@@ -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);
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 463966)
>+++ pkg-plist	(working copy)
>@@ -24,12 +24,13 @@
> 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,17 +44,18 @@
> 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
> etc/fonts/conf.d/69-unifont.conf
>-etc/fonts/conf.d/70-no-bitmaps.conf
>+%%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf
> etc/fonts/conf.d/80-delicious.conf
> etc/fonts/conf.d/90-synthetic.conf
> etc/fonts/conf.d/README
>@@ -65,7 +67,7 @@
> 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

Actions: View | Diff

Attachments on bug 225164: 189716 | 189717 | 189718 | 191354 | 191368 | 191372 | 193081 | 193091 | 193093