Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision ac6770915902b5a84dc00ad813003c58b62da7fa)
+++ xsoft/other/inkscape.xml	(revision 7d35ee59ad7bf232d86abc8f035a21006fb0c3b3)
@@ -4,13 +4,10 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-<!-- Use when point version is not 0 -->
-  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/&inkscape-minor-version;.x/&inkscape-version;/+download/inkscape-&inkscape-version;.tar.bz2">
-<!-- Use when point version is 0
-  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/&inkscape-minor-version;.x/&inkscape-minor-version;/+download/inkscape-&inkscape-version;.tar.bz2"> -->
+  <!ENTITY inkscape-download-http "https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "db2eb2a566cf35ff949fc9ccb172889a">
+  <!ENTITY inkscape-md5sum        "6f6bcbd0237ecd064460315465467b04">
   <!ENTITY inkscape-size          "30 MB">
-  <!ENTITY inkscape-buildsize     "1.3 GB (add 39 MB for tests)">
-  <!ENTITY inkscape-time          "18 SBU (add 0.8 SBU for tests)">
+  <!ENTITY inkscape-buildsize     "526 MB (add 8 MB for tests)">
+  <!ENTITY inkscape-time          "4.9 SBU (add 0.2 SBU for tests, both with parallelism=4)">
 ]>
 
@@ -39,4 +36,5 @@
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -71,4 +69,11 @@
           Estimated build time: &inkscape-time;
         </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -85,6 +90,7 @@
       <ulink url="http://ftp.gnome.org/pub/gnome/sources/gdl/">gnome docking library</ulink>
       for the experimental gtk+-3 build),
-      <xref linkend="libxslt"/> and
-      <xref linkend="popt"/>
+      <xref linkend="libxslt"/>,
+      <xref linkend="popt"/> and
+      <xref linkend="wget"/> (to download the test dependencies)
     </para>
 
@@ -93,5 +99,8 @@
       <xref linkend="imagemagick6"/>,
       <xref linkend="lcms2"/> or
-      <xref linkend="lcms"/>
+      <xref linkend="lcms"/>,
+      <xref linkend="potrace"/> (for the bucket-fill tool),
+      <xref linkend="lxml"/> and
+      <xref linkend="scour"/> (both at runtime, for Save As Optimized SVG).
     </para>
 
@@ -99,5 +108,5 @@
     <para role="optional">
       <xref linkend="aspell"/>,
-      <xref linkend="dbus"/>,
+      <xref linkend="dbus"/> (to run inkscape from scripts),
       <xref linkend="doxygen"/>,
       <xref linkend="poppler"/>,
@@ -107,15 +116,12 @@
       them here I get "There is currently no text in this page...". Ken or
       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://github.com/LibreOffice/libcdr">libcdr</ulink>,
       <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
-      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
+      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink> (or
+      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>) and
       <ulink url="https://sourceforge.net/projects/NumPy/files/">NumPy</ulink>
-      (for the testsuite and at runtime for some extensions) and
-      <phrase revision="sysv"><ulink url="http://cheeseshop.python.org/pypi/lxml/">python-lxml</ulink></phrase>
-      <phrase revision="systemd"><xref linkend="lxml"/></phrase>
-      (for the testsuite, and at runtime for some of the extensions)
+      (at runtime for some extensions)
     </para>
 
@@ -134,4 +140,8 @@
     <title>Installation of Inkscape</title>
 
+    <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>
       Fix a build issue with <application>GCC-7.1</application>:
@@ -139,4 +149,12 @@
 
 <screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp</userinput></screen>
+
+    <para>
+      If you wish to run the testsuite, download the required versions of
+      <application>googletest</application> and
+      <application>googlemock</application> by running:
+    </para>
+
+<screen><userinput>bash download-gtest.sh</userinput></screen>
 
     <para>
@@ -145,9 +163,11 @@
     </para>
 
-<screen><userinput>./autogen.sh &amp;&amp;
-
-IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 \
-IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" \
-./configure --prefix=/usr &amp;&amp;
+<screen><userinput>
+mkdir build &amp;&amp;
+cd build    &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      ..                          &amp;&amp;
 
 make</userinput></screen>
@@ -160,5 +180,6 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install                      &amp;&amp;
+rm -v /usr/lib/inkscape/lib*_LIB.a</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -171,10 +192,19 @@
 
     <para>
-      <command>IMAGE_MAGICK_CFLAGS= ... IMAGE_MAGICK_LIBS= ...</command>:
-      The configure script looks for ImageMagick-6 using the normal
-      unversioned pkgconfig file names which are also used by the newer
-      ImageMAgick-7 - in BLFS we patched it to rename those files, so
-      these variables will allow <command>configure</command> to find
-      the things it needs.
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
+      build the release library without any debug `assert` in the code.
+    </para>
+
+    <para>
+      <parameter>rm -v /usr/lib/inkscape/lib*_LIB.a</parameter>: 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.
     </para>
 
@@ -186,6 +216,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -194,8 +224,8 @@
         </seg>
         <seg>
-          None
+          libinkscape_base.so
         </seg>
         <seg>
-          /usr/share/inkscape
+          /usr/lib/inkscape and /usr/share/inkscape
         </seg>
       </seglistitem>
@@ -231,4 +261,16 @@
       </varlistentry>
 
+      <varlistentry id="libinkscape_base">
+        <term><filename class="libraryfile">libinkscape_base.so</filename></term>
+        <listitem>
+          <para>
+            provides the routines used by inkscape and inkview.
+          </para>
+          <indexterm zone="inkscape libinkscape_base">
+            <primary sortas="c-libinkscape_base">libinkscape_base.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
