[Lunar-commits] <moonbase> Revert "xorg-server: fix font dir properly"

[Zbigniew Luszpinski]

commit fd972a60f2d9d6e9b4631d5a81170405471c6baa
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Sep 20 01:49:54 2010 +0000

    Revert "xorg-server: fix font dir properly"
    
    This reverts commit 49eab8cf146350ad8d4ba83146d218b869e993cc.
    
    commit 49eab8cf146350ad8d4ba83146d218b869e993cc
    Author: Paul Bredbury <brebs at sent.com>
    Date:   Sun Sep 19 09:58:33 2010 +0200
    
    > xorg-server: fix font dir properly
    > Fonts are in dirs under /usr/share/fonts, not /usr/share/fonts/X11
    
    This is not true. X11 fonts are inside /usr/share/fonts/X11 not /usr/share/fonts
    You broke what I have just fixed.
    
    > As done in http://www.gentoo-portage.com/x11-base/xorg-server
    > And http://repos.archlinux.org/wsvn/packages/xorg-server/trunk/PKGBUILD
    
    Instead of reading docs from other distros start listening to what live Lunar says after compiling
    xorg-server with your patch - see /var/log/Xorg.0.log
    [ 15076.549] (WW) The directory "/usr/share/fonts/misc/" does not exist.
    [ 15076.549] 	Entry deleted from font path.
    [ 15076.549] (WW) The directory "/usr/share/fonts/TTF/" does not exist.
    [ 15076.549] 	Entry deleted from font path.
    [ 15076.549] (WW) The directory "/usr/share/fonts/OTF/" does not exist.
    [ 15076.549] 	Entry deleted from font path.
    [ 15076.549] (WW) The directory "/usr/share/fonts/Type1/" does not exist.
    [ 15076.549] 	Entry deleted from font path.
    [ 15076.549] (WW) The directory "/usr/share/fonts/100dpi/" does not exist.
    [ 15076.549] 	Entry deleted from font path.
    [ 15076.549] (WW) The directory "/usr/share/fonts/75dpi/" does not exist.
    [ 15076.549] 	Entry deleted from font path.
    
    Next time please verify in real life what your patch really do before commit.
---
 xorg7/xorg-server/BUILD |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 9de5fe1..50676e7 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -14,7 +14,7 @@
 
   OPTS+=" --enable-composite --enable-aiglx --disable-devel-docs \
           --enable-install-libxf86config --enable-unix-transport \
-          --with-fontrootdir=/usr/share/fonts \
+          --with-fontrootdir=/usr/share/fonts/X11  \
           --with-dri-driver-path=${MODULE_PREFIX}/lib/dri "  &&
          #--with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \