Author: renodr
Date: Tue May  5 19:14:01 2020
New Revision: 23079

Log:
Update to faad2-2_9_2
Update to Inkscape-1.0
Add gdl for inkscape
Add double-conversion for inkscape

Added:
   trunk/BOOK/general/genlib/double-conversion.xml   (contents, props changed)
      - copied, changed from r23077, trunk/BOOK/template/template.xml
   trunk/BOOK/x/lib/gdl.xml   (contents, props changed)
      - copied, changed from r23077, trunk/BOOK/template/template.xml
Modified:
   trunk/BOOK/general/genlib/genlib.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/faad2.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/x/lib/lib.xml
   trunk/BOOK/xsoft/other/inkscape.xml

Copied and modified: trunk/BOOK/general/genlib/double-conversion.xml (from 
r23077, trunk/BOOK/template/template.xml)
==============================================================================
--- trunk/BOOK/template/template.xml    Tue May  5 08:23:20 2020        
(r23077, copy source)
+++ trunk/BOOK/general/genlib/double-conversion.xml     Tue May  5 19:14:01 
2020        (r23079)
@@ -4,246 +4,107 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!-- Place this in the packages.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
-
-  <!ENTITY TEMPLATE-download-http "http://";>
-  <!ENTITY TEMPLATE-download-ftp  "ftp://";>
-  <!ENTITY TEMPLATE-md5sum        "MD5 sum">
-  <!ENTITY TEMPLATE-size          "?? MB">
-  <!ENTITY TEMPLATE-buildsize     "?? MB">
-  <!ENTITY TEMPLATE-time          "?? SBU">
-<!-- SBU should be rounded to integer if greater than 10, to one
-     decimal if below 10, and should be "less than 0.1 SBU" if
-     below 0.1. If the SBU without parallelisation is too long,
-     it is acceptable to give the value "with parallelism=N", where
-     N is the number of threads used. Note that some build system
-     automatically fix N equal to the number of available CPU cores
-     on the machine. -->
+  <!ENTITY double-conversion-download-http 
"https://github.com/google/double-conversion/archive/v&double-conversion-version;/double-converion-&double-conversion-version;.tar.gz";>
+  <!ENTITY double-conversion-download-ftp  " ">
+  <!ENTITY double-conversion-md5sum        "e94d3a33a417e692e5600e75019f0272">
+  <!ENTITY double-conversion-size          "6.7 MB">
+  <!ENTITY double-conversion-buildsize     "54 MB">
+  <!ENTITY double-conversion-time          "0.1 SBU">
+
 ]>
 
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
-  <?dbhtml filename="TEMPLATE.html"?>
+<sect1 id="double-conversion" 
xreflabel="double-conversion-&double-conversion-version;">
+  <?dbhtml filename="double-conversion.html"?>
 
   <sect1info>
-    <!-- this part gets updated when you commit, IFF you set the properties:
-      first, svn add path/to/thisfile.xml and then
-      svn propset svn:mime-type text/plain path/to/thisfile.xml and
-      svn propset svn:keywords "Date LastChangedBy" path/to/thisfile.xml -->
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <!-- No other tags inside any title.
-       Use Title Case in All Titles -->
-  <title>TEMPLATE-&TEMPLATE-version;</title>
+  <title>Double-conversion-&double-conversion-version;</title>
 
-  <indexterm zone="TEMPLATE">
-    <primary sortas="a-TEMPLATE">TEMPLATE</primary>
+  <indexterm zone="double-conversion">
+    <primary sortas="a-double-conversion">double-conversion</primary>
   </indexterm>
 
-  <!--Required section-->
   <sect2 role="package">
-    <title>Introduction to TEMPLATE</title>
+    <title>Introduction to Double-conversion</title>
 
     <para>
-      The <application>TEMPLATE</application> package contains...
-      This is useful for...
+      The <application>Double-conversion</application> package contains a 
+      library that facilitates binary-to-decimal and decimal-to-binary 
routines 
+      for IEEE doubles.
     </para>
 
-    <!-- if it builds but hasn't been tested: -->
-    &lfs9?_built;
-    <!-- if it works: -->
-    &lfs9?_checked;
+    &lfs91_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&TEMPLATE-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&TEMPLATE-download-ftp;"/>
+          Download (HTTP): <ulink url="&double-conversion-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &TEMPLATE-md5sum;
+          Download (FTP): <ulink url="&double-conversion-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &TEMPLATE-size;
+          Download MD5 sum: &double-conversion-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &TEMPLATE-buildsize;
+          Download size: &double-conversion-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &TEMPLATE-time;
+          Estimated disk space required: &double-conversion-buildsize;
         </para>
       </listitem>
-    </itemizedlist>
-
-    <!-- As required -->
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required patch:
-          <ulink 
url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/>
+          Estimated build time: &double-conversion-time;
         </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Double-conversion Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
-      a sentence. If there are more than two, they must be separated by commas
-      with the last member having "and" in front of it. The use of a serial
-      comma is preferred (a comma after the next to last member before the
-      "and"). BLFS_DEPENDENCY should be an "id" attribute defined somewhere
-      in the book (usually in a <sect1>). -->
-      <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/> (runtime)
-      <!-- Specifying that a dependency is a runtime one, may avoid circular
-      dependencies. Add role="runtime" to help jhalfs -->
-    </para>
-
-    <!-- It may be nice to have a separate section for runtime dependencies.
-    Do it as follows. -->
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/>
-    </para>
-
-    <!-- As required -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
-      a sentence. See above for the use of "and" and commas. Normally, neither
-      required nor recommended dependencies should be <ulink>. -->
-      <xref linkend="ANOTHER_RECOMMENDED_DEP"/> (required if building
-        <xref role="nodep" linkend="SOME_FANCY_PACKAGE"/>) <!-- You may need
-      to refer to another package, which is not a dependency. Use the role
-      attibute with value "nodep". -->
-      <!-- See above for runtime dependencies -->
-    </para>
-
-    <!-- As required -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="BLFS_DEPENDENCY"/> and
-      <ulink url="http://www.some.url/";>EXTERNAL DEPENDENCY</ulink>
-      <!-- notice no period as this is not a sentence. See above for the use
-      of commas and "and". The order should <xref> before <ulink>.-->
-      <!-- See above how to refer to another package, which is not a
-      dependency. -->
+      <xref linkend="cmake"/>
     </para>
 
     <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
-    </para>
-  </sect2>
-
-  <!-- Optional section for packages that need a specific kernel
-  configuration-->
-  <sect2 role="kernel" id="TEMPLATE-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile 
the
-      kernel if necessary:
-    </para>
-
-<!-- Spaces are significant in <screen> sections -->
-<screen><literal>Master section ---&gt;
-  Subsection ---&gt;
-    [*]     Required parameter                     [CONFIG_REQU_PAR]
-    &lt;*&gt;     Required parameter (not as module)     [CONFIG_REQU_PAR_NMOD]
-    &lt;*/M&gt;   Required parameter (could be a module) [CONFIG_REQU_PAR_MOD]
-    &lt;*/M/ &gt; Optional parameter                     [CONFIG_OPT_PAR]
-    [ ] Incompatible parameter                     [CONFIG_INCOMP_PAR]
-    &lt; &gt; Incompatible parameter (even as module)    
[CONFIG_INCOMP_PAR_MOD]</literal></screen>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options are
-      selected. As much as possible, the layout should be the same as in
-      kernel menus.
+      User Notes: <ulink url="&blfs-wiki;/double-conversion"/>
     </para>
-
-    <indexterm zone="TEMPLATE TEMPLATE-kernel">
-      <primary sortas="d-TEMPLATE">TEMPLATE</primary>
-    </indexterm>
   </sect2>
 
-  <!--Required section-->
   <sect2 role="installation">
-    <title>Installation of TEMPLATE</title>
+    <title>Installation of Double-conversion</title>
 
     <para>
-      Install <application>TEMPLATE</application> by running the following
+      Install <application>Double-conversion</application> by running the 
following
       commands:
     </para>
 
-<!-- Spaces are significant in <screen> sections -->
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- Optional paragraph. Add it when some instructions for building
-         documentation need optional or external packages. The remap="doc"
-         attribute signals those kind of instructions. Note: instructions
-         for generating documentation that can be built with
-         recommended/required/LFS book packages may be included in the
-         same block as configure and make. -->
-
-    <para>
-      If you have installed <xref linkend="optional-dep"/>, you can build
-      the documentation (or additional formats of the documentation) by 
issuing:    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf</userinput></screen>
-
-    <!-- adjust the instructions as needed. -->
-         
-
-    <!-- Optional paragraph. Use one of the two mentions below about a test
-         suite, delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than 'make check', revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <!-- Sometimes, more complex instructions are needed for running tests, or
-         they need to be run as root. They can then be put inside screen
-         tags using the remap="test" attribute as in the following example: -->
 
-    <para>
-      If you want to run the tests, first create some needed files:
-    </para>
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
 
-<screen remap="test"><userinput>make prepare-tests</userinput></screen>
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DBUILD_SHARED_LIBS=ON      \
+      -DBUILD_TESTING=ON          &amp;&amp;
+make</userinput></screen>
 
     <para>
-      Then run the tests as the <systemitem class="username">root</systemitem>
-      user:
+      To test the results, issue: <command>make test</command>.
     </para>
 
-<screen role="root" remap="test"><userinput>make tests</userinput></screen>
-
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
@@ -251,148 +112,36 @@
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
-    <!-- Optional paragraph for documentation that has been generated using
-         optional/external packages: -->
-
-    <para>
-      If you have built the optional documentation, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm 755 
/usr/share/doc/template-&template-version; &amp;&amp;
-mv doc/* /usr/share/doc/template-&template-version;</userinput></screen>
-
-  <!--Optional section-->
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <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"/>
-
-    <para>
-      <command>COMMAND</command>: This command does something.
-    </para>
-
     <para>
-      <parameter>--PARAMETER</parameter>: This parameter does something
-      mandatory for BLFS purposes. It will be in the instructions above. It is
-      not optional and is why it is listed as a parameter and not an option.
+      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces cmake 
to build
+      a shared version of the library instead of the static version.
     </para>
 
     <para>
-      <option>--OPTION</option>: This option does something optionally per the
-      user's desires. It is not listed in the instructions above, but instead,
-      is listed here because many (some) readers may want to include it.
-    </para>
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using TEMPLATE</title>
-
-    <para>
-      Stuff about how to use TEMPLATE to do something. This section is rarely
-      used.
+      <parameter>-DBUILD_TESTING=ON</parameter>: This switch builds the test 
programs.
     </para>
   </sect2>
 
-  <!--Optional section-->
-  <sect2 role="configuration">
-    <title>Configuring TEMPLATE</title>
-
-    <sect3 id="TEMPLATE-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.Configfilename1</filename> and
-        <filename>/etc/path/Configfilename2</filename> <!-- notice no period 
as this is not a sentence-->
-      </para>
-
-      <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
-      </indexterm>
-
-      <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary
-        sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Blah blah blah about config.
-      </para>
-
-<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
-
-<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
-
-      <!-- File creation. Add the appropriate <indexterm> block if needed.-->
-      <para>
-        Create the file .... for ...
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /PATH/FILENAME &lt;&lt; "EOF"
-<literal># Begin FILENAME
-
-TEXT
-
-# End FILENAME</literal>
-EOF</userinput></screen>
-    </sect3>
-
-    <sect3  id="TEMPLATE-init">
-      <title>Boot Script</title>
-
-      <para>
-        To automatically start the <command>TEMPLATE</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="TEMPLATE TEMPLATE-init">
-        <primary sortas="f-TEMPLATE">TEMPLATE</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <!--Required section-->
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program(s)</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <!-- If there were no programs, libraries, or directories created, then
-           we would list the section as "None". However, a decision must have
-           been made to change the "None" to just removing the whole section
-           because I've noticed that many packages have had the "None"
-           removed and the section completely removed as well. The reasoning
-           was that by putting "None", it appears as we know there are none.
-           Without anything it appears as we are not sure. -->
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          PROGRAM1, PROGRAM2 and PROGRAM3.
+          None
         </seg>
         <seg>
-          libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so.
+          libdouble-conversion.so
         </seg>
         <seg>
-          /etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
-          /usr/share/TEMPLATE-&TEMPLATE-version;,
-          /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
-          /var/lib/TEMPLATE.
+          /usr/include/double-conversion
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -402,42 +151,14 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="PROGRAM1">
-        <term><command>PROGRAM1</command></term>
-        <listitem>
-          <para>
-            does this ..... (end the sentence with a period).
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM1">
-            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="PROGRAM2">
-        <term><command>PROGRAM2</command></term>
-        <listitem>
-          <para>
-            does this ..... (end the sentence with a period).
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM2">
-            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
+      <varlistentry id="libdouble-conversion">
+        <term><filename 
class="libraryfile">libdouble-conversion.so</filename></term>
         <listitem>
           <para>
-            contains functions that ..... (end the sentence with a period).
+            provides binary-to-decimal and decimal-to-binary routines for IEEE 
doubles.
           </para>
-          <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
+          <indexterm zone="double-conversion libdouble-conversion">
+            <primary 
sortas="c-libdouble-conversion">libdouble-conversion.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/general/genlib/genlib.xml
==============================================================================
--- trunk/BOOK/general/genlib/genlib.xml        Tue May  5 08:31:20 2020        
(r23078)
+++ trunk/BOOK/general/genlib/genlib.xml        Tue May  5 19:14:01 2020        
(r23079)
@@ -61,6 +61,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="brotli.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="clucene.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dbus-glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="double-conversion.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="enchant.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="exempi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="fftw.xml"/>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Tue May  5 08:31:20 
2020        (r23078)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Tue May  5 19:14:01 
2020        (r23079)
@@ -45,6 +45,22 @@
       <para>May 5th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Added double-conversion to the book. Fixes
+          <ulink url="&blfs-ticket-root;13504">#13504</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Added gdl to the book. Fixes
+          <ulink url="&blfs-ticket-root;13503">#13503</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Inkscape-1.0. Fixes
+          <ulink url="&blfs-ticket-root;13501">#13501</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to faad2-2.9.2. Fixes
+          <ulink url="&blfs-ticket-root;13502">#13502</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to gdm-3.36.2. Fixes
           <ulink url="&blfs-ticket-root;13499">#13499</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/multimedia/libdriv/faad2.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/faad2.xml     Tue May  5 08:31:20 2020        
(r23078)
+++ trunk/BOOK/multimedia/libdriv/faad2.xml     Tue May  5 19:14:01 2020        
(r23079)
@@ -6,9 +6,9 @@
 
   <!ENTITY faad2-download-http 
"https://github.com/knik0/faad2/archive/&faad2-version;/faad2-&faad2-version;.tar.gz";>
   <!ENTITY faad2-download-ftp  " ">
-  <!ENTITY faad2-md5sum        "a880fadc4fc4a564d0833f0c1e7c08b5">
-  <!ENTITY faad2-size          "784 KB">
-  <!ENTITY faad2-buildsize     "14 MB">
+  <!ENTITY faad2-md5sum        "ed0db61d6ffa3e67748c3f03468c6eec">
+  <!ENTITY faad2-size          "788 KB">
+  <!ENTITY faad2-buildsize     "16 MB">
   <!ENTITY faad2-time          "0.2 SBU">
 ]>
 

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Tue May  5 08:31:20 2020        (r23078)
+++ trunk/BOOK/packages.ent     Tue May  5 19:14:01 2020        (r23079)
@@ -93,6 +93,7 @@
 <!ENTITY brotli-version               "1.0.7">
 <!ENTITY clucene-version              "2.3.3.4">
 <!ENTITY dbus-glib-version            "0.110">
+<!ENTITY double-conversion-version    "3.1.5">
 <!ENTITY enchant-version              "2.2.8">
 <!ENTITY exempi-version               "2.5.1">
 <!ENTITY expat-version                "2.1.0">
@@ -716,6 +717,7 @@
 <!ENTITY fltk-version                 "1.3.5">
 <!ENTITY freeglut-version             "3.2.1">
 <!ENTITY gdk-pixbuf-version           "2.40.0">
+<!ENTITY gdl-version                  "3.34.0">
 <!ENTITY glew-version                 "2.1.0">
 <!ENTITY glu-version                  "9.0.1">
 <!ENTITY goffice010-version           "0.10.46">
@@ -916,8 +918,11 @@
 <!ENTITY gimp-version                 "2.10.18">
 <!ENTITY hexchat-version              "2.14.3">
 <!ENTITY icedtea-web-version          "1.7.1">
-<!ENTITY inkscape-minor-version       "0.92">
-<!ENTITY inkscape-version             "&inkscape-minor-version;.5">
+<!ENTITY inkscape-minor-version       "1.0">
+<!-- For point versions -->
+<!--<!ENTITY inkscape-version             "&inkscape-minor-version;.5">-->
+<!-- For minor versions -->
+<!ENTITY inkscape-version             "&inkscape-minor-version;">
 <!ENTITY pan-version                  "0.133">
 <!ENTITY pidgin-version               "2.13.0">
 <!ENTITY rox-filer-version            "2.11">
@@ -943,7 +948,7 @@
 <!ENTITY alsa-oss-version             "1.1.8">
 <!ENTITY audiofile-version            "0.3.6">
 <!ENTITY faac-version                 "1_30">
-<!ENTITY faad2-version                "2_9_1">
+<!ENTITY faad2-version                "2_9_2">
 <!ENTITY fdk-aac-version              "2.0.1">
 <!ENTITY flac-version                 "1.3.3">
 <!ENTITY frei0r-version               "1.7.0">

Copied and modified: trunk/BOOK/x/lib/gdl.xml (from r23077, 
trunk/BOOK/template/template.xml)
==============================================================================
--- trunk/BOOK/template/template.xml    Tue May  5 08:23:20 2020        
(r23077, copy source)
+++ trunk/BOOK/x/lib/gdl.xml    Tue May  5 19:14:01 2020        (r23079)
@@ -4,266 +4,106 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!-- Place this in the packages.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
-
-  <!ENTITY TEMPLATE-download-http "http://";>
-  <!ENTITY TEMPLATE-download-ftp  "ftp://";>
-  <!ENTITY TEMPLATE-md5sum        "MD5 sum">
-  <!ENTITY TEMPLATE-size          "?? MB">
-  <!ENTITY TEMPLATE-buildsize     "?? MB">
-  <!ENTITY TEMPLATE-time          "?? SBU">
-<!-- SBU should be rounded to integer if greater than 10, to one
-     decimal if below 10, and should be "less than 0.1 SBU" if
-     below 0.1. If the SBU without parallelisation is too long,
-     it is acceptable to give the value "with parallelism=N", where
-     N is the number of threads used. Note that some build system
-     automatically fix N equal to the number of available CPU cores
-     on the machine. -->
+  <!ENTITY gdl-download-http 
"&gnome-download-http;/gdl/&gnome-minor-34;/gdl-&gdl-version;.tar.xz">
+  <!ENTITY gdl-download-ftp  
"&gnome-download-ftp;/gdl/&gnome-minor-34;/gdl-&gdl-version;.tar.xz">
+  <!ENTITY gdl-md5sum        "d624f2ca85555402828d5c4a98912b82">
+  <!ENTITY gdl-size          "520 KB">
+  <!ENTITY gdl-buildsize     "14 MB">
+  <!ENTITY gdl-time          "0.1 SBU">
 ]>
 
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="TEMPLATE" xreflabel="TEMPLATE-&TEMPLATE-version;">
-  <?dbhtml filename="TEMPLATE.html"?>
+<sect1 id="gdl" xreflabel="GDL-&gdl-version;">
+  <?dbhtml filename="gdl.html"?>
 
   <sect1info>
-    <!-- this part gets updated when you commit, IFF you set the properties:
-      first, svn add path/to/thisfile.xml and then
-      svn propset svn:mime-type text/plain path/to/thisfile.xml and
-      svn propset svn:keywords "Date LastChangedBy" path/to/thisfile.xml -->
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <!-- No other tags inside any title.
-       Use Title Case in All Titles -->
-  <title>TEMPLATE-&TEMPLATE-version;</title>
+  <title>GDL-&gdl-version;</title>
 
-  <indexterm zone="TEMPLATE">
-    <primary sortas="a-TEMPLATE">TEMPLATE</primary>
+  <indexterm zone="gdl">
+    <primary sortas="a-GDL">GDL</primary>
   </indexterm>
 
-  <!--Required section-->
   <sect2 role="package">
-    <title>Introduction to TEMPLATE</title>
+    <title>Introduction to GDL</title>
 
     <para>
-      The <application>TEMPLATE</application> package contains...
-      This is useful for...
+      The GDL package provides a library that is useful for docking objects in 
+      GTK+ applications.
     </para>
 
-    <!-- if it builds but hasn't been tested: -->
-    &lfs9?_built;
-    <!-- if it works: -->
-    &lfs9?_checked;
+    &lfs91_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&TEMPLATE-download-http;"/>
+          Download (HTTP): <ulink url="&gdl-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&TEMPLATE-download-ftp;"/>
+          Download (FTP): <ulink url="&gdl-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &TEMPLATE-md5sum;
+          Download MD5 sum: &gdl-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &TEMPLATE-size;
+          Download size: &gdl-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &TEMPLATE-buildsize;
+          Estimated disk space required: &gdl-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &TEMPLATE-time;
+          Estimated build time: &gdl-time;
         </para>
       </listitem>
     </itemizedlist>
 
-    <!-- As required -->
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink 
url="&patch-root;/TEMPLATE-&TEMPLATE-version;-patch_name-patch_version.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">GDL Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
-      a sentence. If there are more than two, they must be separated by commas
-      with the last member having "and" in front of it. The use of a serial
-      comma is preferred (a comma after the next to last member before the
-      "and"). BLFS_DEPENDENCY should be an "id" attribute defined somewhere
-      in the book (usually in a <sect1>). -->
-      <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/> (runtime)
-      <!-- Specifying that a dependency is a runtime one, may avoid circular
-      dependencies. Add role="runtime" to help jhalfs -->
-    </para>
-
-    <!-- It may be nice to have a separate section for runtime dependencies.
-    Do it as follows. -->
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="RUNTIME_DEPENDENCY"/>
-    </para>
-
-    <!-- As required -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="BLFS_DEPENDENCY"/> <!-- notice no period as this is not
-      a sentence. See above for the use of "and" and commas. Normally, neither
-      required nor recommended dependencies should be <ulink>. -->
-      <xref linkend="ANOTHER_RECOMMENDED_DEP"/> (required if building
-        <xref role="nodep" linkend="SOME_FANCY_PACKAGE"/>) <!-- You may need
-      to refer to another package, which is not a dependency. Use the role
-      attibute with value "nodep". -->
-      <!-- See above for runtime dependencies -->
-    </para>
-
-    <!-- As required -->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="BLFS_DEPENDENCY"/> and
-      <ulink url="http://www.some.url/";>EXTERNAL DEPENDENCY</ulink>
-      <!-- notice no period as this is not a sentence. See above for the use
-      of commas and "and". The order should <xref> before <ulink>.-->
-      <!-- See above how to refer to another package, which is not a
-      dependency. -->
+      <xref linkend="gtk3"/>
     </para>
 
     <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
+      User Notes: <ulink url="&blfs-wiki;/gdl"/>
     </para>
   </sect2>
 
-  <!-- Optional section for packages that need a specific kernel
-  configuration-->
-  <sect2 role="kernel" id="TEMPLATE-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile 
the
-      kernel if necessary:
-    </para>
-
-<!-- Spaces are significant in <screen> sections -->
-<screen><literal>Master section ---&gt;
-  Subsection ---&gt;
-    [*]     Required parameter                     [CONFIG_REQU_PAR]
-    &lt;*&gt;     Required parameter (not as module)     [CONFIG_REQU_PAR_NMOD]
-    &lt;*/M&gt;   Required parameter (could be a module) [CONFIG_REQU_PAR_MOD]
-    &lt;*/M/ &gt; Optional parameter                     [CONFIG_OPT_PAR]
-    [ ] Incompatible parameter                     [CONFIG_INCOMP_PAR]
-    &lt; &gt; Incompatible parameter (even as module)    
[CONFIG_INCOMP_PAR_MOD]</literal></screen>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options are
-      selected. As much as possible, the layout should be the same as in
-      kernel menus.
-    </para>
-
-    <indexterm zone="TEMPLATE TEMPLATE-kernel">
-      <primary sortas="d-TEMPLATE">TEMPLATE</primary>
-    </indexterm>
-  </sect2>
-
-  <!--Required section-->
   <sect2 role="installation">
-    <title>Installation of TEMPLATE</title>
+    <title>Installation of GDL</title>
 
     <para>
-      Install <application>TEMPLATE</application> by running the following
+      Install <application>GDL</application> by running the following
       commands:
     </para>
 
-<!-- Spaces are significant in <screen> sections -->
 <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
-    <!-- Optional paragraph. Add it when some instructions for building
-         documentation need optional or external packages. The remap="doc"
-         attribute signals those kind of instructions. Note: instructions
-         for generating documentation that can be built with
-         recommended/required/LFS book packages may be included in the
-         same block as configure and make. -->
-
-    <para>
-      If you have installed <xref linkend="optional-dep"/>, you can build
-      the documentation (or additional formats of the documentation) by 
issuing:    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf</userinput></screen>
-
-    <!-- adjust the instructions as needed. -->
-         
-
-    <!-- Optional paragraph. Use one of the two mentions below about a test
-         suite, delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than 'make check', revise the
-         line to reflect the actual syntax to run the test suite -->
-
     <para>
       This package does not come with a test suite.
     </para>
 
     <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <!-- Sometimes, more complex instructions are needed for running tests, or
-         they need to be run as root. They can then be put inside screen
-         tags using the remap="test" attribute as in the following example: -->
-
-    <para>
-      If you want to run the tests, first create some needed files:
-    </para>
-
-<screen remap="test"><userinput>make prepare-tests</userinput></screen>
-
-    <para>
-      Then run the tests as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root" remap="test"><userinput>make tests</userinput></screen>
-
-    <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
-    <!-- Optional paragraph for documentation that has been generated using
-         optional/external packages: -->
-
-    <para>
-      If you have built the optional documentation, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm 755 
/usr/share/doc/template-&template-version; &amp;&amp;
-mv doc/* /usr/share/doc/template-&template-version;</userinput></screen>
-
-  <!--Optional section-->
   <sect2 role="commands">
     <title>Command Explanations</title>
 
@@ -273,126 +113,26 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para>
-      <command>COMMAND</command>: This command does something.
-    </para>
-
-    <para>
-      <parameter>--PARAMETER</parameter>: This parameter does something
-      mandatory for BLFS purposes. It will be in the instructions above. It is
-      not optional and is why it is listed as a parameter and not an option.
-    </para>
-
-    <para>
-      <option>--OPTION</option>: This option does something optionally per the
-      user's desires. It is not listed in the instructions above, but instead,
-      is listed here because many (some) readers may want to include it.
-    </para>
   </sect2>
 
-  <sect2 role="using">
-    <title>Using TEMPLATE</title>
-
-    <para>
-      Stuff about how to use TEMPLATE to do something. This section is rarely
-      used.
-    </para>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="configuration">
-    <title>Configuring TEMPLATE</title>
-
-    <sect3 id="TEMPLATE-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.Configfilename1</filename> and
-        <filename>/etc/path/Configfilename2</filename> <!-- notice no period 
as this is not a sentence-->
-      </para>
-
-      <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary sortas="e-AA.Configfilename1">~/.Configfilename1</primary>
-      </indexterm>
-
-      <indexterm zone="TEMPLATE TEMPLATE-config">
-        <primary
-        sortas="e-etc-path-Configfilename2">/etc/path/Configfilename2</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        Blah blah blah about config.
-      </para>
-
-<screen><userinput>USER CONFIG COMMANDS</userinput></screen>
-
-<screen role="root"><userinput>ROOT CONFIG COMMANDS</userinput></screen>
-
-      <!-- File creation. Add the appropriate <indexterm> block if needed.-->
-      <para>
-        Create the file .... for ...
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /PATH/FILENAME &lt;&lt; "EOF"
-<literal># Begin FILENAME
-
-TEXT
-
-# End FILENAME</literal>
-EOF</userinput></screen>
-    </sect3>
-
-    <sect3  id="TEMPLATE-init">
-      <title>Boot Script</title>
-
-      <para>
-        To automatically start the <command>TEMPLATE</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/TEMPLATE</filename> bootscript from the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="TEMPLATE TEMPLATE-init">
-        <primary sortas="f-TEMPLATE">TEMPLATE</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-TEMPLATE</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <!--Required section-->
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program(s)</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <!-- If there were no programs, libraries, or directories created, then
-           we would list the section as "None". However, a decision must have
-           been made to change the "None" to just removing the whole section
-           because I've noticed that many packages have had the "None"
-           removed and the section completely removed as well. The reasoning
-           was that by putting "None", it appears as we know there are none.
-           Without anything it appears as we are not sure. -->
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          PROGRAM1, PROGRAM2 and PROGRAM3.
+          None
         </seg>
         <seg>
-          libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so.
+          libgdl-3.so
         </seg>
         <seg>
-          /etc/TEMPLATE, /usr/include/TEMPLATE, /usr/lib/TEMPLATE,
-          /usr/share/TEMPLATE-&TEMPLATE-version;,
-          /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
-          /var/lib/TEMPLATE.
+          /usr/include/libgdl-3.0 and
+          /usr/share/gtk-doc/html/gdl-3.0
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -402,42 +142,14 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="PROGRAM1">
-        <term><command>PROGRAM1</command></term>
-        <listitem>
-          <para>
-            does this ..... (end the sentence with a period).
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM1">
-            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="PROGRAM2">
-        <term><command>PROGRAM2</command></term>
-        <listitem>
-          <para>
-            does this ..... (end the sentence with a period).
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM2">
-            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
+      <varlistentry id="libgdl-3">
+        <term><filename class="libraryfile">libgdl-3.so</filename></term>
         <listitem>
           <para>
-            contains functions that ..... (end the sentence with a period).
+            contains functions that allow for docking objects in GTK+ 
applications
           </para>
-          <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
+          <indexterm zone="gdl libgdl-3">
+            <primary sortas="c-libgdl-3">libgdl-3.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/x/lib/lib.xml
==============================================================================
--- trunk/BOOK/x/lib/lib.xml    Tue May  5 08:31:20 2020        (r23078)
+++ trunk/BOOK/x/lib/lib.xml    Tue May  5 19:14:01 2020        (r23079)
@@ -41,6 +41,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="fltk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="freeglut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="gdk-pixbuf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="gdl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="glew.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="glu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="goffice010.xml"/>

Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Tue May  5 08:31:20 2020        (r23078)
+++ trunk/BOOK/xsoft/other/inkscape.xml Tue May  5 19:14:01 2020        (r23079)
@@ -3,12 +3,12 @@
    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY inkscape-download-http 
"https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2";>
+  <!ENTITY inkscape-download-http 
"https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.xz";>
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "592c0e94cf00ea9e0a8901883d8f06fd">
-  <!ENTITY inkscape-size          "31 MB">
-  <!ENTITY inkscape-buildsize     "538 MB (138 MB installed, add 9 MB for 
tests)">
-  <!ENTITY inkscape-time          "4.1 SBU (add 0.1 SBU for tests, both with 
parallelism=4)">
+  <!ENTITY inkscape-md5sum        "e5f1ee6b32ac0a94bdd5d99190e7bb9e">
+  <!ENTITY inkscape-size          "30 MB">
+  <!ENTITY inkscape-buildsize     "722 MB (165 MB installed)">
+  <!ENTITY inkscape-time          "5.7 SBU (with parallelism=4)">
 ]>
 
 <sect1 id="inkscape" xreflabel="Inkscape-&inkscape-version;">
@@ -70,6 +70,8 @@
       </listitem>
     </itemizedlist>
 
+    <!-- With 1.0.0, there is now a dependency on IM7 instead of IM6.
+         It's explicitly searched for in CMakeLists.txt.
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -78,6 +80,7 @@
           
url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/>
         </para>
       </listitem>
+      -->
       <!-- These are not needed right now. Inkscape builds/runs fine with the
            latest poppler as of this update (0.87.0). However, history says
            that almost every poppler version has broke inkscape, and history
@@ -95,20 +98,29 @@
           
url="&patch-root;/inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch"/>
         </para>
       </listitem>
-      -->
     </itemizedlist>
+    -->
+
+    <!-- I've asked upstream about this and was unable to find an answer. 
-renodr -->
+    <note>
+      <para>
+        The tarball <emphasis>inkscape-&inkscape-version;.tar.xz</emphasis>
+        will extract to
+        <emphasis>inkscape-&inkscape-version;_2020-05-01_4035a4fb49</emphasis>
+      </para>
+    </note>
 
     <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="boost"/>,
+      <xref linkend="double-conversion"/>,
       <xref linkend="gc"/>,
+      <xref linkend="gdl"/>,
       <xref linkend="gsl"/>,
-      <xref linkend="gtkmm2"/>
-      (or <xref linkend="gtkmm3"/> and
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gdl/";>gnome docking 
library</ulink>
-      for the experimental gtk+-3 build),
+      <xref linkend="gtkmm3"/>,
+      <xref linkend="libsoup"/>,
       <xref linkend="libxslt"/>,
       <xref linkend="poppler"/>,
       <xref linkend="popt"/> and
@@ -117,7 +129,7 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="imagemagick6"/>,
+      <xref linkend="imagemagick"/>,
       <xref linkend="lcms2"/> or
       <xref role="nodep" linkend="lcms"/>,
       <xref linkend="libcanberra"/> (to eliminate plugin warnings),
@@ -139,7 +151,7 @@
       developer: wiki.documentfoundation.org pages don't like trailing / -->
       <!--<ulink 
url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr";>libcdr</ulink>,
       <ulink 
url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio";>libvisio</ulink>,-->
-      <ulink url="https://gtkspell.sourceforge.net";>gtkspell</ulink>,
+      <ulink url="http://gtkspell.sourceforge.net";>gtkspell</ulink>,
       <ulink url="https://github.com/LibreOffice/libcdr";>libcdr</ulink>,
       <ulink url="https://github.com/LibreOffice/libvisio";>libvisio</ulink>,
       <ulink url="http://libwpg.sourceforge.net/";>libwpg</ulink> (or
@@ -184,12 +196,13 @@
 <screen><userinput remap="pre">patch -Np1 -i 
../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch</userinput></screen>
     -->
 
+    <!-- Inkscape now has a hard dependency on IM7.
     <para>
       Ensure that the libraries from <xref linkend="imagemagick6"/> can be 
used:
     </para>
 
 <screen><userinput>patch -Np1 -i 
../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
-
+    -->
 <!--
     <para>
       Apply a patch to prevent out-of-bounds writes in the text and fill-bucket
@@ -200,7 +213,9 @@
 -->
 
 <!-- If there is no test suite, then this is not needed.
-     There is none if the command below is not run. -->
+     There is none if the command below is not run.
+     With 1.0, this support is broken, so let's comment it out for now to
+     prevent confusion.
     <para>
       If you wish to run the testsuite, download the required versions of
       <application>googletest</application> and
@@ -208,6 +223,7 @@
     </para>
 
 <screen remap="test"><userinput>bash download-gtest.sh</userinput></screen>
+    -->
 
     <para>
       Install <application>Inkscape</application> by running the following
@@ -222,20 +238,24 @@
       ..                          &amp;&amp;
 make</userinput></screen>
 
+<!--
     <para>
-      To test the results, issue: <command>make check</command>.<!-- Ken or
+      To test the results, issue: <command>make check</command>.<!- - Ken or
       other devs, there is no test suite in this package. -renodr
       A small test suite is built if you download the necessary programs
       with the command above (bash download-gtest.sh) -pierre
-      This package does not come with a test suite. -->
+      This package does not come with a test suite. - ->
+
+      At the moment, the test suite does not function with the
+      "bash download-gtest.sh". CMake is unable to find gtest.
     </para>
+-->
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install                      &amp;&amp;
-rm -v /usr/lib/inkscape/lib*_LIB.a</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/update-icons-and-desktop.xml"/>
@@ -251,13 +271,6 @@
     </para>
 
     <para>
-      <command>rm -v /usr/lib/inkscape/lib*_LIB.a</command>: The conversion
-      of the package to use <command>cmake</command> has led to these libraries
-      getting installed, but they are not usable (there are no header files to
-      let a program know what they contain). So remove them.
-    </para>
-
-    <para>
       <option>-DWITH_DBUS=ON</option>: use this if you wish to use
       <command>inkscape</command> in interactive scripts which manipulate
       images.
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to