Changeset 65bce57f for general/graphlib

Timestamp:

10/14/2023 08:47:11 AM (7 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

1c0eebe

Parents:

11eb541b

git-author:

Pierre Labastie <pierre.labastie@…> (10/14/2023 08:29:21 AM)

git-committer:

Pierre Labastie <pierre.labastie@…> (10/14/2023 08:47:11 AM)

Message:

Make Qt5 recommended for poppler

Recently, upstream has changed the way Qt5 is detected: if Qt5
is not installed, you have to pass -DENABLE_QT5=OFF, otherwise
cmake stops with an error. Previously, a non present Qt5 was
not fatal. But passing -DENABLE_QT5=OFF when qt5 is installed
prevents building the poppler-qt5 library, which is needed by
okular, one of the main users of poppler.
Until now we had Qt5 as optional, since building full Qt5 for other
users of poppler (mainly inkscape, other users can benefit of qt5)
was kind of overkill. But now we have qt5-alternate, and also
this change in behavior of poppler. So it seems it is acceptable
to have qt5 or qt5-alternate as recommended.

File:

• general/graphlib/poppler.xml (modified) (5 diffs)

general/graphlib/poppler.xml

@@ -132 +132 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
-      <xref linkend="nss"/>, and
-      <xref linkend="openjpeg2"/>
+      <xref linkend="nss"/>,
+      <xref linkend="openjpeg2"/>, and
+      &qt5-deps;
+      (required for PDF support in <xref role="nodep" linkend="okular5"/>)
     </para>
 
@@ -144 +146 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="libtiff"/>,
-      &qt5-deps;
-      (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>.
+      <xref linkend="libtiff"/>, and
+      <ulink url="https://download.qt.io/archive/qt/">Qt-6.2 or later</ulink>.
 
     </para>
@@ -167 +167 @@
        -DCMAKE_INSTALL_PREFIX=/usr  \
        -DTESTDATADIR=$PWD/testfiles \
-       -DENABLE_QT5=OFF             \
        -DENABLE_QT6=OFF             \
        -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
@@ -228 +227 @@
 
     <para>
+      <parameter>-DENABLE_QT6=OFF</parameter>: This switch is needed to
+      prevent an error when Qt6 is not installed. Remove it if you
+      have installed qt-6.2 or later.
+    </para>
+
+    <para>
       <parameter>-DENABLE_UNSTABLE_API_ABI_HEADERS=ON</parameter>: Installs some old
       <application>Xpdf</application> headers required by certain programs.
@@ -242 +247 @@
       <option>-DENABLE_QT5=OFF</option>: Use this parameter if
       &qt5-deps; is not installed. 
-    </para>
-
-    <para>
-      <option>-DENABLE_QT6=OFF</option>: Use this parameter if
-      Qt6 is not installed. 
     </para>