Changeset 18b9eae for xsoft

Timestamp:

01/18/2019 08:36:19 PM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, bdubbs/svn, 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:

c084a2a

Parents:

b877595

Message:

Update to inkscape-0.92.4.

Upstream seems to have finally gotten this right. No more poppler issues.

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

File:

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

xsoft/other/inkscape.xml

@@ -6 +6 @@
   <!ENTITY inkscape-download-http "https://media.inkscape.org/dl/resources/file/inkscape-&inkscape-version;.tar.bz2">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "4ef7171cc1de9e1608d8c49b77fed99e">
-  <!ENTITY inkscape-size          "31 MB">
-  <!ENTITY inkscape-buildsize     "395 MB (add 8 MB for tests)">
-  <!ENTITY inkscape-time          "4.9 SBU (add 0.2 SBU for tests, both with parallelism=4)">
+  <!ENTITY inkscape-md5sum        "ac30f6d5747fd9c620c00dad500f414f">
+  <!ENTITY inkscape-size          "30 MB">
+  <!ENTITY inkscape-buildsize     "399 MB (add 135 MB for tests)">
+  <!ENTITY inkscape-time          "4.5 SBU (add 0.2 SBU for tests, both with parallelism=4)">
 ]>
 
@@ -73 +73 @@
     <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>
-      <listitem>
-        <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch"/></para>
-     </listitem>-->
-      <listitem>
-        <para>Required patch: <ulink url="&patch-root;/inkscape-&inkscape-version;-consolidated_fixes-2.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -148 +141 @@
   <sect2 role="installation">
     <title>Installation of Inkscape</title>
-    <!--
-    <para>Ensure that the libraries from <xref linkend="imagemagick6"/> can be used,
-    and fix the build for the changes in some recent versions of
-    <application>poppler</application>:</para>
-    -->
-    <para>Fix build problems related to poppler-0.73.0 and allow proper detection
-    of libraries from <xref linkend="imagemagick6"/>:</para>
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-consolidated_fixes-2.patch</userinput></screen>
-<!--
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &amp;&amp;
-patch -Np1 -i ../inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch
-</userinput></screen>
--->
-    <para>
-      Fix build issues with <application>GCC-7.1</application> and
-       <application>poppler-0.71.0</application>:
-    </para>
-
-<screen><userinput>sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp &amp;&amp;
-sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
- -i src/extension/internal/pdfinput/pdf-parser.*</userinput></screen>
+ 
+    <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>
 
 <!-- If there is no test suite, then this is not needed.