Accepting request 42215 from X11:XOrg

checked in (request 42215)

OBS-URL: https://build.opensuse.org/request/show/42215
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=267
This commit is contained in:
OBS User autobuild 2010-06-29 16:26:49 +00:00 committed by Git OBS Bridge
parent 163ab5ceab
commit 682bb915c2
2 changed files with 2 additions and 12 deletions

View File

@ -1,19 +1,17 @@
--- configure.ac --- configure.ac
+++ configure.ac +++ configure.ac
@@ -505,11 +505,15 @@ @@ -505,11 +505,13 @@
XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1) XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)
XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi) XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi) XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
+XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW) +XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW)
+XORG_FONTSUBDIR(FONTCYRILLICDIR, fontcyrillicdir, cyrillic) +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 Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
dnl compiling, assume default font path uses standard FONTROOTDIR directories. 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}/,${FONT75DPIDIR}/"
+DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}:unscaled,${FONT75DPIDIR}:unscaled,${FONTURWDIR}/,${FONTCYRILLICDIR}:unscaled,${FONTSGIDIR}:unscaled,${FONTTRUETYPEDIR}/" +DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/,${FONTURWDIR}/,${FONTCYRILLICDIR}/"
if test "$cross_compiling" != yes; then if test "$cross_compiling" != yes; then
AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],

View File

@ -1,11 +1,3 @@
-------------------------------------------------------------------
Mon Jun 28 18:09:36 CEST 2010 - sndirsch@suse.de
- missing_font_paths.diff:
* added /usr/share/fonts/{misc/sgi,truetype} to core font
rendering default path; always use ":unscaled" for bitmap
font paths (bnc #616400)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 29 01:04:47 CEST 2010 - sndirsch@suse.de Sat May 29 01:04:47 CEST 2010 - sndirsch@suse.de