Changeset c30de44 for xsoft

Timestamp:

11/18/2021 10:30:25 PM (2 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.1, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ef72276

Parents:

cd9f166a

Message:

Update to poppler-21.11.0 and patch inkscape for that.

File:

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

xsoft/other/inkscape.xml

@@ -73 +73 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+<!--
       <listitem>
         <para>
@@ -83 +84 @@
       </listitem>
     </itemizedlist>
--->
-      <!-- These are not needed right now. Inkscape builds/runs fine with the
+      <!\-\- 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>
@@ -95 +97 @@
         </para>
       </listitem>
+-->
       <listitem>
         <para>
           Required patch: <ulink
-          url="&patch-root;/inkscape-&inkscape-version;-poppler_0_83_0_fixes-1.patch"/>
+          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 -->
@@ -214 +216 @@
     </para>
 
-<screen><userinput>mkdir build                       &amp;&amp;
+<screen><userinput remap="pre">patch -Np1 -i ../inkscape-&inkscape-version;-poppler_21.11.0-1.patch &amp;&amp;
+
+mkdir build                       &amp;&amp;
 cd    build                       &amp;&amp;