[blfs-book] r11035 - in trunk/BOOK: . general/genlib general/graphlib postlfs/filesystems x/lib xsoft/other

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Fri Mar 1 08:01:45 PST 2013


Author: krejzi
Date: Fri Mar  1 08:01:45 2013
New Revision: 11035

Log:
Boost 1.53.0, Ntfs-3g 2013.1.13, libpng 1.5.14, Cairo 1.12.14, GTK+2 2.24.16, Gimp 2.8.4.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/genlib/boost.xml
   trunk/BOOK/general/graphlib/libpng.xml
   trunk/BOOK/postlfs/filesystems/ntfs-3g.xml
   trunk/BOOK/x/lib/cairo.xml
   trunk/BOOK/x/lib/gtk+2.xml
   trunk/BOOK/xsoft/other/gimp.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/general.ent	Fri Mar  1 08:01:45 2013	(r11035)
@@ -204,7 +204,7 @@
 <!ENTITY jfsutils-version             "1.1.15">
 <!ENTITY lvm2-version                 "2.02.98">
 <!ENTITY mdadm-version                "3.2.6">
-<!ENTITY ntfs-3g-version              "2012.1.15">
+<!ENTITY ntfs-3g-version              "2013.1.13">
 <!ENTITY gptfdisk-version             "0.8.5">
 <!ENTITY parted-version               "3.1">
 <!ENTITY reiser-version               "3.6.21">
@@ -233,7 +233,7 @@
 <!ENTITY aspell-version               "0.60.6.1">
 
 <!ENTITY boost-major                  "1">
-<!ENTITY boost-minor                  "52">
+<!ENTITY boost-minor                  "53">
 <!ENTITY boost-patch                  "0">
 <!ENTITY boost-version                "&boost-major;.&boost-minor;.&boost-patch;">
 <!ENTITY boost-dl-version             "&boost-major;_&boost-minor;_&boost-patch;">
@@ -321,7 +321,7 @@
 <!ENTITY libjpeg-version              "8d">
 <!ENTITY libjpeg-turbo-version        "1.2.1">
 <!ENTITY libmng-version               "1.0.10">
-<!ENTITY libpng-version               "1.5.13">
+<!ENTITY libpng-version               "1.5.14">
 <!ENTITY librsvg-version              "2.36.4">
 <!ENTITY libtiff-version              "4.0.3">
 <!ENTITY openjpeg-version             "1.5.1">
@@ -573,7 +573,7 @@
 <!ENTITY atkmm-version                "2.22.6">
 <!ENTITY at-spi2-core-version         "2.6.3">
 <!ENTITY at-spi2-atk-version          "2.6.2">
-<!ENTITY cairo-version                "1.12.12">
+<!ENTITY cairo-version                "1.12.14">
 <!ENTITY cairomm-version              "1.10.0">
 <!ENTITY cogl-version                 "1.12.2">
 <!ENTITY clutter-version              "1.12.2">
@@ -584,7 +584,7 @@
 <!ENTITY gdk-pixbuf-version           "2.26.5">
 <!ENTITY goffice-version              "0.8.17">
 <!ENTITY goffice010-version           "0.10.0">
-<!ENTITY gtk2-version                 "2.24.14">
+<!ENTITY gtk2-version                 "2.24.16">
 <!ENTITY gtk3-version                 "3.6.4">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.2">
@@ -809,7 +809,7 @@
 <!ENTITY ekiga-version                "4.0.0">
 <!ENTITY gparted-version              "0.14.1">
 <!ENTITY gnash-version                "0.8.10">
-<!ENTITY gimp-version                 "2.8.2">
+<!ENTITY gimp-version                 "2.8.4">
 <!ENTITY icedtea-web-version          "1.3">
 <!ENTITY inkscape-version             "0.48.4">
 <!ENTITY pan-version                  "0.133">

Modified: trunk/BOOK/general/genlib/boost.xml
==============================================================================
--- trunk/BOOK/general/genlib/boost.xml	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/general/genlib/boost.xml	Fri Mar  1 08:01:45 2013	(r11035)
@@ -6,9 +6,9 @@
 
   <!ENTITY boost-download-http "&sourceforge-repo;/boost/boost_&boost-dl-version;.tar.bz2">
   <!ENTITY boost-download-ftp  " ">
-  <!ENTITY boost-md5sum        "3a855e0f919107e0ca4de4d84ad3f750">
-  <!ENTITY boost-size          "52 MB">
-  <!ENTITY boost-buildsize     "685 MB">
+  <!ENTITY boost-md5sum        "a00d22605d5dbcfb4c9936a9b35bc4c2">
+  <!ENTITY boost-size          "54 MB">
+  <!ENTITY boost-buildsize     "700 MB">
   <!ENTITY boost-time          "3.5 SBU">
 ]>
 
@@ -120,8 +120,8 @@
       <parameter>link=shared</parameter>: This parameter ensures that only shared
       libraries are created, except for libboost_exception and libboost_test_exec_monitor
       which are created as static. Most people will not need the static libraries, indeed
-      most programs using boost only use the headers, but omit this parameter if you
-      do need them.
+      most programs using <application>Boost</application> only use the headers, but omit
+      this parameter if you do need them.
     </para>
 
   </sect2>
@@ -139,15 +139,14 @@
           None
         </seg>
         <seg>
-          libboost_chrono.so, libboost_date_time.so, libboost_exception.a,
-          libboost_filesystem.so, libboost_graph.so, libboost_iostreams.so,
-          libboost_locale.so, libboost_math_c99f.so, libboost_math_c99l.so,
-          libboost_math_c99.so, libboost_math_tr1f.so,
-          libboost_math_tr1l.so, libboost_math_tr1.so,
-          libboost_prg_exec_monitor.so, libboost_program_options.so,
-          libboost_python.so, libboost_random.so, libboost_regex.so,
-          libboost_serialization.so, libboost_signals.so,
-          libboost_system.so, libboost_test_exec_monitor.a,
+          libboost_atomic.so, libboost_chrono.so, libboost_context.so,
+          libboost_date_time.so, libboost_exception.a, libboost_filesystem.so,
+          libboost_graph.so, libboost_iostreams.so, libboost_locale.so,
+          libboost_math_c99f.so, libboost_math_c99l.so, libboost_math_c99.so,
+          libboost_math_tr1f.so, libboost_math_tr1l.so, libboost_math_tr1.so,
+          libboost_prg_exec_monitor.so, libboost_program_options.so, libboost_python.so,
+          libboost_random.so, libboost_regex.so, libboost_serialization.so,
+          libboost_signals.so, libboost_system.so, libboost_test_exec_monitor.a,
           libboost_thread.so, libboost_timer.so, libboost_unit_test_framework.so,
           libboost_wave.so and libboost_wserialization.so
         </seg>

Modified: trunk/BOOK/general/graphlib/libpng.xml
==============================================================================
--- trunk/BOOK/general/graphlib/libpng.xml	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/general/graphlib/libpng.xml	Fri Mar  1 08:01:45 2013	(r11035)
@@ -7,9 +7,9 @@
   <!ENTITY libpng-download-http
            "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "0b607a685da977f1bfc96e1c47055183">
-  <!ENTITY libpng-size          "692 KB">
-  <!ENTITY libpng-buildsize     "9.5 MB">
+  <!ENTITY libpng-md5sum        "94284b01d62ca43c5eb3f6702db08ed8">
+  <!ENTITY libpng-size          "700 KB">
+  <!ENTITY libpng-buildsize     "11 MB">
   <!ENTITY libpng-time          "0.1 SBU">
   <!ENTITY apng-patch
            "&sourceforge-repo;/libpng-apng/libpng-&libpng-version;-apng.patch.gz">
@@ -26,7 +26,7 @@
   <title>libpng-&libpng-version;</title>
 
   <indexterm zone="libpng">
-    <primary sortas="a-Libpng">Libpng</primary>
+    <primary sortas="a-libpng">libpng</primary>
   </indexterm>
 
   <sect2 role="package">
@@ -99,10 +99,7 @@
       If you want to patch libpng to support apng files, apply the patch:
     </para>
 
-<screen><userinput>gzip -cd ../libpng-&libpng-version;-apng.patch.gz | patch -p1 &&
-START=$(awk '/@/' scripts/symbols.def | sort -k2.3n | tail -1 | cut -d "@" -f2) &&
-awk -v v="$START" '/^PNG(_.+)?_EXPORTA?\(/ {gsub(/PNG(_.+)?_EXPORTA?\(/, ""); gsub(/,/, ""); \
-if($1 > v) print $3 " @"$1}' png.h | sort -k2.3n >> scripts/symbols.def</userinput></screen>
+<screen><userinput>gzip -cd ../libpng-&libpng-version;-apng.patch.gz | patch -p1</userinput></screen>
 
     <para>
       Install <application>libpng</application> by running the following
@@ -121,18 +118,13 @@
     </para>
 
 <screen role="root"><userinput>make install &&
-mkdir /usr/share/doc/libpng-&libpng-version; &&
-cp README libpng-manual.txt /usr/share/doc/libpng-&libpng-version;</userinput></screen>
+mkdir -v /usr/share/doc/libpng-&libpng-version; &&
+cp -v README libpng-manual.txt /usr/share/doc/libpng-&libpng-version;</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <command>awk -v ...</command>: This command fixes the testsuite
-      when APNG patch is applied.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 

Modified: trunk/BOOK/postlfs/filesystems/ntfs-3g.xml
==============================================================================
--- trunk/BOOK/postlfs/filesystems/ntfs-3g.xml	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/postlfs/filesystems/ntfs-3g.xml	Fri Mar  1 08:01:45 2013	(r11035)
@@ -5,11 +5,11 @@
   %general-entities;
 
   <!ENTITY ntfs-3g-download-http
-    "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-&ntfs-3g-version;.tgz">
+           "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-&ntfs-3g-version;.tgz">
   <!ENTITY ntfs-3g-download-ftp  " ">
-  <!ENTITY ntfs-3g-md5sum        "341acae00a290cab9b00464db65015cc">
-  <!ENTITY ntfs-3g-size          "1.1 MB">
-  <!ENTITY ntfs-3g-buildsize     "21 MB">
+  <!ENTITY ntfs-3g-md5sum        "2d6fb47ddf62b51733227126fe9227fe">
+  <!ENTITY ntfs-3g-size          "1.2 MB">
+  <!ENTITY ntfs-3g-buildsize     "24 MB">
   <!ENTITY ntfs-3g-time          "0.4 SBU">
 ]>
 
@@ -121,8 +121,8 @@
     </para>
 
 <screen role="root"><userinput>make install &&
-ln /bin/ntfs-3g /sbin/mount.ntfs &&
-ln /usr/share/man/man8/{ntfs-3g,mount.ntfs}.8</userinput></screen>
+ln -sv ../bin/ntfs-3g /sbin/mount.ntfs &&
+ln -sv /usr/share/man/man8/{ntfs-3g,mount.ntfs}.8</userinput></screen>
 
     <para>
       If you want ordinary users to be able to mount NTFS partitions you'll need
@@ -131,7 +131,8 @@
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>chmod 4755 /sbin/mount.ntfs</userinput></screen>
+<screen role="root"><userinput>chmod -v 4755 /sbin/mount.ntfs</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
@@ -149,15 +150,16 @@
     </para>
 
     <para>
-      <command>ln /bin/ntfs-3g /sbin/mount.ntfs</command>: Creating
+      <command>ln -sv ../bin/ntfs-3g /sbin/mount.ntfs</command>: Creating
       /sbin/mount.ntfs makes <command>mount</command> default to using Ntfs-3g
       to mount NTFS partitions.
     </para>
 
     <para>
-      <command>chmod 4755 /sbin/mount.ntfs</command>: Making mount.ntfs set user
-      ID root allows non root users to mount NTFS partitions.
+      <command>chmod -v 4755 /sbin/mount.ntfs</command>: Making mount.ntfs setuid
+      root allows non root users to mount NTFS partitions.
     </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -185,7 +187,8 @@
       user:
     </para>
 
-<screen role="root"><userinput>chmod 777 /mnt/usb</userinput></screen>
+<screen role="root"><userinput>chmod -v 777 /mnt/usb</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
@@ -193,35 +196,25 @@
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          lowntfs-3g,
-          mkfs.ntfs,
-          mkntfs,
-          mount.lowntfs-3g,
-          mount.ntfs,
-          mount.ntfs-3g,
-          ntfs-3g,
-          ntfs-3g.probe,
-          ntfs-3g.secaudit,
-          ntfs-3g.usermap,
-          ntfscluster,
-          ntfscp,
-          ntfsfix,
-          ntfsls,
-          ntfscat,
-          ntfsclone,
-          ntfscmp,
-          ntfsinfo,
-          ntfslabel,
-          ntfsresize and
-          ntfsundelete.
+          lowntfs-3g, mkfs.ntfs, mkntfs, mount.lowntfs-3g,
+          mount.ntfs, mount.ntfs-3g, ntfs-3g, ntfs-3g.probe,
+          ntfs-3g.secaudit, ntfs-3g.usermap, ntfscat,
+          ntfsclone, ntfscluster, ntfscmp, ntfscp, ntfsfix,
+          ntfsinfo, ntfslabel, ntfsls, ntfsresize and
+          ntfsundelete
+        </seg>
+        <seg>
+          libntfs-3g.so
+        </seg>
+        <seg>
+          /usr/include/ntfs-3g and
+          /usr/share/doc/ntfs-3g
         </seg>
-        <seg>libntfs-3g.so.</seg>
-        <seg>/usr/include/ntfs-3g.</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/x/lib/cairo.xml
==============================================================================
--- trunk/BOOK/x/lib/cairo.xml	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/x/lib/cairo.xml	Fri Mar  1 08:01:45 2013	(r11035)
@@ -6,9 +6,9 @@
 
   <!ENTITY cairo-download-http "http://cairographics.org/releases/cairo-&cairo-version;.tar.xz">
   <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "9f7315e54885c735dcfdabe77f322d30">
-  <!ENTITY cairo-size          "42 MB">
-  <!ENTITY cairo-buildsize     "152 MB">
+  <!ENTITY cairo-md5sum        "27b634113d0f52152d60ae8e2ec7daa7">
+  <!ENTITY cairo-size          "41 MB">
+  <!ENTITY cairo-buildsize     "180 MB">
   <!ENTITY cairo-time          "1.1 SBU">
 ]>
 
@@ -102,29 +102,14 @@
     <para role="optional">
       <xref linkend="cogl"/>,
       <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <!-- <xref linkend="gs"/> (for testing the postscript backend),
-      <xref linkend="gtk2"/> (for testing the PDF backend), -->
       <xref linkend="gtk-doc"/>,
       <xref linkend="libdrm"/>,
-      <!-- <xref linkend="librsvg"/> (for testing the SVG backend),
-      <ulink url="http://libspectre.freedesktop.org">libspectre</ulink> (for
-      testing the PDF backend), -->
       <xref linkend="mesalib"/>,
-      <!-- <xref linkend="poppler"/> (for testing the PDF backend) -->
       <xref linkend="qt"/>,
       <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
       <ulink url="http://www.valgrind.org">Valgrind</ulink>
     </para>
 
-    <!-- <note>
-      <para>
-        There is a reciprocal dependency with the
-        <application>GTK+ 2</application>, <application>librsvg</application> and
-        <application>Poppler</application> packages. As the test suite is
-        currently unreliable, it is best to simply skip it at this time.
-      </para>
-    </note> -->
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/cairo"/>
     </para>
@@ -138,18 +123,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --enable-tee  \
-            --enable-xcb  \
-            --disable-static &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
-    <!-- <para>
-      Note that the tests take a long time to run, many of them fail for unknown
-      reasons and it has been known to cause a kernel panic. If you want to run
-      the tests issue: <command>make -k check</command>.
-    </para> -->
-
     <para>
       This package does not have a working testsuite.
     </para>
@@ -164,31 +140,19 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <option>--enable-tee</option>: This switch enables
-      <application>Cairo</application>'s experimental tee
-      surface which is required by some packages like
-      <application>Firefox</application>.
-    </para>
-
-    <para>
-      <option>--enable-xcb</option>: This switch enables
-      <application>Cairo</application>'s XCB surface
-      which is required by some packages.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para>
       <option>--enable-gl</option>: This switch enables
       <application>Cairo</application>'s experimental
       <application>OpenGL</application> surface which
       is required for <application>Wayland</application>
-      and some other packages that are not part of BLFS.
+      compositor and some other packages that are not
+      part of BLFS.
     </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>

Modified: trunk/BOOK/x/lib/gtk+2.xml
==============================================================================
--- trunk/BOOK/x/lib/gtk+2.xml	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/x/lib/gtk+2.xml	Fri Mar  1 08:01:45 2013	(r11035)
@@ -6,9 +6,9 @@
 
   <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
   <!ENTITY gtk2-download-ftp  "&gnome-download-ftp;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
-  <!ENTITY gtk2-md5sum        "e2c16f119ed624893ecfc3775930ae4c">
+  <!ENTITY gtk2-md5sum        "ea8ba95edd3896eca2d48450080d1f2d">
   <!ENTITY gtk2-size          "13 MB">
-  <!ENTITY gtk2-buildsize     "370 MB">
+  <!ENTITY gtk2-buildsize     "380 MB">
   <!ENTITY gtk2-time          "2.7 SBU">
 ]>
 

Modified: trunk/BOOK/xsoft/other/gimp.xml
==============================================================================
--- trunk/BOOK/xsoft/other/gimp.xml	Fri Mar  1 06:47:30 2013	(r11034)
+++ trunk/BOOK/xsoft/other/gimp.xml	Fri Mar  1 08:01:45 2013	(r11035)
@@ -6,9 +6,9 @@
 
   <!ENTITY gimp-download-http "http://artfiles.org/gimp.org/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
   <!ENTITY gimp-download-ftp  "ftp://ftp.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-md5sum        "b542138820ca3a41cbd63fc331907955">
+  <!ENTITY gimp-md5sum        "392592e8755d046317878d226145900f">
   <!ENTITY gimp-size          "20 MB">
-  <!ENTITY gimp-buildsize     "570 MB (additonal 580 MB to run the test suite, the help files add from 267 MB (en only) to 1.3 GB (all), typically increasing by 60 MB per translation)">
+  <!ENTITY gimp-buildsize     "680 MB (additonal 680 MB to run the test suite, the help files add from 267 MB (en only) to 1.3 GB (all), typically increasing by 60 MB per translation)">
   <!ENTITY gimp-time          "4.9 SBU (additional 1.2 SBU to run the test suite, for the help files from 0.7 SBU (en only) to 29 SBU (all) - typically 1.5 SBU per translation)">
 
   <!ENTITY gimp-help-version  "2.8.0">
@@ -32,57 +32,83 @@
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to The Gimp</title>
+    <title>Introduction to Gimp</title>
 
-    <para>The <application>Gimp</application> package contains
-    the GNU Image Manipulation Program. This is useful for
-    photo retouching, image composition and image authoring.</para>
+    <para>
+      The <application>Gimp</application> package contains
+      the GNU Image Manipulation Program which is useful for
+      photo retouching, image composition and image authoring.
+    </para>
 
     &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&gimp-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&gimp-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&gimp-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&gimp-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &gimp-md5sum;</para>
+        <para>
+          Download MD5 sum: &gimp-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &gimp-size;</para>
+        <para>
+          Download size: &gimp-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &gimp-buildsize;</para>
+        <para>
+          Estimated disk space required: &gimp-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &gimp-time;</para>
+        <para>
+          Estimated build time: &gimp-time;
+        </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional help files: <ulink url="&gimp-help-download;"/></para>
+        <para>
+          Optional help files: <ulink url="&gimp-help-download;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &gimp-help-md5sum;</para>
+        <para>
+          Download MD5 sum: &gimp-help-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &gimp-help-size;</para>
+        <para>
+          Download size: &gimp-help-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Optional compressed patch for the help files: <ulink
-        url="&sources-anduin-other;/gimp-help-&gimp-help-version;-build_fixes-1.patch.xz"/>
-        (to build the catalan translations)</para>
+        <para>
+          Optional compressed patch for the help files:
+          <ulink url="&sources-anduin-other;/gimp-help-&gimp-help-version;-build_fixes-1.patch.xz"/>
+          (to build the Catalan translations).
+        </para>
       </listitem>
       <listitem>
-        <para>Compressed Patch MD5 sum: 5312793a67132131a6e3360e76f392e4</para>
+        <para>
+          Compressed Patch MD5 sum: 5312793a67132131a6e3360e76f392e4
+        </para>
       </listitem>
       <listitem>
-        <para>Compressed Patch size: 486 KB</para>
+        <para>
+         Compressed Patch size: 486 KB
+        </para>
       </listitem>
     </itemizedlist>
 
@@ -97,19 +123,9 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <!-- These are required by gdk-pixbuf, which is required by GTK+-2
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/> -->
       <xref linkend="pygtk"/> (including the gtk and pango modules)
     </para>
 
-    <!-- <note>
-      <para>If the recommended dependencies are not installed, the
-      <command>configure</command> switches below will need to be modified as
-      explained in <xref linkend="gimp-cmd-explanations"/> below.</para>
-    </note> -->
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="aalib"/>,
@@ -131,8 +147,8 @@
       <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
       <xref linkend="webkitgtk"/> (this must be compiled with the
       <application>GTK+ 2</application> backend for the
-      <application>Gimp</application> to use it as its help browser)
-      and <xref linkend="gtk-doc"/>
+      <application>Gimp</application> to use it as its help browser) and
+      <xref linkend="gtk-doc"/>
     </para>
 
     <bridgehead renderas="sect4">Optional, for optimizing the PNG files in the
@@ -143,107 +159,130 @@
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gimp"/></para>
+      <ulink url="&blfs-wiki;/gimp"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of The Gimp</title>
+    <title>Installation of Gimp</title>
 
-    <para>Install The <application>Gimp</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>Gimp</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --without-gvfs &&
 make</userinput></screen>
 
-    <para>To test the results (requires an X-Windowed terminal) issue:
-    <command>make check</command>.</para>
+    <para>
+      To test the results (requires an X-Windowed terminal) issue:
+      <command>make check</command>.
+    </para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
+    <para>
+      Now, as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>The <filename>gimp-help</filename> tarball contains images and English
-    text help for help files, together with translations. It is
-    "work in progress".</para>
-
-    <para>If you downloaded the <filename>gimp-help</filename> tarball, unpack
-    it and change into the root of the newly created source tree. This release
-    fails to build for its first language, catalan ("ca") but those
-    who wish to build the remaining languages can prepare for the build with the
-    following command:</para>
+    <para>
+      The <filename>gimp-help</filename> tarball contains images and English
+      text help for help files, together with translations. It is
+      "work in progress".
+    </para>
+
+    <para>
+      If you downloaded the <filename>gimp-help</filename> tarball, unpack
+      it and change into the root of the newly created source tree. This release
+      fails to build for its first language, Catalan ("ca") but those
+      who wish to build the remaining languages can prepare for the build with the
+      following command:
+    </para>
+
 <screen><userinput>ALL_LINGUAS="da de el en en_GB es fi fr hr it ja ko lt nl nn pl ru sl sv zh_CN" \
 ./configure --prefix=/usr &&</userinput></screen>
 
-    <para>Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
-    you do not wish to install.</para>
+    <para>
+      Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
+      you do not wish to install.
+    </para>
 
-    <para>Alternatively, if you wish to build languages including catalan,
-    apply the patch:</para>
+    <para>
+      Alternatively, if you wish to build languages including Catalan,
+      apply the patch:
+    </para>
 
 <screen role="nodump"><userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz \
  | patch -p1 &&
 ./autogen.sh --prefix=/usr &&</userinput></screen>
 
-    <para>Again, you can specify a subset of languages by specifying
-    <envar>ALL_LINGUAS</envar> in front of <command>./autogen.sh</command>, but
-    this time including "ca".</para>
+    <para>
+      Again, you can specify a subset of languages by specifying
+      <envar>ALL_LINGUAS</envar> in front of <command>./autogen.sh</command>, but
+      this time including "ca".
+    </para>
+
+    <para>
+      Now build the help files:
+    </para>
 
-    <para>Now build the help files:</para>
 <screen><userinput>make</userinput></screen>
 
-    <para> Issue the following commands as the
-    <systemitem class="username">root</systemitem> user to install the help
-    files:</para>
+    <para>
+      Issue the following commands as the
+      <systemitem class="username">root</systemitem> user to install the help
+      files:
+    </para>
 
 <screen role="root"><userinput>make install &&
 chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/update-icons-and-desktop.xml"/>
+
   </sect2>
 
   <sect2 role="commands" id="gimp-cmd-explanations">
     <title>Command Explanations</title>
 
-    <para><command>LINGUAS="ca da de en en_GB ..."</command>: by
-    default, the help files will be rendered in all the available languages.
-    Remove the codes of any languages you do not wish to build.</para>
-
-    <para><parameter>--without-gvfs</parameter>: the choice of the backend to
-    handle URI information, e.g., when dragging images from a browser into the
-    <application>Gimp</application>, is made at compile time.  This parameter will
-    ensure that <application>cURL</application> is used at run-time, instead of
-    <application>Gvfs</application>.  You can omit this if you are installing
-    <application>Gvfs</application> AND will be running <command>gvfsd</command>,
-    e.g., in a <application>GNOME</application> desktop.</para>
-
-    <!-- These are required by gdk-pixbuf, which is required by GTK+-2
-    <para><option>-without-libpng</option>: This option is necessary if
-    <application>libpng</application> is not installed.</para>
-
-    <para><option>-without-libjpeg</option>: This option is necessary if
-    <application>libjpeg</application> is not installed.</para>
+    <para>
+      <command>LINGUAS="ca da de en en_GB ..."</command>: by
+      default, the help files will be rendered in all the available languages.
+      Remove the codes of any languages you do not wish to build.
+    </para>
 
-    <para><option>-without-libtiff</option>: This option is necessary if
-    <application>libtiff</application> is not installed.</para> -->
+    <para>
+      <parameter>--without-gvfs</parameter>: the choice of the backend to
+      handle URI information, e.g., when dragging images from a browser into the
+      <application>Gimp</application>, is made at compile time.  This parameter will
+      ensure that <application>cURL</application> is used at run-time, instead of
+      <application>Gvfs</application>.  You can omit this if you are installing
+      <application>Gvfs</application> AND will be running <command>gvfsd</command>,
+      e.g., in a <application>GNOME</application> desktop.
+    </para>
 
     <para><option>--disable-python</option>: This option is necessary if
     you have not installed <application>PyGTK</application>.</para>
 
-    <para><parameter>./autogen.sh --prefix=/usr</parameter>: In this case, using
-    <command>autoreconf</command> to regenerate <filename>configure</filename>
-    does not work, because of how the gimp-help developers chose to address
-    problems with the autotools.</para>
-
-    <para><parameter>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz</parameter>:
-    this patch is large, so it has been compressed with
-    <application>xz</application>.  You are encouraged to be suspicious of
-    all patches until you have looked at them. Use <command>view</command>
-    to read the compressed patch before you apply it.</para>
+    <para>
+      <parameter>./autogen.sh --prefix=/usr</parameter>: In this case, using
+      <command>autoreconf</command> to regenerate <filename>configure</filename>
+      does not work, because of how the gimp-help developers chose to address
+      problems with the autotools.
+    </para>
+
+    <para>
+      <parameter>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz</parameter>:
+      this patch is large, so it has been compressed with
+      <application>xz</application>. You are encouraged to be suspicious of
+      all patches until you have looked at them. Use <command>view</command>
+      to read the compressed patch before you apply it.
+    </para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -252,8 +291,10 @@
     <sect3 id="gimp-config">
       <title>Config Files</title>
 
-      <para><filename>/etc/gimp/2.0/*</filename> and
-      <filename>~/.gimp-2.8/gimprc</filename></para>
+      <para>
+        <filename>/etc/gimp/2.0/*</filename> and
+        <filename>~/.gimp-2.8/gimprc</filename>
+      </para>
 
       <indexterm zone="gimp gimp-config">
         <primary sortas="e-AA.gimp-2.0/gimprc">~/.gimp-2.0/gimprc</primary>
@@ -262,25 +303,32 @@
       <indexterm zone="gimp gimp-config">
         <primary sortas="e-etc-gimp-2.0-star">/etc/gimp/2.0/*</primary>
       </indexterm>
+
     </sect3>
 
     <sect3>
       <title>Configuration Information</title>
 
-      <para>The <application>Gimp</application> executes a configuration wizard
-      for each user upon their initial use of the program.</para>
-
-      <para>The <application>Gimp</application> executes the
-      <command>firefox</command> web browser by default to view the help
-      files.  If you do not have <application>Firefox</application>, or
-      prefer a different web browser, you can set a new system value in
-      <filename>/etc/gimp/2.0/gimprc</filename>.  Execute the following
-      command as the <systemitem class="username">root</systemitem> user,
-      replacing <replaceable><browser></replaceable> with your
-      preferred web browser:</para>
+      <para>
+        The <application>Gimp</application> executes a configuration wizard
+        for each user upon their initial use of the program.
+      </para>
+
+      <para>
+        The <application>Gimp</application> executes the
+        <command>firefox</command> web browser by default to view the help
+        files. If you do not have <application>Firefox</application>, or
+        prefer a different web browser, you can set a new system value in
+        <filename>/etc/gimp/2.0/gimprc</filename>. Execute the following
+        command as the <systemitem class="username">root</systemitem> user,
+        replacing <replaceable><browser></replaceable> with your
+        preferred web browser:
+      </para>
 
 <screen role="root"><userinput>echo '(web-browser "<replaceable><browser></replaceable> %s")' >> /etc/gimp/2.0/gimprc</userinput></screen>
+
     </sect3>
+
   </sect2>
 
   <sect2 role="content">
@@ -292,15 +340,29 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gimp, gimp-2.8, gimp-console, gimp-console-2.8,
-        and gimptool-2.0</seg>
-        <seg>libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
-        libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
-        libgimpthumb-2.0.so, libgimpui-2.0.so, libgimpwidgets-2.0.so, and many
-        other modules and plugin libraries</seg>
-        <seg>/etc/gimp, /usr/include/gimp-2.0, /usr/lib/gimp,
-        /usr/share/gimp and
-        /usr/share/gtk-doc/html/libgimp{,base,color,config,math,module,thumb,widgets}</seg>
+        <seg>
+          gimp, gimp-2.8, gimp-console, gimp-console-2.8 and
+          gimptool-2.0
+        </seg>
+        <seg>
+          libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
+          libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
+          libgimpthumb-2.0.so, libgimpui-2.0.so and libgimpwidgets-2.0.so
+        </seg>
+        <seg>
+          /etc/gimp,
+          /usr/include/gimp-2.0,
+          /usr/lib/gimp,
+          /usr/share/gimp,
+          /usr/share/gtk-doc/html/libgimp,
+          /usr/share/gtk-doc/html/libgimpbase,
+          /usr/share/gtk-doc/html/libgimpcolor,
+          /usr/share/gtk-doc/html/libgimpconfig,
+          /usr/share/gtk-doc/html/libgimpmath,
+          /usr/share/gtk-doc/html/libgimpmodule,
+          /usr/share/gtk-doc/html/libgimpthumb and
+          /usr/share/gtk-doc/html/libgimpwidgets
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -312,7 +374,9 @@
       <varlistentry id="gimp-prog">
         <term><command>gimp</command></term>
         <listitem>
-          <para>is a symbolic link to <command>gimp-2.8</command>.</para>
+          <para>
+            is a symbolic link to <command>gimp-2.8</command>.
+          </para>
           <indexterm zone="gimp gimp-prog">
             <primary sortas="b-gimp">gimp</primary>
           </indexterm>
@@ -322,8 +386,10 @@
       <varlistentry id="gimp-2.8">
         <term><command>gimp-2.8</command></term>
         <listitem>
-          <para>is the Gnu Image Manipulation Program. It works with a variety
-          of image formats and provides a large selection of tools.</para>
+          <para>
+            is the Gnu Image Manipulation Program. It works with a variety
+            of image formats and provides a large selection of tools.
+          </para>
           <indexterm zone="gimp gimp-2.8">
             <primary sortas="b-gimp-2.8">gimp-2.8</primary>
           </indexterm>
@@ -333,7 +399,9 @@
       <varlistentry id="gimp-console">
         <term><command>gimp-console</command></term>
         <listitem>
-          <para>is a symbolic link to <command>gimp-console-2.8</command>.</para>
+          <para>
+            is a symbolic link to <command>gimp-console-2.8</command>.
+          </para>
           <indexterm zone="gimp gimp-console">
             <primary sortas="b-gimp-console">gimp-console</primary>
           </indexterm>
@@ -343,9 +411,11 @@
       <varlistentry id="gimp-console-2.8">
         <term><command>gimp-console-2.8</command></term>
         <listitem>
-          <para>is a console program that behaves as if The
-          <application>Gimp</application> was called with the
-          <option>--no-interface</option> command-line option.</para>
+          <para>
+            is a console program that behaves as if The
+            <application>Gimp</application> was called with the
+            <option>--no-interface</option> command-line option.
+          </para>
           <indexterm zone="gimp gimp-console-2.8">
             <primary sortas="b-gimp-console-2.8">gimp-console-2.8</primary>
           </indexterm>
@@ -355,11 +425,13 @@
       <varlistentry id="gimptool-2.0">
         <term><command>gimptool-2.0</command></term>
         <listitem>
-          <para>is a tool that can build plug-ins or scripts and install them
-          if they are distributed in one source file.
-          <command>gimptool-2.0</command> can also be used by programs that
-          need to know what libraries and include-paths The
-          <application>Gimp</application> was compiled with.</para>
+          <para>
+            is a tool that can build plug-ins or scripts and install them
+            if they are distributed in one source file.
+            <command>gimptool-2.0</command> can also be used by programs that
+            need to know what libraries and include-paths The
+            <application>Gimp</application> was compiled with.
+          </para>
           <indexterm zone="gimp gimptool-2.0">
             <primary sortas="b-gimptool-2.0">gimptool-2.0</primary>
           </indexterm>
@@ -369,9 +441,11 @@
       <varlistentry id="libgimp-2.0">
         <term><filename class="libraryfile">libgimp-2.0.so</filename></term>
         <listitem>
-          <para> provides C bindings for The <application>Gimp</application>'s
-          Procedural Database (PDB) which offers an interface to core functions
-          and to functionality provided by plug-ins.</para>
+          <para>
+            provides C bindings for The <application>Gimp</application>'s
+            Procedural Database (PDB) which offers an interface to core functions
+            and to functionality provided by plug-ins.
+          </para>
           <indexterm zone="gimp libgimp-2.0">
             <primary sortas="c-libgimp-2.0">libgimp-2.0.so</primary>
           </indexterm>
@@ -381,11 +455,13 @@
       <varlistentry id="libgimpbase-2.0">
         <term><filename class="libraryfile">libgimpbase-2.0.so</filename></term>
         <listitem>
-          <para>provides the C functions for basic
-          <application>Gimp</application> functionality such as determining
-          enumeration data types, gettext translation, determining The
-          <application>Gimp</application>'s version number and capabilities,
-          handling data files and accessing the environment.</para>
+          <para>
+            provides the C functions for basic
+            <application>Gimp</application> functionality such as determining
+            enumeration data types, gettext translation, determining The
+            <application>Gimp</application>'s version number and capabilities,
+            handling data files and accessing the environment.
+          </para>
           <indexterm zone="gimp libgimpbase-2.0">
             <primary sortas="c-libgimpbase-2.0">libgimpbase-2.0.so</primary>
           </indexterm>
@@ -396,9 +472,11 @@
         <term><filename
         class="libraryfile">libgimpcolor-2.0.so</filename></term>
         <listitem>
-          <para>provides the C functions relating to RGB, HSV and CMYK colors as
-          well as converting colors between different color models and
-          performing adaptive supersampling on an area.</para>
+          <para>
+            provides the C functions relating to RGB, HSV and CMYK colors as
+            well as converting colors between different color models and
+            performing adaptive supersampling on an area.
+          </para>
           <indexterm zone="gimp libgimpcolor-2.0">
             <primary sortas="c-libgimpcolor-2.0">libgimpcolor-2.0.so</primary>
           </indexterm>
@@ -409,7 +487,8 @@
         <term><filename
         class="libraryfile">libgimpconfig-2.0.so</filename></term>
         <listitem>
-          <para>contains C functions for reading and writing config information.
+          <para>
+            contains C functions for reading and writing config information.
           </para>
           <indexterm zone="gimp libgimpconfig-2.0">
             <primary sortas="c-libgimpconfig-2.0">libgimpconfig-2.0.so</primary>
@@ -420,9 +499,11 @@
       <varlistentry id="libgimpmath-2.0">
         <term><filename class="libraryfile">libgimpmath-2.0.so</filename></term>
         <listitem>
-          <para>contains C functions which provide mathematical definitions and
-          macros, manipulate 3x3 transformation matrices, set up and manipulate
-          vectors and the MD5 message-digest algorithm.</para>
+          <para>
+            contains C functions which provide mathematical definitions and
+            macros, manipulate 3x3 transformation matrices, set up and manipulate
+            vectors and the MD5 message-digest algorithm.
+          </para>
           <indexterm zone="gimp libgimpmath-2.0">
             <primary sortas="c-libgimpmath-2.0">libgimpmath-2.0.so</primary>
           </indexterm>
@@ -430,12 +511,13 @@
       </varlistentry>
 
       <varlistentry id="libgimpmodule-2.0">
-        <term><filename
-        class="libraryfile">libgimpmodule-2.0.so</filename></term>
+        <term><filename class="libraryfile">libgimpmodule-2.0.so</filename></term>
         <listitem>
-          <para>provides the C functions which implements module loading using
-          GModule and keeps a list of GimpModule's found in a given
-          searchpath.</para>
+          <para>
+            provides the C functions which implements module loading using
+            GModule and keeps a list of GimpModule's found in a given
+            searchpath.
+          </para>
           <indexterm zone="gimp libgimpmodule-2.0">
             <primary sortas="c-libgimpmodule-2.0">libgimpmodule-2.0.so</primary>
           </indexterm>
@@ -443,11 +525,12 @@
       </varlistentry>
 
       <varlistentry id="libgimpthumb-2.0">
-        <term><filename
-        class="libraryfile">libgimpthumb-2.0.so</filename></term>
+        <term><filename class="libraryfile">libgimpthumb-2.0.so</filename></term>
         <listitem>
-          <para>provides the C functions for handling The
-          <application>Gimp</application>'s thumbnail objects.</para>
+          <para>
+            provides the C functions for handling The
+            <application>Gimp</application>'s thumbnail objects.
+          </para>
           <indexterm zone="gimp libgimpthumb-2.0">
             <primary sortas="c-libgimpthumb-2.0">libgimpthumb-2.0.so</primary>
           </indexterm>
@@ -457,8 +540,10 @@
       <varlistentry id="libgimpui-2.0">
         <term><filename class="libraryfile">libgimpui-2.0.so</filename></term>
         <listitem>
-          <para>contains The <application>Gimp</application>'s common user
-          interface functions.</para>
+          <para>
+            contains The <application>Gimp</application>'s common user
+            interface functions.
+          </para>
           <indexterm zone="gimp libgimpui-2.0">
             <primary sortas="c-libgimpui-2.0">libgimpui-2.0.so</primary>
           </indexterm>
@@ -466,18 +551,22 @@
       </varlistentry>
 
       <varlistentry id="libgimpwidgets-2.0">
-        <term><filename
-        class="libraryfile">libgimpwidgets-2.0.so</filename></term>
+        <term><filename class="libraryfile">libgimpwidgets-2.0.so</filename></term>
         <listitem>
-          <para>contains The <application>Gimp</application>
-          and <application>GTK</application>'s widget creation and
-          manipulation functions.</para>
+          <para>
+            contains The <application>Gimp</application>
+            and <application>GTK</application>'s widget creation and
+            manipulation functions.
+          </para>
           <indexterm zone="gimp libgimpwidgets-2.0">
             <primary
             sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>



More information about the blfs-book mailing list