Attachment 193081 Details for Bug 225164 – Add USES=gperf to fix fontconfig 2.12.6 build in poudriere

[patch] Add USES=gperf to fix fontconfig 2.12.6 build in poudriere

fontconfig.patch (text/plain), 4.00 KB, created by Ting-Wei Lan on 2018-05-06 07:49:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ting-Wei Lan

Created: 2018-05-06 07:49:39 UTC

Size: 4.00 KB

patch

obsolete

>Index: /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/Makefile
>===================================================================
>--- /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/Makefile	(revision 469180)
>+++ /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/Makefile	(working copy)
>@@ -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 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		tar:bzip2
>+USES=		gperf tar:bzip2
> 
> .if !defined(REFERENCE_PORT)
> 
>Index: /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/distinfo
>===================================================================
>--- /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/distinfo	(revision 469180)
>+++ /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/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: /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/files/patch-src_fclang.c
>===================================================================
>--- /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/files/patch-src_fclang.c	(revision 469180)
>+++ /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/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: /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/pkg-plist
>===================================================================
>--- /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/pkg-plist	(revision 469180)
>+++ /usr/local/poudriere/ports/desktop/x11-fonts/fontconfig/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,12 +44,13 @@
> 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 @@
> 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