Changeset c30de44

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.

Files:

• general/graphlib/poppler.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• xsoft/other/inkscape.xml (modified) (4 diffs)

general/graphlib/poppler.xml

@@ -7 +7 @@
   <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "1153a0b1aa8a894c6ce61f042622441c">
-  <!ENTITY poppler-size          "1.7 MB">
-  <!ENTITY poppler-buildsize     "81 MB (with Qt5 library and tests)">
+  <!ENTITY poppler-md5sum        "c1139795bc24a02b8a694f77233b8d22">
+  <!ENTITY poppler-size          "1.8 MB">
+  <!ENTITY poppler-buildsize     "79 MB (with Qt5 library and tests)">
   <!ENTITY poppler-time          "0.9 SBU (with parallelism=4, Qt5 library, and tests)">
   <!-- Time increase might be due to git.freedesktop.org -->
@@ -146 +146 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="libtiff"/>, and
+      <xref linkend="libtiff"/>,
       <xref linkend="qt5"/>
-      (required for PDF support in <xref role="nodep" linkend="okular5"/>)
+      (required for PDF support in <xref role="nodep" linkend="okular5"/>), and
+      <ulink url="https://download.qt.io/archive/qt/">Qt-6.1 or later</ulink>.
+
     </para>
 

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Patch inkscape to build with poppler-2011.11.0.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to poppler-2011.11.0. Fixes
+          <ulink url="&blfs-ticket-root;15725">#15725</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to tigervnc-1.12.0. Fixes
           <ulink url="&blfs-ticket-root;15744">#15744</ulink>.</para>

packages.ent

@@ -235 +235 @@
 <!ENTITY openjpeg2-version            "2.4.0">
 <!ENTITY pixman-version               "0.40.0">   <!-- Even minors only -->
-<!ENTITY poppler-version              "21.10.0">
+<!ENTITY poppler-version              "21.11.0">
 <!ENTITY potrace-version              "1.16">
 <!ENTITY qpdf-version                 "10.4.0">

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;