1
0
xorg-x11-server/truetype_fontpath.diff

22 lines
1.3 KiB
Diff
Raw Normal View History

--- configure.ac.orig 2009-06-19 19:33:07.000000000 +0000
+++ configure.ac 2009-06-19 19:34:00.000000000 +0000
@@ -466,7 +466,7 @@
AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
[ FONTDIR="$withval" ],
[ FONTDIR="${libdir}/X11/fonts" ])
-DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
case $host_os in
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
esac
--- hw/xfree86/Makefile.am.orig 2009-06-19 19:31:52.000000000 +0000
+++ hw/xfree86/Makefile.am 2009-06-19 19:32:53.000000000 +0000
@@ -99,6 +99,7 @@
-DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \
-DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \
-DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \
+ -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/truetype\"" \
-DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \
-DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"