Changeset a43ab15

Timestamp:

05/02/2024 04:04:26 PM (2 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

lazarus, trunk

Children:

fb3dce5e

Parents:

02a20ce

Message:

Update to poppler-24.05.0.

Files:

• general/graphlib/poppler.xml (modified) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

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        "61ccc0892c0afe886ce31eae87bf8625">
+  <!ENTITY poppler-md5sum        "a9f302feb3b79a99f66fa9d1e4af49ac">
   <!ENTITY poppler-size          "1.8 MB">
-  <!ENTITY poppler-buildsize     "81 MB (with Qt6 library; add 13 MB for tests)">
-  <!ENTITY poppler-time          "0.9 SBU (with parallelism=4 and Qt5 library; add 2.7 SBU for tests)">
-  <!-- Time increase might be due to git.freedesktop.org -->
+  <!ENTITY poppler-buildsize     "87 MB (with Qt6 library; add 13 MB for tests)">
+  <!ENTITY poppler-time          "1.2 SBU (with parallelism=4, tests, and Qt6 library)">
+  <!-- For poppler 24.05.0 All 65 tests passed in 1.8 seconds -->
 
   <!ENTITY poppler-data-version       "0.4.12">
@@ -136 +136 @@
       <xref linkend="nss"/>,
       <xref linkend="openjpeg2"/>, and
-      &qt5-deps;
+      <xref linkend="qt6"/>
       (required for PDF support in <xref role="nodep" linkend="okular"/>)
     </para>
@@ -147 +147 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="gtk3"/>, and
-      <xref linkend="qt6"/>
-      <!-- Nothing really uses this yet, but it will be used in KDE 6 -->
+      &qt5-deps;
     </para>
 
@@ -157 +156 @@
 
     <para>
-      Install <application>Poppler</application> by running the following
+      First, conditionalize C++20 only code to fix non C++20 builds that 
+      don't use the affected methods.
+    </para>
+
+<screen><userinput>sed -e '/::starts/i #if __cplusplus >= 202002L'\
+    -e '/::ends/a #endif'                      \
+    -i goo/GooString.h</userinput></screen>
+
+    <para>
+      Now, install <application>Poppler</application> by running the following
       commands:
     </para>
@@ -167 +175 @@
        -DCMAKE_INSTALL_PREFIX=/usr  \
        -DTESTDATADIR=$PWD/testfiles \
-       -DENABLE_QT6=OFF             \
+       -DENABLE_QT5=OFF             \
        -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
        ..                           &amp;&amp;
@@ -178 +186 @@
 <command>git clone --depth 1 https://gitlab.freedesktop.org/poppler/test.git testfiles</command>.
       Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>.
-      One test, check_qt5_signature_basics, is known to fail.
     </para>
 
@@ -226 +233 @@
       programs where the auxiliary files are located.
     </para>
-
-    <para>
-      <parameter>-DENABLE_QT6=OFF</parameter>: This switch is needed to
-      prevent an error when Qt6 is not installed. Remove it if you
+<!--
+    <para>
+      <parameter>-DENABLE_QT5=OFF</parameter>: This switch is needed to
+      prevent an error when Qt5 is not installed. Remove it if you
       have installed <xref linkend="qt6" role="nodep"/>.
     </para>
-
+-->
     <para>
       <parameter>-DENABLE_UNSTABLE_API_ABI_HEADERS=ON</parameter>: Installs some old

introduction/welcome/changelog.xml

@@ -43 +43 @@
       <para>May 2nd, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to poppler-24.05.0. Fixes
+          <ulink url="&blfs-ticket-root;19741">#19741</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to nano-8.0. Fixes

packages.ent

@@ -245 +245 @@
 <!ENTITY openjpeg2-version            "&openjpeg2-majmin-version;.2">
 <!ENTITY pixman-version               "0.43.4">  
-<!ENTITY poppler-version              "24.04.0">
+<!ENTITY poppler-version              "24.05.0">
 <!ENTITY potrace-version              "1.16">
 <!ENTITY qpdf-version                 "11.9.0">