Changeset b8ff9ea for xsoft

Timestamp:

05/06/2020 02:14:01 AM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c8e3444

Parents:

28a5598

Message:

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

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23079 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• xsoft/other/inkscape.xml (modified) (14 diffs)

xsoft/other/inkscape.xml

@@ -4 +4 @@
   <!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)">
 ]>
 
@@ -71 +71 @@
     </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">
@@ -79 +81 @@
         </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
@@ -96 +99 @@
         </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>
@@ -104 +116 @@
     <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"/>,
@@ -118 +130 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="imagemagick6"/>,
+      <xref linkend="imagemagick"/>,
       <xref linkend="lcms2"/> or
       <xref role="nodep" linkend="lcms"/>,
@@ -140 +152 @@
       <!--<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>,
@@ -185 +197 @@
     -->
 
+    <!-- Inkscape now has a hard dependency on IM7.
     <para>
       Ensure that the libraries from <xref linkend="imagemagick6"/> can be used:
@@ -190 +203 @@
 
 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch</userinput></screen>
-
+    -->
 <!--
     <para>
@@ -201 +214 @@
 
 <!-- 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
@@ -209 +224 @@
 
 <screen remap="test"><userinput>bash download-gtest.sh</userinput></screen>
+    -->
 
     <para>
@@ -223 +239 @@
 make</userinput></screen>
 
-    <para>
-      To test the results, issue: <command>make check</command>.<!-- Ken or
+<!--
+    <para>
+      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. -->
-    </para>
+      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>
@@ -235 +256 @@
     </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"
@@ -249 +269 @@
       <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
       build the release library without any debug `assert` in the code.
-    </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>