Attachment 191348 Details for Bug 225744 – Proposed patch (since 463966 revision)

[patch] Proposed patch (since 463966 revision)

fontconfig.diff (text/plain), 2.06 KB, created by lightside on 2018-03-09 19:13:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2018-03-09 19:13:47 UTC

Size: 2.06 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 463966)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	fontconfig
> PORTVERSION=	2.12.1
>-PORTREVISION?=	2
>+PORTREVISION?=	3
> 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: 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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 463966)
>+++ pkg-plist	(working copy)
>@@ -53,7 +53,7 @@
> 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

Flags:

lightside: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 225744: 190409 | 191348 | 191367