r352 - x86/branches/6.1/packages/Xorg

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Jul 16 19:58:51 PDT 2005


Author: alexander
Date: 2005-07-16 20:58:51 -0600 (Sat, 16 Jul 2005)
New Revision: 352

Modified:
   x86/branches/6.1/packages/Xorg/Makefile
Log:
Made Xorg locale names compatible with the ones listed on the boot help screen.
The fix is probably incomplete.


Modified: x86/branches/6.1/packages/Xorg/Makefile
===================================================================
--- x86/branches/6.1/packages/Xorg/Makefile	2005-07-16 15:37:32 UTC (rev 351)
+++ x86/branches/6.1/packages/Xorg/Makefile	2005-07-17 02:58:51 UTC (rev 352)
@@ -6,11 +6,12 @@
 DIR= xc
 FILE= X11R$(VRS)-src.tar.bz2
 PATCH= xorg-6.8.1-luit_race-1.patch
+PATCH2= xorg-6.8.2-locale_names-1.patch
 URL= http://xorg.freedesktop.org/X11R$(VRS)/src-single/$(FILE)
 URL1= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH)
+URL2= http://www.linuxfromscratch.org/~alexander/$(PATCH2)
 
 
-
 #RULES
 
 .PHONY: clean chroot stage2
@@ -24,8 +25,10 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
+	@if [ ! -f $(PATCH2) ] ; then $(WGET) $(URL2) ; fi
 	@if [ ! -d /usr/include/X11 ] ; then unpack $(FILE) && cd $(DIR) && \
 	 patch -Np1 -i ../$(PATCH) && \
+	 patch -Np1 -i ../$(PATCH2) && \
 	 sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile && \
 	 pushd config/util && \
 	 make -f Makefile.ini lndir && \




More information about the livecd mailing list