[Lunar-commits] CVS: moonbase/x11-apps/xpdf BUILD,1.3,1.4

[Terry Chan]

Update of /var/cvs/lunar/moonbase/x11-apps/xpdf
In directory dbguin.lunar-linux.org:/tmp/cvs-serv15722

Modified Files:
	BUILD 
Log Message:
Patched xpdf to correctly compile when freetype2 > 2.1.5.  Uses the newer
ft2build.h syntax and I had to correct the CXXFLAGS -I params the way the xpdf
author suggested on his home page.  Compiled with freetype2-2.1.7, gcc-3.3.3,
glibc-2.3.3, kernel headers 2.4.x.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11-apps/xpdf/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	10 Nov 2002 18:36:22 -0000	1.3
+++ BUILD	29 Aug 2004 21:39:11 -0000	1.4
@@ -1,12 +1,18 @@
 (
 
+sedit "s:freetype/freetype.h>:ft2build.h>\n#include FT_FREETYPE_H:" splash/SplashFTFontEngine.h \
+      splash/SplashFTFont.h splash/SplashFTFontFile.h &&
+
 OPTS=$OPTS" --enable-freetype2 \
             --with-x \
             --with-freetype2-library=/usr/lib \
-            --with-freetype2-includes=/usr/include/freetype2 \
+            --with-freetype2-includes=/usr/include/freetype2/freetype \
             --with-Xm-library=/usr/X11R6/lib \
             --with-Xm-includes=/usr/X11R6/include \
-            --with-gzip"
+            --with-gzip" &&
+
+# Need this export to fix the freetype2 problems when freetype2 > 2.1.5
+export CXXFLAGS="-I/usr/include/freetype2 -I/usr/include" &&
 
 default_build