Changeset 1daaab6d for general/graphlib/poppler.xml

Timestamp:

12/04/2021 08:32:42 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

qt5new

Children:

104ff4e

Parents:

ce5723af (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into qt5new

File:

• general/graphlib/poppler.xml (modified) (8 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        "60d5be55cc080d602bf58daf6825b124">
-  <!ENTITY poppler-size          "1.6 MB">
-  <!ENTITY poppler-buildsize     "105 MB (with Qt5 library and tests)">
-  <!ENTITY poppler-time          "0.7 SBU (with parallelism=4, Qt5 library, and tests)">
+  <!ENTITY poppler-md5sum        "826ab1675cef4cac7e2a5805bf4f2ff6">
+  <!ENTITY poppler-size          "1.7 MB">
+  <!ENTITY poppler-buildsize     "109 MB (with Qt5 library and tests)">
+  <!ENTITY poppler-time          "0.8 SBU (with parallelism=4, Qt5 library, and tests)">
   <!-- Time increase might be due to git.freedesktop.org -->
 
-  <!ENTITY poppler-data-version       "0.4.10">
+  <!ENTITY poppler-data-version       "0.4.11">
 
   <!ENTITY poppler-data-download-http "https://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
-  <!ENTITY poppler-data-md5sum        "a7f15fb2f26c60a7a92093cfdf2378d5">
+  <!ENTITY poppler-data-md5sum        "506eeed773f3ed8684d8c45961c025d4">
   <!ENTITY poppler-data-size          "4.3 MB">
-  <!ENTITY poppler-data-buildsize     "25 MB">
+  <!ENTITY poppler-data-buildsize     "26 MB">
   <!ENTITY poppler-data-time          "less than 0.1 SBU">
 ]>
@@ -145 +145 @@
       <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="pygments"/>,
       <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>
 
@@ -180 +181 @@
       them is:
 <command>git clone --depth 1 git://git.freedesktop.org/git/poppler/test testfiles</command>.
-      Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>. 
+      Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>.
     </para>
 
@@ -190 +191 @@
 <!-- Seems makeinstall does the job now:
     <para>
-      If you have Qt installed, again as the  
+      If you have Qt installed, again as the
       <systemitem class="username">root</systemitem> user:
     </para>
-    
+
 <screen role="root"><userinput>make -C qt5 install &amp;&amp;
 install -m644 poppler-qt5.pc /usr/lib/pkgconfig</userinput></screen>
@@ -229 +230 @@
     <para>
       <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply a higher level of compiler optimizations. 
+      to apply a higher level of compiler optimizations.
     </para>
 
@@ -246 +247 @@
       Still broken with 0.69.0 - Doug
       Seems to work with 0.73.0 - Pierre
-      Works with 20.09.0 but without the 
+      Works with 20.09.0 but without the
          sed -i '1s/python/&3/' make-glib-api-docs
          and pygments is required - Thomas
 -->
     <para>
-      <option>-DENABLE_GTK_DOC=ON</option>: Use this parameter if 
-      GTK-Doc and Pygments is installed and you wish to rebuild and install 
-      the API documentation.
+      <option>-DENABLE_GTK_DOC=ON</option>: Use this parameter if
+      GTK-Doc <!--and Pygments--> is installed and you wish to rebuild and
+      install the API documentation.
     </para>
 
@@ -280 +281 @@
       <seglistitem>
         <seg>
-          pdfattach, pdfdetach, pdffonts, pdfimages, pdfinfo, pdfseparate, 
+          pdfattach, pdfdetach, pdffonts, pdfimages, pdfinfo, pdfseparate,
           pdfsig, pdftocairo, pdftohtml, pdftoppm, pdftops, pdftotext, and
           pdfunite
@@ -313 +314 @@
           </indexterm>
         </listitem>
-      </varlistentry>  
+      </varlistentry>
 
       <varlistentry id="pdfdetach">