Changes in xsoft/other/inkscape.xml [c30de44:48771ae]

File:

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

xsoft/other/inkscape.xml

@@ -4 +4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-  <!ENTITY inkscape-download-http "https://inkscape.org/gallery/item/29255/inkscape-&inkscape-version;.tar.xz">
+  <!ENTITY inkscape-download-http "https://inkscape.org/gallery/item/37360/inkscape-&inkscape-minor-version;.tar.xz">
+
+  <!-- When updating, remember to change the numeric part of the URL -->
+
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "1852c535a1aec7ca25eca9de110330d7">
-  <!ENTITY inkscape-size          "33 MB">
-  <!ENTITY inkscape-buildsize     "845 MB (169 MB installed)">
-  <!ENTITY inkscape-time          "6.9 SBU (with parallelism=4)">
+  <!ENTITY inkscape-md5sum        "490c40bbb3ce3441ceee88e61775bbf4">
+  <!ENTITY inkscape-size          "38 MB">
+  <!ENTITY inkscape-buildsize     "911 MB (184 MB installed)">
+  <!ENTITY inkscape-time          "4.7 SBU (with parallelism=4)">
 
   <!-- To find newer tarballs, look here:
@@ -16 +19 @@
 ]>
 
-<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-version;">
+<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-minor-version;">
   <?dbhtml filename="inkscape.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Inkscape-&inkscape-version;</title>
+
+  <title>Inkscape-&inkscape-minor-version;</title>
 
   <indexterm zone="inkscape">
@@ -38 +38 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -73 +73 @@
       </listitem>
     </itemizedlist>
-
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-<!--
       <listitem>
         <para>
           Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-glib_2.68-1.patch"/>
+          url="&patch-root;/inkscape-&inkscape-version;-poppler_22_09_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
-      <!\-\- 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
-           tends to repeat itself ;-). Keep these patches commented until
-           they are inevitably needed.
-      Needed for 1.1.1 and poppler-2011.1, please keep above comment and comment
-      the link when no longer required
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-poppler_21.11.0-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;_2021-09-20_3bf5ae0d25</emphasis>.
+        The tarball <filename>inkscape-&inkscape-minor-version;.tar.xz</filename>
+        will extract to the directory <filename
+        class="directory">inkscape-&inkscape-version;/</filename>.
       </para>
     </note>
@@ -149 +126 @@
       <xref linkend="dbus"/> (to run inkscape from scripts),
       <xref linkend="doxygen"/>,
+      <xref linkend="gspell"/>,
 
       <!-- these document foundation links work from firefox's address bar, or
@@ -156 +134 @@
       <!--<ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
       <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,-->
-      <ulink url="http://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>,
@@ -180 +158 @@
   <sect2 role="installation">
     <title>Installation of Inkscape</title>
-
-    <!-- Not needed with 1.0, but let's keep the template.
-
-    <para>
-      Now fix Inkscape to build with poppler-0.83.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch</userinput></screen>
-    -->
+<!--
+    <para>
+      First, fix Inkscape to build with poppler-22.09.0:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_22_09_fixes-1.patch</userinput></screen>
+-->
 
 <!-- If there is no test suite, then this is not needed.
@@ -195 +171 @@
      prevent confusion.
     <para>
-      If you wish to run the testsuite, download the required versions of
+      If you wish to run the test suite, download the required versions of
       <application>googletest</application> and
       <application>googlemock</application> by running:
     </para>
 
-<screen remap="test"><userinput>bash download-gtest.sh</userinput></screen>
-    -->
-
-<!--
-    <para>
-      First, fix build failure with glibc-2.32:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/#include &lt;iostream&gt;/a #include &lt;atomic&gt;' src/ui/tool/node.cpp</userinput></screen>
+<screen remap="test"><userinput>./download-gtest.sh</userinput></screen>
 -->
 
@@ -215 +183 @@
       commands:
     </para>
-
+<!--
 <screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_21.11.0-1.patch &amp;&amp;
-
-mkdir build                       &amp;&amp;
+-->
+<screen><userinput>mkdir build                       &amp;&amp;
 cd    build                       &amp;&amp;
 
@@ -225 +193 @@
       ..                          &amp;&amp;
 make</userinput></screen>
+
+<!-- A race condition has been observed with inkscape-1.2.2, cmake-3.25.1,
+     and make-4.4. Reported by "Dragan" on the blfs-dev list -->
+&parallel_issues;
 
 <!--
@@ -283 +255 @@
         </seg>
         <seg>
-          libinkscape_base.so
+          lib2geom.so and
+          libinkscape_base.so (in /usr/lib/inkscape)
         </seg>
         <seg>
-          /usr/lib/inkscape and /usr/share/inkscape
+          /usr/include/2geom-&lib2geom-version;,
+          /usr/lib/inkscape, and
+          /usr/share/inkscape
         </seg>
       </seglistitem>