From 65bce57f1c3ee68e8e560ee0fa6ce3a83ba43e6a Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Sat, 14 Oct 2023 10:29:21 +0200
Subject: [PATCH] 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.
---
 general/graphlib/poppler.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/general/graphlib/poppler.xml b/general/graphlib/poppler.xml
index fe13b8b9e3..4a8407c3fa 100644
--- a/general/graphlib/poppler.xml
+++ b/general/graphlib/poppler.xml
@@ -131,8 +131,10 @@
       <xref linkend="lcms2"/>,
       <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>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -143,10 +145,8 @@
       <xref linkend="gpgme"/>,
       <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>
 
@@ -166,7 +166,6 @@ cd    build                         &amp;&amp;
 cmake  -DCMAKE_BUILD_TYPE=Release   \
        -DCMAKE_INSTALL_PREFIX=/usr  \
        -DTESTDATADIR=$PWD/testfiles \
-       -DENABLE_QT5=OFF             \
        -DENABLE_QT6=OFF             \
        -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
        ..                           &amp;&amp;
@@ -226,6 +225,12 @@ cd poppler-data-&poppler-data-version;</userinput></screen>
       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
+      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.
@@ -243,11 +248,6 @@ cd poppler-data-&poppler-data-version;</userinput></screen>
       &qt5-deps; is not installed. 
     </para>
 
-    <para>
-      <option>-DENABLE_QT6=OFF</option>: Use this parameter if
-      Qt6 is not installed. 
-    </para>
-
     <para>
       <option>-DENABLE_BOOST=OFF</option>: Use this parameter if you have
       not installed <application>boost</application> (the Splash backend for