r320 - in x86/trunk/packages: fontconfig freetype

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sat Jul 9 18:12:37 PDT 2005


Author: justin
Date: 2005-07-09 19:12:36 -0600 (Sat, 09 Jul 2005)
New Revision: 320

Modified:
   x86/trunk/packages/fontconfig/Makefile
   x86/trunk/packages/freetype/Makefile
Log:
Upgraded fontconfig and freetype, as was used in pre4 cd.

Modified: x86/trunk/packages/fontconfig/Makefile
===================================================================
--- x86/trunk/packages/fontconfig/Makefile	2005-07-10 00:57:36 UTC (rev 319)
+++ x86/trunk/packages/fontconfig/Makefile	2005-07-10 01:12:36 UTC (rev 320)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= fontconfig
-VRS= 2.3.1
+VRS= 2.3.2
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
 URL= http://fontconfig.org/release/$(FILE)

Modified: x86/trunk/packages/freetype/Makefile
===================================================================
--- x86/trunk/packages/freetype/Makefile	2005-07-10 00:57:36 UTC (rev 319)
+++ x86/trunk/packages/freetype/Makefile	2005-07-10 01:12:36 UTC (rev 320)
@@ -2,12 +2,10 @@
 
 # Package versions
 NM= freetype
-VRS= 2.1.9
+VRS= 2.1.10
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-bytecode_interpreter-1.patch
 URL= http://easynews.dl.sourceforge.net/sourceforge/freetype/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH)
 
 
 
@@ -25,7 +23,7 @@
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
 	@if [ ! -f /usr/lib/libfreetype.so ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) && \
+	 sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h && \
 	 CFLAGS="$(CFLAGS) -fno-strict-aliasing" ./configure --prefix=/usr && \
 	 make -j3 && make install ; fi
 	@make clean




More information about the livecd mailing list