From 5837862ba64bfafa96ff8007aceed581d28fb133 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Sun, 31 Oct 2010 03:07:17 +0000
Subject: [PATCH] Updated to xorg compilation flags

---
 stage4/configure-fonts |  3 +++
 stage4/configure-xorg  |  5 -----
 stage4/stage4-install  | 14 ++++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/stage4/configure-fonts b/stage4/configure-fonts
index 10cc869..eab4954 100755
--- a/stage4/configure-fonts
+++ b/stage4/configure-fonts
@@ -8,6 +8,9 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
+# When all of the fonts have been installed, the system must be configured so
+# that Fontconfig can find the TrueType fonts since they are outside of the
+# default search path of /usr/share/fonts.
 install -v -d -m755 /usr/share/fonts
 ln -svfT ${XORG_PREFIX}/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF
 ln -svfT ${XORG_PREFIX}/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF
diff --git a/stage4/configure-xorg b/stage4/configure-xorg
index d6c69f6..95bc530 100755
--- a/stage4/configure-xorg
+++ b/stage4/configure-xorg
@@ -128,11 +128,6 @@ if [ "x${INST_TYPE}" = "xltsp-server" ]; then
     chmod 444 /etc/X11/xdm/Xaccess
 fi
 
-
-exit 0
-
-
-
 # Many package are still trying to find X in /usr/X11R6.
 # Until then, you can create a symbolic link to satisfy the /usr/X11R6
 # requirement so that you won't be inconvenienced with a package build
diff --git a/stage4/stage4-install b/stage4/stage4-install
index 92ad186..73f2c71 100755
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -70,11 +70,12 @@ install_xorg_modules()
             libX11-[0-9]* )
                 MY_XORG_CONFIG="--without-xcb"
                 ;;
-            xf86-video-s3-[0-9]* | xf86-video-xgi-[0-9]* )
-                #for file in `grep -Rl "xf86Version.h" *`; do
-                #    sed 's@xf86Version.h@xorgVersion.h@g' -i "$file"
-                #done
-                #;;
+            libXt-[0-9]* )
+                MY_XORG_CONFIG="--with-appdefaultdir=/etc/X11/app-defaults"
+                ;;
+            xinit-[0-9]* )
+                MY_XORG_CONFIG="--with-xinitdir=/etc/X11/app-defautls"
+                ;;
         esac
 
         ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS}
@@ -126,7 +127,8 @@ ipkg_ac   ${HAL_INFO}
 ipkg_xorg ${XORG_SERVER} "xserver" "\
     --with-module-dir=${XORG_PREFIX}/lib/X11/modules \
     --with-xkb-output=/var/lib/xkb \
-    --enable-install-setuid"
+    --enable-install-setuid \
+    --disable-config-hal"
 
 # newport, vmware, and xgixp drivers cause Xorg -configure to hang
 # To fix this problem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget.
-- 
2.20.1