r87 - trunk/packages/Xorg

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Apr 16 19:09:48 PDT 2005


Author: jhuntwork
Date: 2005-04-16 20:09:48 -0600 (Sat, 16 Apr 2005)
New Revision: 87

Modified:
   trunk/packages/Xorg/Makefile
Log:
Added patch for Xorg -luit - thanks to Alexander Patrakov

Modified: trunk/packages/Xorg/Makefile
===================================================================
--- trunk/packages/Xorg/Makefile	2005-04-17 01:50:34 UTC (rev 86)
+++ trunk/packages/Xorg/Makefile	2005-04-17 02:09:48 UTC (rev 87)
@@ -5,9 +5,12 @@
 VRS= 6.8.2
 DIR= xc
 FILE= X11R$(VRS)-src.tar.bz2
+PATCH= $(NM)-6.8.1-luit_race-1.patch
 URL= http://xorg.freedesktop.org/X11R$(VRS)/src-single/$(FILE)
+URL1= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH)
 
 
+
 #RULES
 
 .PHONY: clean chroot stage2
@@ -20,7 +23,9 @@
 	@echo "=====> Building $(NM) in chroot"
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
 	@if [ ! -d /usr/include/X11 ] ; then tar xjvf $(FILE) && cd $(DIR) && \
+	 patch -Np1 -i ../$(PATCH) && \
 	 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