Changeset a0fd2f2c

Timestamp:

12/19/2018 06:13:22 AM (6 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 8.4, 9.0, 9.1, bdubbs/svn, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

1c459bf2

Parents:

e2aae21f

Message:

Create consolidated patch for inkscape with latest poppler fixes. One of several problems discovered on this build

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/other/inkscape.xml (modified) (3 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "19">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 17th, &year;">
+<!ENTITY releasedate  "December 19th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
 -->
+    <listitem>
+      <para>December 19th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix Inkscape build and generate a consolidated
+          patch to make maintenance easier.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

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