[Lunar-commits] r14804 - moonbase/trunk/x11-apps/xpdf

[Moritz Heiber]

Author: moe
Date: 2005-05-18 10:33:33 +0000 (Wed, 18 May 2005)
New Revision: 14804

Modified:
   moonbase/trunk/x11-apps/xpdf/BUILD
   moonbase/trunk/x11-apps/xpdf/DETAILS
Log:
So much hassle for such low gain. Sigh.



Modified: moonbase/trunk/x11-apps/xpdf/BUILD
===================================================================
--- moonbase/trunk/x11-apps/xpdf/BUILD	2005-05-18 09:47:25 UTC (rev 14803)
+++ moonbase/trunk/x11-apps/xpdf/BUILD	2005-05-18 10:33:33 UTC (rev 14804)
@@ -1,18 +1,17 @@
 (
 
-sedit "s:freetype/freetype.h>:ft2build.h>\n#include FT_FREETYPE_H:" splash/SplashFTFontEngine.h \
-      splash/SplashFTFont.h splash/SplashFTFontFile.h &&
+for PATCH in $SOURCE2 $SOURCE3 $SOURCE4; do
+  patch -d xpdf -Np0 -i $SOURCE_CACHE/$PATCH;
+done &&
 
-OPTS=$OPTS" --enable-freetype2 \
-            --with-x \
-            --with-freetype2-library=/usr/lib \
-            --with-freetype2-includes=/usr/include/freetype2/freetype \
-            --with-Xm-library=/usr/X11R6/lib \
-            --with-Xm-includes=/usr/X11R6/include \
+patch_it $SOURCE5 1 &&
+
+OPTS="$OPTS --with-freetype2-includes=/usr/include/freetype2 \
             --with-gzip" &&
 
-# Need this export to fix the freetype2 problems when freetype2 > 2.1.5
+# Need these exports to fix the freetype2 problems when freetype2 > 2.1.5
 export CXXFLAGS="-I/usr/include/freetype2 -I/usr/include" &&
+export CPPFLAGS="-I/usr/include" &&
 
 default_build
 

Modified: moonbase/trunk/x11-apps/xpdf/DETAILS
===================================================================
--- moonbase/trunk/x11-apps/xpdf/DETAILS	2005-05-18 09:47:25 UTC (rev 14803)
+++ moonbase/trunk/x11-apps/xpdf/DETAILS	2005-05-18 10:33:33 UTC (rev 14804)
@@ -1,17 +1,28 @@
           MODULE=xpdf
          VERSION=3.00
-        #VERSION=2.03
           SOURCE=$MODULE-$VERSION.tar.gz
+	 SOURCE2=${MODULE}-${VERSION}pl1.patch
+	 SOURCE3=${MODULE}-${VERSION}pl2.patch
+	 SOURCE4=${MODULE}-${VERSION}pl3.patch
+	 SOURCE5=$MODULE-$VERSION-lunar-freetype2.patch
    SOURCE_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/
    SOURCE_URL[1]=ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/
    SOURCE_URL[2]=ftp://ftp.xopen.org/pub/PDF/$MODULE/
    SOURCE_URL[3]=ftp://planetmirror.com/pub/$MODULE/
+  SOURCE2_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/
+  SOURCE3_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/
+  SOURCE4_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/
+  SOURCE5_URL[0]=$PATCH_URL/
         WEB_SITE=http://www.foolabs.com/xpdf
-      SOURCE_VFY=md5:95294cef3031dd68e65f331e8750b2c2
+      SOURCE_VFY=sha1:080317afce0851274fec2865131f59590b54eb99
+     SOURCE2_VFY=sha1:b984f64c25310e3b0bdebd9b75088ea46e067735
+     SOURCE3_VFY=sha1:9b406ea1514b508893460c3ec9cb6131287b1c9c
+     SOURCE4_VFY=sha1:c29b9ea13d1f8567a4521e12d50e497bf1681608
+     SOURCE5_VFY=sha1:9fa9df8eb6aa82a62131d59b59e230f8fcd19d43
          ENTERED=20020218
-         UPDATED=20040217
+         UPDATED=20050518
            SHORT="xpdf: a PDF viewer for X11R6."
-      MAINTAINER=csm at lunar-linux.org
+
 cat << EOF
 Xpdf is an open source viewer for Portable Document Format (PDF)
 files.  (These are also sometimes also called 'Acrobat' files, from