kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure that we perform builtin detection for "fontconfig" and

Browse source 
"Xrender" first. This avoids using the builtin "Xft2" if the builtin
"fontconfig" is reject.

This fixes another regression caused by the "pango" upgrade and the fix
for PKG pkg/47882.
This commit is contained in:
tron 2013-06-05 07:15:08 +00:00
parent 5a8fb24367
commit 2f7c0d3d97
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fonts/Xft2/builtin.mk
View file

@ -1,4 +1,11 @@
# $NetBSD: builtin.mk,v 1.18 2012/03/19 12:34:12 joerg Exp $
# $NetBSD: builtin.mk,v 1.19 2013/06/05 07:15:08 tron Exp $
.if !defined(USE_BUILTIN.fontconfig)
.include "../../fonts/fontconfig/builtin.mk"
.endif
.if !defined(USE_BUILTIN.Xrender)
.include "../../x11/Xrender/builtin.mk"
.endif
BUILTIN_PKG:= Xft2
@ -51,10 +58,10 @@ MAKEVARS+= BUILTIN_PKG.Xft2
# versions of any of these, then also use the pkgsrc version of
# Xft2.
#
.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
.if !empty(USE_BUILTIN.Xrender:M[nN][oO])
USE_BUILTIN.Xft2= no
.endif
.if defined(USE_BUILTIN.fontconfig) && !empty(USE_BUILTIN.fontconfig:M[nN][oO])
.if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
USE_BUILTIN.Xft2= no
.endif