diff options
| author | Thomas Orgis | 2009-12-16 14:44:20 +0100 |
|---|---|---|
| committer | Eric Sandall | 2009-12-19 00:21:16 -0800 |
| commit | e873e91ef985fc7af5b5456e4314c5ecb80ac9c2 (patch) | |
| tree | b911132115b7bf06e4c4dc8e86d727c5b7510df4 | |
| parent | c82644ff8a874b865c1d8c40ff49a729bc09fef7 (diff) | |
xorg-server: Change default font search prefix to /usr/share/fonts/X11 .
(cherry picked from commit d261c35afab267ddb08eceb182edd672b8c873cb)
| -rwxr-xr-x | xorg-xserver/xorg-server/BUILD | 1 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/CONFIGURE | 6 | ||||
| -rwxr-xr-x | xorg-xserver/xorg-server/DETAILS | 1 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 5 |
4 files changed, 13 insertions, 0 deletions
diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD index 1808f36fa5..e49a8d4ae8 100755 --- a/xorg-xserver/xorg-server/BUILD +++ b/xorg-xserver/xorg-server/BUILD @@ -15,6 +15,7 @@ fi && OPTS="${XORG_SERVER_OPTS} \ --with-xkb-output=$TRACK_ROOT/var/lib/xkb \ --with-dri-driver-path=$TRACK_ROOT/usr/lib/dri \ + --with-fontdir=${TRACK_ROOT}/usr/share/fonts/X11 \ --disable-dmx \ --disable-xwin \ --enable-dbe \ diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE index 947116e146..9bbff6d18e 100755 --- a/xorg-xserver/xorg-server/CONFIGURE +++ b/xorg-xserver/xorg-server/CONFIGURE @@ -172,6 +172,12 @@ config_query_option XORG_SERVER_OPTS \ "--enable-registry" \ "--disable-registry" && +message "${MESSAGE_COLOR}Note:" && +message "Default font search prefix is now /usr/share/fonts/X11 ." && +message "You might want to make sure you got no old font installs left in" && +message "/usr/lib/X11/fonts or instead have those paths set in xorg.conf ." && +message "$DEFAULT_COLOR" && + config_query_multi XORG_SERVER_FONT_100DPI \ "Which 100dpi fonts do you want?" \ all \ diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS index 73e41ccce7..98b783b4af 100755 --- a/xorg-xserver/xorg-server/DETAILS +++ b/xorg-xserver/xorg-server/DETAILS @@ -9,6 +9,7 @@ ENTERED=20051125 LICENSE[0]=XCL SECURITY_PATCH=4 + PATCHLEVEL=1 SHORT="X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx)" cat << EOF X servers (including Xorg, Xprt, Xvfb, Xnest & Xdmx), the core of the X diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 706cc0ba66..31a16cc972 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,8 @@ +2009-12-16 Thomas Orgis <sobukus@sourcemage.org> + * BUILD: Changed default font prefix to /usr/share/fonts/X11 . + * CONFIGURE: Added note about font paths. + * DETAILS: patchlevel + 2009-11-26 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: force recordproto if record ext has been selected |