Changeset 67b1a0a for general/genlib/qca.xml

Timestamp:

06/05/2016 12:46:57 AM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, 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:

eb3dbe3

Parents:

87f9b815

Message:

Remove references to qt4 in poppler, cmake,
doxygen, qca, and pinentry

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17444 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/genlib/qca.xml (modified) (9 diffs)

general/genlib/qca.xml

@@ -35 +35 @@
     the implementation, using plugins known as Providers.</para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -65 +65 @@
     <xref linkend="cacerts"/>,
     <xref linkend="cmake"/>,
-    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
+    <xref linkend="qt5"/>, and
     <xref linkend="which"/>
     </para>
@@ -95 +95 @@
 <screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
 
-    <para>This package can be built against <xref linkend="qt4"/> or <xref linkend="qt5"/>.
-    If using qt4, run:</para>
-
-<screen><userinput>QT_DIR=&qt4-dir; &amp;&amp;
-QT4_BUILD=ON</userinput></screen>
-
-    <para>If using qt5, run:</para>
-
-<screen><userinput>QT_DIR=&qt5-dir; &amp;&amp;
-QT4_BUILD=OFF</userinput></screen>
-
     <para>Install <application>Qca</application> by running the following
     commands:</para>
@@ -112 +101 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=$QT_DIR            \
+cmake -DCMAKE_INSTALL_PREFIX=$QT5DIR            \
       -DCMAKE_BUILD_TYPE=Release                \
-      -DQT4_BUILD=$QT4_BUILD                    \
       -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
       ..                                        &amp;&amp;
-unset QT_DIR QT4_BUILD                          &amp;&amp;
 
 make</userinput></screen>
@@ -135 +122 @@
     used to apply a higher level of compiler optimizations.</para>
 
-    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
-    building with Qt4 even if Qt5 is found.</para>
-
     <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
     Install the qca man page in the normal location.</para>
@@ -152 +136 @@
 
       <seglistitem>
-        <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
-        <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
+        <seg>mozcerts-qt5 and qcatool-qt5</seg>
+        <seg>libqca-qt5.so</seg>
         <seg>
-          &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
-          &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
-          &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
+          &qt5-dir;/include/Qca-qt5,
+          &qt5-dir;/lib/cmake/Qca-qt5, and
+          &qt5-dir;/lib/qca-qt5
         </seg>
       </seglistitem>
@@ -168 +152 @@
 
       <varlistentry id="mozcerts">
-        <term><command>mozcerts</command></term>
+        <term><command>mozcerts-qt5</command></term>
         <listitem>
           <para>is a command line tool for converting certdata.txt into
           outfile.pem files.</para>
           <indexterm zone="qca mozcerts">
-            <primary sortas="b-mozcerts">mozcerts</primary>
+            <primary sortas="b-mozcerts">mozcerts-qt5</primary>
           </indexterm>
         </listitem>
@@ -179 +163 @@
 
       <varlistentry id="qcatool">
-        <term><command>qcatool</command></term>
+        <term><command>qcatool-qt5</command></term>
         <listitem>
           <para>is a command line tool for performing various cryptographic
           operations with Qca.</para>
           <indexterm zone="qca qcatool">
-            <primary sortas="b-qcatool">qcatool</primary>
+            <primary sortas="b-qcatool">qcatool-qt5</primary>
           </indexterm>
         </listitem>
@@ -190 +174 @@
 
       <varlistentry id="libqca">
-        <term><filename class='libraryfile'>libqca.so</filename></term>
+        <term><filename class='libraryfile'>libqca-qt5.so</filename></term>
         <listitem>
           <para>is the Qt Cryptography Architecture (Qca) library.</para>
           <indexterm zone="qca libqca">
-            <primary sortas="c-libqca">libqca.so</primary>
+            <primary sortas="c-libqca">libqca-qt5.so</primary>
           </indexterm>
         </listitem>