r4974 - in trunk: BOOK BOOK/introduction/welcome BOOK/pst/ps patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Aug 21 23:20:39 PDT 2005


Author: randy
Date: 2005-08-22 00:20:35 -0600 (Mon, 22 Aug 2005)
New Revision: 4974

Removed:
   trunk/patches/xpdf-3.00pl3-freetype_2.1.7_hack-2.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/ps/xpdf.xml
Log:
Updated to Xpdf-3.01

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-08-22 03:22:57 UTC (rev 4973)
+++ trunk/BOOK/general.ent	2005-08-22 06:20:35 UTC (rev 4974)
@@ -540,7 +540,7 @@
 <!ENTITY enscript-version             "1.6.4">
 <!ENTITY psutils-version              "p17">
 <!ENTITY gsview-version               "4.7">
-<!ENTITY xpdf-version                 "3.00pl3">
+<!ENTITY xpdf-version                 "3.01">
 <!ENTITY fop-version                  "0.20.5">
 
 <!-- Chapter 46 -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-08-22 03:22:57 UTC (rev 4973)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-08-22 06:20:35 UTC (rev 4974)
@@ -45,6 +45,9 @@
       <para>August 22nd, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to Xpdf-3.01</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to SLIB-3a2</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/pst/ps/xpdf.xml
===================================================================
--- trunk/BOOK/pst/ps/xpdf.xml	2005-08-22 03:22:57 UTC (rev 4973)
+++ trunk/BOOK/pst/ps/xpdf.xml	2005-08-22 06:20:35 UTC (rev 4974)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xpdf-download-http "http://gd.tuwien.ac.at/publishing/xpdf/xpdf-3.00.tar.gz">
-  <!ENTITY xpdf-download-ftp  "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.00.tar.gz">
-  <!ENTITY xpdf-md5sum        "95294cef3031dd68e65f331e8750b2c2">
-  <!ENTITY xpdf-size          "534 KB">
-  <!ENTITY xpdf-buildsize     "31.7 MB">
-  <!ENTITY xpdf-time          "0.32 SBU">
+  <!ENTITY xpdf-download-http "http://gd.tuwien.ac.at/publishing/xpdf/xpdf-&xpdf-version;.tar.gz">
+  <!ENTITY xpdf-download-ftp  "ftp://ftp.foolabs.com/pub/xpdf/xpdf-&xpdf-version;.tar.gz">
+  <!ENTITY xpdf-md5sum        "e004c69c7dddef165d768b1362b44268">
+  <!ENTITY xpdf-size          "599 KB">
+  <!ENTITY xpdf-buildsize     "38.1 MB">
+  <!ENTITY xpdf-time          "0.4 SBU">
 ]>
 
 <sect1 id="xpdf" xreflabel="Xpdf-&xpdf-version;">
@@ -55,6 +55,7 @@
       </listitem>
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
@@ -74,6 +75,7 @@
         url="&patch-root;/xpdf-&xpdf-version;-freetype_2.1.7_hack-2.patch"/></para>
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">Xpdf Dependencies</bridgehead>
 
@@ -96,12 +98,9 @@
     <para>Install <application>Xpdf</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -d xpdf -Np0 -i ../../xpdf-3.00pl1.patch &&
-patch -d xpdf -Np0 -i ../../xpdf-3.00pl2.patch &&
-patch -d xpdf -Np0 -i ../../xpdf-&xpdf-version;.patch &&
-patch -Np1 -i ../xpdf-&xpdf-version;-freetype_2.1.7_hack-2.patch &&
-./configure --prefix=/usr --sysconfdir=/etc \
-    --with-freetype2-includes=/usr/include/freetype2 &&
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+    --with-freetype2-includes=/usr/include/freetype2 \
+    --enable-opi --enable-multithreaded --enable-wordlist &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

Deleted: trunk/patches/xpdf-3.00pl3-freetype_2.1.7_hack-2.patch
===================================================================
--- trunk/patches/xpdf-3.00pl3-freetype_2.1.7_hack-2.patch	2005-08-22 03:22:57 UTC (rev 4973)
+++ trunk/patches/xpdf-3.00pl3-freetype_2.1.7_hack-2.patch	2005-08-22 06:20:35 UTC (rev 4974)
@@ -1,58 +0,0 @@
-Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org> and
-              Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date: 2004-12-18
-Initial Package Version: 3.00
-Origin: NA
-Upstream Status: Major hack, will never be accepted upstream.
-Description: Fixed compilation with freetype-2.1.7;
-             (12-18-2004) Randy added CFLAGS for libpaper so that libpaper 
-             is discovered by configure
-
-$LastChangedBy$
-$Date$
-
-diff -Naur xpdf-3.00-orig/configure xpdf-3.00/configure
---- xpdf-3.00-orig/configure    2004-01-22 01:26:44.000000000 +0000
-+++ xpdf-3.00/configure 2004-12-18 17:42:34.787719704 +0000
-@@ -9007,6 +9007,9 @@
-
-
-
-+  cat >>confdefs.h <<_ACEOF
-+#include <ft2build.h>
-+_ACEOF
-
-
-
-@@ -9817,7 +9820,7 @@
-    { (exit 1); exit 1; }; }
-     fi
-   else
--    libpaper_CFLAGS=
-+    libpaper_CFLAGS="-I/usr/include/freetype2"
-   fi
-
-         smr_test_CPPFLAGS="${CPPFLAGS+set}"
- 
-diff -ur xpdf-3.00.orig/splash/SplashFTFontEngine.h xpdf-3.00/splash/SplashFTFontEngine.h
---- xpdf-3.00.orig/splash/SplashFTFontEngine.h	2004-01-21 19:26:44.000000000 -0600
-+++ xpdf-3.00/splash/SplashFTFontEngine.h	2004-03-20 10:23:32.000000000 -0600
-@@ -15,6 +15,7 @@
- #pragma interface
- #endif
- 
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include "gtypes.h"
- 
-diff -ur xpdf-3.00.orig/splash/SplashFTFontFile.h xpdf-3.00/splash/SplashFTFontFile.h
---- xpdf-3.00.orig/splash/SplashFTFontFile.h	2004-01-21 19:26:44.000000000 -0600
-+++ xpdf-3.00/splash/SplashFTFontFile.h	2004-03-20 10:22:58.000000000 -0600
-@@ -15,6 +15,7 @@
- #pragma interface
- #endif
- 
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include "SplashFontFile.h"
- 




More information about the blfs-book mailing list