r2982 - in trunk: BOOK BOOK/introduction/welcome BOOK/pst/ps BOOK/x/lib patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Sat Nov 20 03:20:38 PST 2004


Author: igor
Date: 2004-11-20 04:20:36 -0700 (Sat, 20 Nov 2004)
New Revision: 2982

Added:
   trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-1.patch
Removed:
   trunk/patches/xpdf-3.00-freetype_2.1.7_hack-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/ps/xpdf.xml
   trunk/BOOK/x/lib/lesstif.xml
Log:
Updated to LessTif-0.93.96 and Xpdf-3.00pl1.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-11-20 06:53:23 UTC (rev 2981)
+++ trunk/BOOK/general.ent	2004-11-20 11:20:36 UTC (rev 2982)
@@ -249,7 +249,7 @@
 <!ENTITY Pango-version                "1.6.0">   
 <!ENTITY ATK-version                  "1.8.0"> 
 <!ENTITY GTK2-version                 "2.4.13"> 
-<!ENTITY lesstif-version              "0.93.94">   
+<!ENTITY lesstif-version              "0.93.97">   
 <!ENTITY startup-notification-version "0.8">   
 <!ENTITY shared-mime-info-version     "0.15">   
 <!ENTITY hicolor-icon-theme-version   "0.5"> 
@@ -463,7 +463,7 @@
 <!ENTITY enscript-version             "1.6.4">  
 <!ENTITY psutils-version              "p17">   
 <!ENTITY gsview-version               "4.6">   
-<!ENTITY xpdf-version                 "3.00">  
+<!ENTITY xpdf-version                 "3.00pl1">  
 
 <!-- Chapter 46 --> 
 <!ENTITY tex-version                  "2.0.2"> 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-11-20 06:53:23 UTC (rev 2981)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-11-20 11:20:36 UTC (rev 2982)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>November 20th, 2004 [igor]: Updated to LessTif-0.93.96
+and Xpdf-3.00pl1.</para></listitem>
+
 <listitem><para>November 20th, 2004 [randy]: Updated to 
 Metacity-2.8.6; added recode as a requirement to the fortune-mod dependency 
 in the XScreenSaver instructions.</para></listitem>

Modified: trunk/BOOK/pst/ps/xpdf.xml
===================================================================
--- trunk/BOOK/pst/ps/xpdf.xml	2004-11-20 06:53:23 UTC (rev 2981)
+++ trunk/BOOK/pst/ps/xpdf.xml	2004-11-20 11:20:36 UTC (rev 2982)
@@ -3,8 +3,8 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!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-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-size          "490 KB">
   <!ENTITY xpdf-buildsize     "32 MB">
   <!ENTITY xpdf-time          "0.41 SBU">
@@ -32,7 +32,7 @@
 <listitem><para>Download (FTP): <ulink
 url="&xpdf-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &xpdf-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &xpdf-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &xpdf-time;</para></listitem></itemizedlist>
@@ -40,7 +40,10 @@
 
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
+<listitem><para>Required patch: <ulink
+url="ftp://ftp.foolabs.com/pub/xpdf/xpdf-&xpdf-version;.patch"/></para></listitem>
+</itemizedlist></sect3>
+<listitem><para>Required patch: <ulink
 url="&patch-root;/xpdf-&xpdf-version;-freetype_2.1.7_hack-1.patch"/></para></listitem>
 </itemizedlist></sect3>
 
@@ -49,7 +52,7 @@
 <para><xref linkend="lesstif"/>
 </para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="gs"/> or <xref linkend="espgs"/>, 
+<para><xref linkend="gs"/> or <xref linkend="espgs"/> (just the fonts), 
 <ulink 
 url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">t1lib</ulink> 
 and <ulink 
@@ -65,7 +68,8 @@
 <para>Install <application>Xpdf</application> by running the following commands:
 </para>
 
-<screen><userinput><command>patch -Np1 -i ../xpdf-&xpdf-version;-freetype_2.1.7_hack-1.patch &&
+<screen><userinput><command>patch -d xpdf -Np0 -i ../../xpdf-&xpdf-version;.patch &&
+patch -Np1 -i ../xpdf-&xpdf-version;-freetype_2.1.7_hack-1.patch &&
 ./configure --prefix=/usr --sysconfdir=/etc \
     --with-freetype2-includes=/usr/include/freetype2 &&
 make &&
@@ -115,6 +119,7 @@
 
 psFile                  "|lpr"
 psPaperSize             letter
+#psPaperSize             A4
 textEOL                 unix
 
 enableT1lib             yes

Modified: trunk/BOOK/x/lib/lesstif.xml
===================================================================
--- trunk/BOOK/x/lib/lesstif.xml	2004-11-20 06:53:23 UTC (rev 2981)
+++ trunk/BOOK/x/lib/lesstif.xml	2004-11-20 11:20:36 UTC (rev 2982)
@@ -5,7 +5,9 @@
   %general-entities;
 
   <!ENTITY lesstif-download-http "http://prdownloads.sourceforge.net/lesstif/lesstif-&lesstif-version;.tar.bz2">
-  <!ENTITY lesstif-size          "3.4 MB">
+  <!ENTITY lesstif-download-ftp  " ">
+  <!ENTITY template-md5sum       " ">
+  <!ENTITY lesstif-size          "2.4 MB">
   <!ENTITY lesstif-buildsize     "40 MB">
   <!ENTITY lesstif-time          "2.73 SBU">
 ]>
@@ -27,6 +29,8 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Download (HTTP): <ulink url="&lesstif-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&lesstif-download-ftp;"/></para></listitem>
+<listitem><para>MD5 sum: &template-md5sum;</para></listitem>
 <listitem><para>Download size: &lesstif-size;</para></listitem>
 <listitem><para>Estimated Disk space required: &lesstif-buildsize;</para></listitem>
 <listitem><para>Estimated build time: &lesstif-time;</para></listitem></itemizedlist>
@@ -36,7 +40,10 @@
 <sect4><title>Required</title>
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="lynx"/></para></sect4>
+<para>
+<xref linkend="lynx"/> or
+<xref linkend="Links"/>
+</para></sect4>
 </sect3>
 
 </sect2>
@@ -64,30 +71,29 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><option>sed -i 's@$(prefix)/LessTif@$(prefix)/share/LessTif at g'</option>:
+<para><command>sed -i 's@$(prefix)/LessTif@$(prefix)/share/LessTif at g'</command>:
 This moves the location of the non-FHS compliant 
 <filename class="directory">/usr/LessTif</filename> directory to 
 <filename class="directory">/usr/share/LessTif</filename>.</para>
 
-<para><option>--enable-build-20</option>: Build the
+<para><parameter>--enable-build-20</parameter>: Build the
 <application>Motif</application> 2.0 compatible version of the
 <application>LessTif</application> libraries.</para> 
 
-<para>
-<option>--enable-build-21</option>: Also build the
+<para><parameter>--enable-build-21</parameter>: Also build the
 <application>Motif</application> 2.1 compatible versions.</para> 
 
-<para><option>--disable-debug</option>: Do not generate debugging information.
+<para><parameter>--disable-debug</parameter>: Do not generate debugging information.
 </para> 
 
-<para><option>--enable-production</option>: Build the release version
+<para><parameter>--enable-production</parameter>: Build the release version
 of the <application>LessTif</application> libraries.</para> 
 
-<para><option>--disable-build-tests</option>: Do not build the
+<para><parameter>--disable-build-tests</parameter>: Do not build the
 <filename class="directory">test/</filename> tree (see Testing
 <application>LessTif</application>).</para> 
 
-<para><option>--with-xdnd</option>: Enable <acronym>XDND</acronym>
+<para><parameter>--with-xdnd</parameter>: Enable <acronym>XDND</acronym>
 GNOME compatibility support.</para> 
 
 </sect2>
@@ -161,4 +167,3 @@
 </sect2>
 
 </sect1>
-

Deleted: trunk/patches/xpdf-3.00-freetype_2.1.7_hack-1.patch
===================================================================
--- trunk/patches/xpdf-3.00-freetype_2.1.7_hack-1.patch	2004-11-20 06:53:23 UTC (rev 2981)
+++ trunk/patches/xpdf-3.00-freetype_2.1.7_hack-1.patch	2004-11-20 11:20:36 UTC (rev 2982)
@@ -1,45 +0,0 @@
-Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
-Date: 2004-03-20
-Initial Package Version: 3.00
-Origin: NA
-Upstream Status: Major hack, will never be accepted upstream.
-Description: Fixed compilation with freetype-2.1.7.
-
-$LastChangedBy$
-$Date$
-
-diff -ur xpdf-3.00.orig/configure xpdf-3.00/configure
---- xpdf-3.00.orig/configure	2004-01-21 19:26:44.000000000 -0600
-+++ xpdf-3.00/configure	2004-03-20 10:21:03.000000000 -0600
-@@ -9007,6 +9007,9 @@
- 
- 
- 
-+  cat >>confdefs.h <<_ACEOF
-+#include <ft2build.h>
-+_ACEOF
- 
- 
- 
-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"
- 

Copied: trunk/patches/xpdf-3.00pl1-freetype_2.1.7_hack-1.patch (from rev 2981, trunk/patches/xpdf-3.00-freetype_2.1.7_hack-1.patch)




More information about the blfs-book mailing list