forked from pool/xorg-x11-server
Stefan Dirsch
163ab5ceab
* added /usr/share/fonts/{misc/sgi,truetype} to core font
rendering default path; always use ":unscaled" for bitmap
font paths (bnc #616400)
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=266
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -505,11 +505,15 @@
|
|
XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)
|
|
XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
|
|
XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
|
|
+XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW)
|
|
+XORG_FONTSUBDIR(FONTCYRILLICDIR, fontcyrillicdir, cyrillic)
|
|
+XORG_FONTSUBDIR(FONTSGIDIR, fontsgidir, misc/sgi)
|
|
+XORG_FONTSUBDIR(FONTTRUETYPEDIR, fonttruetypedir, truetype)
|
|
|
|
dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
|
|
dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
|
|
dnl compiling, assume default font path uses standard FONTROOTDIR directories.
|
|
-DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
|
|
+DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}:unscaled,${FONT75DPIDIR}:unscaled,${FONTURWDIR}/,${FONTCYRILLICDIR}:unscaled,${FONTSGIDIR}:unscaled,${FONTTRUETYPEDIR}/"
|
|
if test "$cross_compiling" != yes; then
|
|
AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
|
|
[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
|