Changeset c17e587 for pst

Timestamp:

08/24/2014 09:05:13 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

b8691802

Parents:

3ede78cb

Message:

Check some office stuff. Minor fixes for some packages. Merged trunk.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@14042 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

pst

Files:

• printing/gs.xml (modified) (8 diffs)
• typesetting/texlive.xml (modified) (3 diffs)

pst/printing/gs.xml

@@ -48 +48 @@
     used for that.</para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -156 +156 @@
       copies of <application>expat</application>,
       <application>freetype</application>, <application>lcms2</application>,
-      <application>libjpeg</application>, and <application>libpng</application>:
+      <application>libjpeg</application>, <application>libpng</application>
+      and <application>zlib</application>:
     </para>
 
 <screen><userinput>sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' configure.ac configure &amp;&amp;
-rm -rf expat freetype lcms2 jpeg libpng</userinput></screen>
+rm -rf expat freetype lcms2 jpeg libpng zlib</userinput></screen>
 <!--
     <note>
@@ -174 +175 @@
     <para>Compile <application>Ghostscript</application>:</para>
 
-<screen><userinput>rm -rf zlib &amp;&amp;
-./configure --prefix=/usr --disable-compile-inits \
- --enable-dynamic --with-system-libtiff &amp;&amp;
+<screen><userinput>./configure --prefix=/usr           \
+            --disable-compile-inits \
+            --enable-dynamic        \
+            --with-system-libtiff &amp;&amp;
 make</userinput></screen>
 
@@ -210 +212 @@
     <para>If you want the shared library too:</para>
 
-<screen role="root"><userinput>make soinstall &amp;&amp;
+<screen role="root"><userinput>make soinstall<!-- &amp;&amp;
 install -v -m644 base/*.h /usr/include/ghostscript &amp;&amp;
-ln -v -s ghostscript /usr/include/ps</userinput></screen>
+ln -v -s ghostscript /usr/include/ps--></userinput></screen>
 
     <para>Now make the documentation accessible from the normal place:</para>
@@ -237 +239 @@
     <para>
       <command>sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' ... </command>:
-      Fix to build with system <application>zlib</application>.
-    </para>
-
-    <para>
+      Fixes building with system <application>Zlib</application>.
+    </para>
+
+    <!-- <para>
       <command>rm -rf zlib</command>:
       <application>zlib</application> was installed as part of LFS.
-    </para>
+    </para> -->
 
     <para>
@@ -255 +257 @@
     </para>
 
-    <para>
+    <!-- <para> Nothing needs these. The ones installed by soinstall are sufficient.
       <command>install -v -m644 base/*.h... </command>: Some packages
       (<application>ImageMagick</application> is one) need the
@@ -262 +264 @@
     </para>
 
-    <para>
+    <para> Haven't found anything that needs this
       <command>ln -v -s ghostscript /usr/include/ps</command>: Some packages
       expect to find the interface headers in an alternate location.
-    </para>
+    </para> -->
 
     <para>
@@ -277 +279 @@
       to the <xref linkend="cups"/> libraries if you have installed those.
     </para>
+
   </sect2>
 

pst/typesetting/texlive.xml

@@ -81 +81 @@
       versions.  The following are recommended so that the system version
       will be used:
-      <xref linkend="icu"/>,
+      <xref linkend="fontconfig"/>,
       <xref linkend="freetype2"/>,
-      <xref linkend="fontconfig"/>,
+      <xref linkend="gc"/>,
       <xref linkend="graphite2"/>,
       <xref linkend="harfbuzz"/> (linked to graphite2),
+      <xref linkend="icu"/>,
       <xref linkend="libpng"/>,
       <xref linkend="poppler"/>
@@ -93 +94 @@
     <para role="optional">
       <ulink url="http://www.fftw.org/">FFTW</ulink> can be used by asy.
+    </para>
+    <para>
+      The version of
+      <ulink
+      url="http://packages.debian.org/source/sid/libpaper">libpaper</ulink>
+      shipped with the source will be used unless you have installed a system
+      version and told it to use that.
     </para>
     <para role="optional">
@@ -176 +184 @@
     --with-system-xpdf                              \
     --with-system-zlib                              \
-    --with-banner-add=" - BLFS" &amp;&amp;
-
-pushd ../utils/asymptote &amp;&amp;
+    --with-banner-add=" - BLFS"</userinput></screen>
+
+    <para>Asymptote has to be separately configured.  It ships with its own copy
+    of the gc source tarball, and will only use the system version if that local
+    source is removed.
+    </para>
+
+<screen><userinput>pushd ../utils/asymptote &amp;&amp;
+    rm -v gc-7.4.0.tar.gz &amp;&amp;
+
     echo "ac_cv_lib_m_sqrt=yes"     >config.cache &amp;&amp;
     echo "ac_cv_lib_z_deflate=yes" >>config.cache &amp;&amp;