Changeset a0bba47a

Timestamp:

04/19/2022 04:31:55 PM (2 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

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, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

e5b0e0b1

Parents:

97c14af

Message:

Fix building Inkscape with poppler-22.04.0.

Files:

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

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
-      <para>April 16th, 2022</para>
+      <para>April 19th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix building Inkscape with poppler-22.04.0. Fixes
+          <ulink url="&blfs-ticket-root;16433">#16433</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>April 18th, 2022</para>
       <itemizedlist>
         <listitem>

xsoft/other/inkscape.xml

@@ -76 +76 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-
+      <listitem>
+        <para>
+          Required patch: <ulink
+          url="&patch-root;/inkscape-&inkscape-version;-poppler_22_04_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.
-
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-poppler_21.11.0-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
+
     <note>
       <para>
@@ -169 +161 @@
     <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.04.0:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_22_04_fixes-1.patch</userinput></screen>
+
 
 <!-- If there is no test suite, then this is not needed.
@@ -193 +182 @@
 
     <para>
-      First, fix the build with poppler-22.03.0:
+      Next, fix the build with poppler-22.03.0:
     </para>