26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -466,7 +466,7 @@ AC_ARG_WITH(builderstring, AS_HELP_STR
|
|
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
|
|
Index: hw/xfree86/Makefile.am
|
|
===================================================================
|
|
--- hw/xfree86/Makefile.am.orig
|
|
+++ hw/xfree86/Makefile.am
|
|
@@ -103,6 +103,7 @@ CPP_FILES_FLAGS = \
|
|
-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)\"
|