Changeset 65b99b9 for xsoft

Timestamp:

12/22/2018 06:19:04 PM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

9a8e5d2

Parents:

340d045

Message:

Merge to HEAD 20852

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

Location:

xsoft/other

Files:

• gimp.xml (modified) (1 diff)
• gparted.xml (modified) (1 diff)
• inkscape.xml (modified) (3 diffs)

xsoft/other/gimp.xml

@@ -114 +114 @@
           Download size: &gimp-help-size;
         </para>
+      </listitem>
+      <listitem>
         <para>
           Download md5sum: &gimp-help-md5sum;

xsoft/other/gparted.xml

@@ -7 +7 @@
   <!ENTITY gparted-download-http "&sourceforge-dl;/gparted/gparted-&gparted-version;.tar.gz">
   <!ENTITY gparted-download-ftp  " ">
-  <!ENTITY gparted-md5sum        "df4fe0350ba55cee6fddae289bd9d3f1">
+  <!ENTITY gparted-md5sum        "2f481ad34decb7021ca04ca305e79e7d">
   <!ENTITY gparted-size          "3.7 MB">
-  <!ENTITY gparted-buildsize     "108 MB">
+  <!ENTITY gparted-buildsize     "109 MB">
   <!ENTITY gparted-time          "0.4 SBU (using parallelism=4)">
 ]>

xsoft/other/inkscape.xml

@@ -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>
@@ -78 +79 @@
       <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-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -144 +148 @@
   <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.72.0 and allow proper detection
+    of libraries from <xref linkend="imagemagick6"/>:</para>
+<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-consolidated_fixes-1.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