Changeset 5982e67 for general

Timestamp:

11/30/2015 06:12:54 PM (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, 7.9, 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:

60d59117

Parents:

d9c216c

Message:

Update to qca-2.1.1

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

File:

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

general/genlib/qca.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.gz">
+  <!ENTITY qca-download-http "http://download.kde.org/stable/qca/&qca-version;/src/qca-&qca-version;.tar.gz">
   <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "c2b00c732036244701bae4853a2101cf">
-  <!ENTITY qca-size          "956 KB">
-  <!ENTITY qca-buildsize     "30 MB">
+  <!ENTITY qca-md5sum        "657cc701316600199199a6b6cb2c73c9">
+  <!ENTITY qca-size          "676 KB">
+  <!ENTITY qca-buildsize     "28 MB">
   <!ENTITY qca-time          "1.2 SBU (additional 0.3 SBU for the tests)">
 ]>
@@ -65 +65 @@
     <xref linkend="cacerts"/>,
     <xref linkend="cmake"/>,
-    <xref linkend="qt4"/> and
+    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
     <xref linkend="which"/>
     </para>
@@ -79 +79 @@
     <xref linkend="openssl"/>,
     <xref linkend="p11-kit"/>,
-    <xref linkend="qt5"/>,
     <xref linkend="doxygen"/>, and
     <xref linkend="which"/>
@@ -91 +90 @@
   <sect2 role="installation">
     <title>Installation of Qca</title>
+
+    <para>If desired, remove a lot of irritating warnings when building:</para>
+
+<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
 
     <para>Install <application>Qca</application> by running the following
@@ -121 +124 @@
 
     <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
-    building with Qt4 even if Qt5 is found.</para>
+    building with Qt4 even if Qt5 is found. There are no packages in BLFS 
+    that use the Qt5 version of Qca.</para>
 
     <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
@@ -137 +141 @@
 
       <seglistitem>
-        <seg>mozcerts and qcatool</seg>
-        <seg>libqca.so and plugins at &qt4-dir;/lib/qca/crypto</seg>
+        <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>
-          &qt4-dir;/include/QtCrypto,
-          &qt4-dir;/lib/cmake/Qca and
-          &qt4-dir;/lib/qca
+          &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)
         </seg>
       </seglistitem>