Changeset cf02129


Ignore:
Timestamp:
12/09/2014 12:51:57 AM (9 years ago)
Author:
Christopher Gregory <cjg@…>
Branches:
systemd-13485
Children:
dca33979
Parents:
1c7f183
Message:

Updated to qca-2.1.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@15172 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/qca.xml

    r1c7f183 rcf02129  
    77  <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.bz2">
    88  <!ENTITY qca-download-ftp  " ">
    9   <!ENTITY qca-md5sum        "fc15bd4da22b8096c51fcfe52d2fa309">
    10   <!ENTITY qca-size          "4.3 MB">
    11   <!ENTITY qca-buildsize     "110 MB">
    12   <!ENTITY qca-time          "2.2 SBU">
     9  <!ENTITY qca-md5sum        "c2b00c732036244701bae4853a2101cf">
     10  <!ENTITY qca-size          "933 KB">
     11  <!ENTITY qca-buildsize     "29.2 MB">
     12  <!ENTITY qca-time          "1.9 SBU">
    1313]>
    1414
    … …  
    6363    <bridgehead renderas="sect4">Required</bridgehead>
    6464    <para role="required">
    65     <xref linkend="qt4"/> and
    66     <xref linkend="which"/>
     65    <xref linkend="cmake"/> and
     66    <xref linkend="qt4"/>
     67    </para>
     68
     69    <bridgehead renderas="sect4">Recommended</bridgehead>
     70    <para role="recommended">
     71      <xref linkend="cacerts"/>
     72    </para>
     73
     74    <bridgehead renderas="sect4">Optional</bridgehead>
     75    <para role="optional">
     76      <xref linkend="cyrus-sasl"/>,
     77      <xref linkend="gnupg2"/>,
     78      <xref linkend="libgcrypt"/>,
     79      <xref linkend="nss"/>,
     80      <xref linkend="openssl"/>,
     81      <xref linkend="qt5"/>,
     82      <ulink url="http://botan.randombit.net/">Botan</ulink> and
     83      <ulink url="https://github.com/OpenSC/pkcs11-helper">pkcs11-helper</ulink>
    6784    </para>
    6885
    … …  
    7895    commands:</para>
    7996
    80 <screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
    81 ./configure --prefix=/usr --no-separate-debug-info &amp;&amp;
     97<screen><userinput>mkdir build &amp;&amp;
     98cd    build &amp;&amp;
     99
     100cmake -DCMAKE_INSTALL_PREFIX=/usr \
     101      -DCMAKE_BUILD_TYPE=Release  \
     102      -DQT4_BUILD=ON              \
     103      -DQCA_DOC_INSTALL_DIR=/usr/share/doc/qca-2.1.0            \
     104      -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features \
     105      -DQCA_INCLUDE_INSTALL_DIR=/usr/include/qt4                \
     106      -DQCA_PRIVATE_INCLUDE_INSTALL_DIR=/usr/include/qt4        \
     107      -DQCA_PLUGINS_INSTALL_DIR=/usr/lib/qt4/plugins            \
     108      -Wno-dev .. &amp;&amp;
     109
    82110make</userinput></screen>
    83111
    … …  
    87115
    88116<screen role="root"><userinput>make install</userinput></screen>
     117
     118    <para>
     119      If <application>Qt4</application> isn't installed in
     120      <filename class="directory">/usr</filename>, ensure
     121      it can properly find the modules installed by this
     122      package by running the following commands as the
     123      <systemitem class="username">root</systemitem> user:
     124    </para>
     125
     126<screen role="root"><userinput>if [[ ${QT4DIR} != "/usr" ]]
     127then
     128   ln -sfv /usr/include/qt4/QtCrypto                  \
     129           ${QT4DIR}/include/qt4/                     &amp;&amp;
     130   ln -sfv /usr/share/qt4/mkspecs/features/crypto.prf \
     131           ${QT4DIR}/share/qt4/mkspecs/features/      &amp;&amp;
     132
     133   install -v -dm755 ${QT4DIR}/lib/qt4/plugins/crypto &amp;&amp;
     134
     135   for file in /usr/lib/qt4/plugins/crypto/*
     136   do
     137       ln -sfv ${file} ${QT4DIR}/lib/qt4/plugins/crypto/
     138   done &amp;&amp;
     139
     140   unset file
     141fi</userinput></screen>
    89142
    90143  </sect2>
    … …  
    93146    <title>Command Explanations</title>
    94147
    95     <para><command>sed -i '217s@set@...</command>: This sed fixes compiling with
    96     <application>GCC</application> 4.7 and newer. It is safe to omit when compiling
    97     with older <application>GCC</application> versions.</para>
     148    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
     149    to apply higher level of the compiler optimizations.</para>
    98150 
    99     <para><option>--no-separate-debug-info</option>: Prevents installation
    100     of a separate library and program file with debug information.</para>
     151    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to ensure
     152    that <application>Qt4</application> version of the library is built even if
     153    <application>Qt5</application> is present.</para>
     154
     155    <para><parameter>-DQCA_*_INSTALL_DIR=...</parameter>: These switches are used
     156    to ensure that files depending on the <application>Qt4</application>
     157     installation prefix are installed in the correct locations.</para>
    101158
    102159  </sect2>
    … …  
    111168
    112169      <seglistitem>
    113         <seg>qcatool2</seg>
     170        <seg>mozcerts and qcatool2</seg>
    114171        <seg>libqca.so</seg>
    115         <seg>/usr/include/QtCrypto</seg>
     172        <seg>
     173          /usr/include/qt4/QtCrypto,
     174          /usr/lib/cmake/Qca,
     175          /usr/lib/qt4/plugins/crypto and,
     176          depending on the <application>Qt4</application>
     177          installation prefix,
     178          $QT4DIR/include/qt4/QtCrypto and
     179          $QT4DIR/lib/qt4/plugins/crypto
     180        </seg>
    116181      </seglistitem>
    117182    </segmentedlist>
    … …  
    121186      <?dbfo list-presentation="list"?>
    122187      <?dbhtml list-presentation="table"?>
     188
     189      <varlistentry id="mozcerts">
     190        <term><command>mozcerts</command></term>
     191        <listitem>
     192          <para>is a command line tool for converting certdata.txt into
     193          outfile.pem files.</para>
     194          <indexterm zone="qca mozcerts">
     195            <primary sortas="b-mozcerts">mozcerts</primary>
     196          </indexterm>
     197        </listitem>
     198      </varlistentry>
    123199
    124200      <varlistentry id="qcatool2">

  • introduction/welcome/changelog.xml

    r1c7f183 rcf02129  
    6969          <para>[fernando] - Update to LVM2.2.02.114. Fixes
    7070          <ulink url="&blfs-ticket-root;5883">#5883</ulink>.</para>
     71        </listitem>
     72        <listitem>
     73          <para>[cjg] - Updated to qca-2.1.0.</para>
    7174        </listitem>
    7275      </itemizedlist>

  • packages.ent

    r1c7f183 rcf02129  
    142142<!ENTITY pth-version                  "2.0.7">
    143143<!ENTITY ptlib-version                "2.10.10">
    144 <!ENTITY qca-version                  "2.0.3">
     144<!ENTITY qca-version                  "2.1.0">
    145145<!ENTITY qjson-version                "0.8.1">
    146146<!ENTITY sbc-version                  "1.3">
Note: See TracChangeset for help on using the changeset viewer.