Move fontpath from /usr/local/lib/X11/fonts to /usr/local/share/fonts to match

XDG_DATA_DIR (where Desktop tools will look for by default).

discussed with sthen@ and matthieu@
ok sthen@
This commit is contained in:
ajacoutot 2015-03-31 09:44:48 +00:00
parent ef90cabab4
commit 0bad5217f7
25 changed files with 103 additions and 120 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2015/01/21 06:13:46 bentley Exp $
# $OpenBSD: Makefile,v 1.29 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT= big5/gb enhanced truetype font manager
DISTNAME= ttfm-0.9.5
PKGNAME= zh-${DISTNAME}
REVISION= 2
REVISION= 3
CATEGORIES= chinese
# BSD/X11

View File

@ -1,19 +1,15 @@
$OpenBSD: patch-modules_xttfm_ttfm,v 1.3 2013/03/11 20:59:05 sthen Exp $
--- modules/xttfm.ttfm.orig Mon Nov 3 23:08:32 2003
+++ modules/xttfm.ttfm Mon Mar 11 20:42:44 2013
@@ -28,9 +28,9 @@ export VERSION; VERSION=0.9.3
$OpenBSD: patch-modules_xttfm_ttfm,v 1.4 2015/03/31 09:44:48 ajacoutot Exp $
--- modules/xttfm.ttfm.orig Tue Nov 4 00:08:32 2003
+++ modules/xttfm.ttfm Mon Mar 30 16:36:08 2015
@@ -28,7 +28,7 @@ export VERSION; VERSION=0.9.3
export PREFIX; PREFIX=/usr/local
export X11BASE; X11BASE=/usr/X11R6
export PATH; PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PREFIX/bin:$PREFIX/sbin:$X11BASE/bin
-export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXX`"
-export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType
-export XTTFFONTPATH; XTTFFONTPATH="${X11BASE}/lib/X11/fonts/TrueType"
+export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmpXXXXXXXXXX`"
+export DefaultFontPath; DefaultFontPath=$PREFIX/lib/X11/fonts/TrueType
+export XTTFFONTPATH; XTTFFONTPATH="${PREFIX}/lib/X11/fonts/TrueType"
+export TEMPFILE; TEMPFILE="`mktemp /tmp/ttfm.tmp.XXXXXXXXXX`"
export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType
export XTTFFONTPATH; XTTFFONTPATH="${X11BASE}/lib/X11/fonts/TrueType"
export TTFINFOPATH; TTFINFOPATH="${PREFIX}/bin/ttfinfo"
export AlIASPATTERN; ALIASPATTERN="\"added by ttfm - \$targetname - \$fontencoding\""
export DEFAULTMING_NAME; DEFAULTMING_NAME="default_ming"
@@ -108,11 +108,6 @@ remove_fonts()
sed -e "/$ALIASPATTERN/d" $XTTFFONTPATH/fonts.alias > $TEMPFILE
mv -f $TEMPFILE $XTTFFONTPATH/fonts.alias

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ttfm_sh,v 1.1 2011/07/08 09:41:46 jasper Exp $
--- ttfm.sh.orig Wed Jan 31 10:34:46 2001
+++ ttfm.sh Fri Jul 8 11:36:15 2011
@@ -40,7 +40,7 @@ VERSION=0.9.3
export PREFIX; PREFIX=/usr/local
export PATH; PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PREFIX/bin:$PREFIX/sbin
-export DefaultFontPath; DefaultFontPath=$PREFIX/share/fonts/TrueType
+export DefaultFontPath; DefaultFontPath=$PREFIX/lib/X11/fonts/TrueType
export ScriptDir; ScriptDir=$PREFIX/share/ttfm
export ScriptSubfix; ScriptSubfix="ttfm"
#KEEP_FONT="yes" # FreeBSD's port/package system will handle this.

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2013/03/11 01:30:27 espie Exp $
# $OpenBSD: Makefile,v 1.13 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT= IBM 3270 terminal emulator for the X Window System
DISTNAME= x3270-3.3.6
REVISION= 3
REVISION= 4
CATEGORIES= comms
HOMEPAGE= http://x3270.bgp.nu/
@ -25,7 +25,7 @@ USE_GROFF = Yes
CONFIGURE_STYLE= gnu
NO_TEST= Yes
CONFIGURE_ARGS= --with-fontdir=${PREFIX}/lib/X11/fonts/x3270 \
CONFIGURE_ARGS= --with-fontdir=${PREFIX}/share/fonts/x3270 \
--with-x
WRKDIST= ${WRKDIR}/x3270-3.3

View File

@ -1,42 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2007/11/28 21:18:08 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/03/31 09:44:48 ajacoutot Exp $
@comment bin/pr3287
bin/x3270
@bin bin/x3270
@comment bin/x3270if
lib/X11/fonts/
@fontdir lib/X11/fonts/x3270/
lib/X11/fonts/x3270/3270-12.pcf.gz
lib/X11/fonts/x3270/3270-12b.pcf.gz
lib/X11/fonts/x3270/3270-20.pcf.gz
lib/X11/fonts/x3270/3270-20b.pcf.gz
lib/X11/fonts/x3270/3270.pcf.gz
lib/X11/fonts/x3270/3270b.pcf.gz
lib/X11/fonts/x3270/3270e-12.pcf.gz
lib/X11/fonts/x3270/3270e-12b.pcf.gz
lib/X11/fonts/x3270/3270e-20.pcf.gz
lib/X11/fonts/x3270/3270e-20b.pcf.gz
lib/X11/fonts/x3270/3270e.pcf.gz
lib/X11/fonts/x3270/3270eb.pcf.gz
lib/X11/fonts/x3270/3270egt12.pcf.gz
lib/X11/fonts/x3270/3270egt12b.pcf.gz
lib/X11/fonts/x3270/3270egt16.pcf.gz
lib/X11/fonts/x3270/3270egt16b.pcf.gz
lib/X11/fonts/x3270/3270egt24.pcf.gz
lib/X11/fonts/x3270/3270egt24b.pcf.gz
lib/X11/fonts/x3270/3270egt32.pcf.gz
lib/X11/fonts/x3270/3270egt32b.pcf.gz
lib/X11/fonts/x3270/3270egt8.pcf.gz
lib/X11/fonts/x3270/3270gr.pcf.gz
lib/X11/fonts/x3270/3270gt12.pcf.gz
lib/X11/fonts/x3270/3270gt12b.pcf.gz
lib/X11/fonts/x3270/3270gt16.pcf.gz
lib/X11/fonts/x3270/3270gt16b.pcf.gz
lib/X11/fonts/x3270/3270gt24.pcf.gz
lib/X11/fonts/x3270/3270gt24b.pcf.gz
lib/X11/fonts/x3270/3270gt32.pcf.gz
lib/X11/fonts/x3270/3270gt32b.pcf.gz
lib/X11/fonts/x3270/3270gt8.pcf.gz
lib/X11/fonts/x3270/3270h.pcf.gz
@comment lib/X11/fonts/x3270/fonts.dir
@man man/man1/pr3287.1
@man man/man1/x3270-script.1
@man man/man1/x3270.1
@ -46,3 +11,38 @@ share/examples/x3270/
@sample ${SYSCONFDIR}/x3270/
share/examples/x3270/ibm_hosts
@sample ${SYSCONFDIR}/x3270/ibm_hosts
share/fonts/
@fontdir share/fonts/x3270/
share/fonts/x3270/3270-12.pcf.gz
share/fonts/x3270/3270-12b.pcf.gz
share/fonts/x3270/3270-20.pcf.gz
share/fonts/x3270/3270-20b.pcf.gz
share/fonts/x3270/3270.pcf.gz
share/fonts/x3270/3270b.pcf.gz
share/fonts/x3270/3270e-12.pcf.gz
share/fonts/x3270/3270e-12b.pcf.gz
share/fonts/x3270/3270e-20.pcf.gz
share/fonts/x3270/3270e-20b.pcf.gz
share/fonts/x3270/3270e.pcf.gz
share/fonts/x3270/3270eb.pcf.gz
share/fonts/x3270/3270egt12.pcf.gz
share/fonts/x3270/3270egt12b.pcf.gz
share/fonts/x3270/3270egt16.pcf.gz
share/fonts/x3270/3270egt16b.pcf.gz
share/fonts/x3270/3270egt24.pcf.gz
share/fonts/x3270/3270egt24b.pcf.gz
share/fonts/x3270/3270egt32.pcf.gz
share/fonts/x3270/3270egt32b.pcf.gz
share/fonts/x3270/3270egt8.pcf.gz
share/fonts/x3270/3270gr.pcf.gz
share/fonts/x3270/3270gt12.pcf.gz
share/fonts/x3270/3270gt12b.pcf.gz
share/fonts/x3270/3270gt16.pcf.gz
share/fonts/x3270/3270gt16b.pcf.gz
share/fonts/x3270/3270gt24.pcf.gz
share/fonts/x3270/3270gt24b.pcf.gz
share/fonts/x3270/3270gt32.pcf.gz
share/fonts/x3270/3270gt32b.pcf.gz
share/fonts/x3270/3270gt8.pcf.gz
share/fonts/x3270/3270h.pcf.gz
@comment share/fonts/x3270/fonts.dir

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2013/10/11 20:36:17 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2015/03/31 09:44:48 ajacoutot Exp $
PKG_ARCH = *
COMMENT = config files for imake
@ -7,7 +7,7 @@ DISTNAME = xorg-cf-files-1.0.4
PKGNAME = imake-cf-1.0.4
MASTER_SITES = http://ftp.x.org/pub/individual/util/
REVISION = 3
REVISION = 4
PERMIT_PACKAGE_CDROM = Yes

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-OpenBSD_cf,v 1.4 2013/10/11 20:36:18 naddy Exp $
$OpenBSD: patch-OpenBSD_cf,v 1.5 2015/03/31 09:44:48 ajacoutot Exp $
--- OpenBSD.cf.orig Fri Oct 16 23:45:42 2009
+++ OpenBSD.cf Thu Oct 10 17:25:16 2013
@@ -26,10 +26,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#define LibDir /usr/local/lib/X11
#define UsrLibDir /usr/local/lib
#define ManDirectoryRoot /usr/local/man
+#define FontDir ${LOCALBASE}/lib/X11/fonts
+#define FontEncDir ${LOCALBASE}/lib/X11/fonts/encodings
+#define FontDir ${LOCALBASE}/share/fonts
+#define FontEncDir ${LOCALBASE}/share/fonts/encodings
#define LdPreLib -L/usr/X11R6/lib -L/usr/local/lib
#define XpmLibDir /usr/X11R6/lib
#define XpmIncDir /usr/X11R6/include

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2014/01/31 13:51:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.25 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT= Linux compatibility package based on Fedora Core ${FEDORA_V}
PKGNAME= fedora_base-${FEDORA_V}.0
REVISION= 4
REVISION= 5
SHARED_LIBS += cap 2.10
SHARED_LIBS += blkid 1.0

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-etc_fonts_fonts_conf,v 1.3 2013/12/04 15:53:33 ajacoutot Exp $
$OpenBSD: patch-etc_fonts_fonts_conf,v 1.4 2015/03/31 09:44:48 ajacoutot Exp $
Sync font directory list with base system.
@ -16,7 +16,7 @@ to make it clear it is used by the Linux compatibility layer.
- <dir>/usr/share/fonts</dir>
- <dir>/usr/share/X11/fonts/Type1</dir> <dir>/usr/share/X11/fonts/TTF</dir> <dir>/usr/local/share/fonts</dir>
+ <dir>/usr/X11R6/lib/X11/fonts</dir>
+ <dir>/usr/local/lib/X11/fonts</dir>
+ <dir>/usr/local/share/fonts</dir>
<dir>~/.fonts</dir>
<!--

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2013/10/11 23:49:35 naddy Exp $
# $OpenBSD: Makefile,v 1.8 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT= scrolling 'Matrix'-like screen
DISTNAME= cmatrix-1.2a
CATEGORIES= games misc
REVISION= 0
HOMEPAGE= http://www.asty.org/cmatrix/
@ -14,7 +15,7 @@ MASTER_SITES= ${HOMEPAGE}/dist/
CONFIGURE_STYLE= gnu
FONTDIR= ${PREFIX}/lib/X11/fonts/misc
FONTDIR= ${PREFIX}/share/fonts/misc
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cmatrix ${PREFIX}/bin/cmatrix

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/12/21 17:27:05 jasper Exp $
bin/cmatrix
lib/X11/fonts/
@fontdir lib/X11/fonts/misc/
lib/X11/fonts/misc/mtx.pcf
@comment $OpenBSD: PLIST,v 1.2 2015/03/31 09:44:48 ajacoutot Exp $
@bin bin/cmatrix
@man man/man6/cmatrix.6
share/fonts/
@fontdir share/fonts/misc/
share/fonts/misc/mtx.pcf

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2013/03/11 11:07:39 espie Exp $
# $OpenBSD: Makefile,v 1.16 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT = common data for the nethack/slash ports
V = 3.4.3
DISTNAME = nethack-$V
PKGNAME = hackdata-$V
CATEGORIES = games
REVISION = 0
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nethack/} \
ftp://ftp.nethack.org/pub/nethack/nh${V:S/.//g}/src/ \
@ -34,9 +35,9 @@ NO_TEST= Yes
do-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nethack
@${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/hack
@${INSTALL_DATA_DIR} ${PREFIX}/share/fonts/hack
${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.pcf.gz ${PREFIX}/lib/X11/fonts/hack
${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.pcf.gz ${PREFIX}/lib/X11/fonts/hack
${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.pcf.gz ${PREFIX}/share/fonts/hack
${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.pcf.gz ${PREFIX}/share/fonts/hack
.include <bsd.port.mk>

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/15 00:46:09 espie Exp $
lib/X11/fonts/
@fontdir lib/X11/fonts/hack/
lib/X11/fonts/hack/ibm.pcf.gz
lib/X11/fonts/hack/nh10.pcf.gz
@comment $OpenBSD: PLIST,v 1.5 2015/03/31 09:44:48 ajacoutot Exp $
share/doc/nethack/
share/doc/nethack/Guidebook.txt
share/fonts/
@fontdir share/fonts/hack/
share/fonts/hack/ibm.pcf.gz
share/fonts/hack/nh10.pcf.gz

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.57 2015/03/27 10:59:00 tobiasu Exp $
# $OpenBSD: Makefile,v 1.58 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT = dungeon explorin', hackin', game. Piece of cake
V = 3.4.3
DISTNAME = nethack-$V
PKGNAME = ${DISTNAME}
REVISION = 7
REVISION = 8
CATEGORIES = games
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nethack/} \

View File

@ -5,9 +5,8 @@ and finish the game ? At least, you're starting with a bonus: a puppy
If you find that game too easy, you may want to try slash instead.
To use nethack with X11 graphics, you will also have to add
${PREFIX}/lib/X11/fonts/hack to your fontpath, see xset(1) and
Xserver(1), also /usr/X11R6/lib/X11/xdm or
/usr/X11R6/lib/X11/xinit for proper configuration.
${PREFIX}/share/fonts/hack to your fontpath, see xset(1) and
Xserver(1).
The tty version with colors uses ANSI colors, unless it finds a suitable
termcap entry, for instance xterm-color.

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2015/03/27 11:04:28 tobiasu Exp $
# $OpenBSD: Makefile,v 1.27 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT = dungeon explorin', hackin', game. Hard
DISTNAME = se007e7f1
PKGNAME = slash-em-3.4.3.7e7f1
REVISION = 4
REVISION = 5
V = 3.4.3.7e7f1
CATEGORIES = games

View File

@ -6,8 +6,7 @@ This is a sequel to nethack: more classes, more objects, bigger dungeon,
more difficult.
- in order to use slash with'em X11 graphics, you will have to add
${PREFIX}/lib/X11/fonts/hack to your fontpath, see xset(1) and Xserver(1), also
/usr/X11R6/lib/X11/xdm or /usr/X11R6/lib/X11/xinit for proper configuration.
${PREFIX}/share/fonts/hack to your fontpath, see xset(1) and Xserver(1).
- the tty with colors mode expects a black background and white foreground to
run properly, e.g., xterm -fg white -bg black

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.45 2015/03/27 11:11:01 tobiasu Exp $
# $OpenBSD: Makefile,v 1.46 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT = dungeon explorin', hackin' game, but harder than nethack
DISTNAME = slash-e8
PKGNAME = slash-3.2.2.e8
REVISION = 3
REVISION = 4
CATEGORIES = games
MASTER_SITES = ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \

View File

@ -6,8 +6,7 @@ This is a sequel to nethack: more classes, more objects, bigger dungeon,
more difficult.
- in order to use slash with X11 graphics, you will have to add
${PREFIX}/lib/X11/fonts/hack to your fontpath, see xset(1) and Xserver(1), also
/usr/X11R6/lib/X11/xdm or /usr/X11R6/lib/X11/xinit for proper configuration.
${PREFIX}/share/fonts/hack to your fontpath, see xset(1) and Xserver(1).
- the tty with colors mode expects a black background and white foreground to
run properly, e.g., xterm -fg white -bg black

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.124 2015/03/26 12:14:15 sthen Exp $
# $OpenBSD: Makefile,v 1.125 2015/03/31 09:44:48 ajacoutot Exp $
SHARED_ONLY= Yes
@ -20,7 +20,7 @@ PKGNAME-hpcups= hpcups-${V}
PKGNAME-hpijs= hpijs-${V}
PKGNAME-gui= hplip-gui-${V}
REVISION-main= 2
REVISION-main= 3
REVISION-common= 1
REVISION-gui= 0
REVISION-hpaio= 0

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-fax_coverpages_py,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
$OpenBSD: patch-fax_coverpages_py,v 1.2 2015/03/31 09:44:48 ajacoutot Exp $
--- fax/coverpages.py.orig Thu Jul 2 17:30:02 2009
+++ fax/coverpages.py Thu Jul 2 17:31:08 2009
@@ -73,7 +73,7 @@ def createStandardCoverPage(page_size=PAGE_SIZE_LETTER
@ -6,7 +6,7 @@ $OpenBSD: patch-fax_coverpages_py,v 1.1 2009/07/13 08:14:28 ajacoutot Exp $
#print prop.locale
- #TTFSearchPath.append('/usr/share/fonts/truetype/arphic')
+ #TTFSearchPath.append('${LOCALBASE}/lib/X11/fonts/truetype/arphic')
+ #TTFSearchPath.append('${LOCALBASE}/share/fonts/truetype/arphic')
#pdfmetrics.registerFont(TTFont('UMing', 'uming.ttf'))
ps = ParagraphStyle(name="title",

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2013/03/11 11:42:40 espie Exp $
# $OpenBSD: Makefile,v 1.14 2015/03/31 09:44:48 ajacoutot Exp $
COMMENT= boustrophedon text reader
DISTNAME= boust-0.161
REVISION = 2
REVISION = 3
CATEGORIES= textproc
HOMEPAGE= http://traevoli.com/boust/
@ -19,7 +19,7 @@ NO_TEST= Yes
PKG_ARCH= *
SUBST_VARS= FONTDIR PKGNAME
FONTS= 10x20bw.pcf.gz 10x20fw.pcf.gz 10x20ud.pcf.gz
FONTDIR= ${PREFIX}/lib/X11/fonts/boust
FONTDIR= ${PREFIX}/share/fonts/boust
do-configure:
@${SUBST_CMD} ${WRKSRC}/boust

View File

@ -1,11 +1,11 @@
@comment $OpenBSD: PLIST,v 1.4 2013/02/01 17:07:41 stu Exp $
@comment $OpenBSD: PLIST,v 1.5 2015/03/31 09:44:48 ajacoutot Exp $
bin/boust
lib/X11/fonts/
@fontdir lib/X11/fonts/boust/
lib/X11/fonts/boust/10x20bw.pcf.gz
lib/X11/fonts/boust/10x20fw.pcf.gz
lib/X11/fonts/boust/10x20ud.pcf.gz
@man man/man1/boust.1
share/doc/boust/
share/doc/boust/README
share/doc/pkg-readmes/${FULLPKGNAME}
share/fonts/
@fontdir share/fonts/boust/
share/fonts/boust/10x20bw.pcf.gz
share/fonts/boust/10x20fw.pcf.gz
share/fonts/boust/10x20ud.pcf.gz

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.206 2015/03/27 08:15:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.207 2015/03/31 09:44:48 ajacoutot Exp $
ONLY_FOR_ARCHS= i386 amd64
DPB_PROPERTIES= parallel
@ -7,7 +7,7 @@ COMMENT= Chromium browser
V= 41.0.2272.101
DISTNAME= chromium-${V}
REVISION= 0
REVISION= 1
CATEGORIES= www

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp,v 1.2 2015/03/18 19:26:29 robert Exp $
$OpenBSD: patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp,v 1.3 2015/03/31 09:44:48 ajacoutot Exp $
--- third_party/pdfium/core/src/fxge/ge/fx_ge_linux.cpp.orig.port Tue Mar 10 23:42:04 2015
+++ third_party/pdfium/core/src/fxge/ge/fx_ge_linux.cpp Wed Mar 11 07:22:50 2015
@@ -214,9 +214,9 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(
@ -10,7 +10,7 @@ $OpenBSD: patch-third_party_pdfium_core_src_fxge_ge_fx_ge_linux_cpp,v 1.2 2015/0
- pInfo->AddPath("/usr/local/share/fonts");
+ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1");
+ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF");
+ pInfo->AddPath("/usr/local/lib/X11/fonts");
+ pInfo->AddPath("/usr/local/share/fonts");
}
return pInfo;
}