Changeset 67b1a0a


Ignore:
Timestamp:
06/05/2016 12:46:57 AM (5 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
eb3dbe3
Parents:
87f9b81
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

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/qca.xml

    r87f9b81 r67b1a0a  
    3535    the implementation, using plugins known as Providers.</para>
    3636
    37     &lfs79_checked;
     37    &lfs79_checked;&gcc6_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    6565    <xref linkend="cacerts"/>,
    6666    <xref linkend="cmake"/>,
    67     <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
     67    <xref linkend="qt5"/>, and
    6868    <xref linkend="which"/>
    6969    </para>
     
    9595<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
    9696
    97     <para>This package can be built against <xref linkend="qt4"/> or <xref linkend="qt5"/>.
    98     If using qt4, run:</para>
    99 
    100 <screen><userinput>QT_DIR=&qt4-dir; &amp;&amp;
    101 QT4_BUILD=ON</userinput></screen>
    102 
    103     <para>If using qt5, run:</para>
    104 
    105 <screen><userinput>QT_DIR=&qt5-dir; &amp;&amp;
    106 QT4_BUILD=OFF</userinput></screen>
    107 
    10897    <para>Install <application>Qca</application> by running the following
    10998    commands:</para>
     
    112101cd    build &amp;&amp;
    113102
    114 cmake -DCMAKE_INSTALL_PREFIX=$QT_DIR            \
     103cmake -DCMAKE_INSTALL_PREFIX=$QT5DIR            \
    115104      -DCMAKE_BUILD_TYPE=Release                \
    116       -DQT4_BUILD=$QT4_BUILD                    \
    117105      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
    118106      ..                                        &amp;&amp;
    119 unset QT_DIR QT4_BUILD                          &amp;&amp;
    120107
    121108make</userinput></screen>
     
    135122    used to apply a higher level of compiler optimizations.</para>
    136123
    137     <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
    138     building with Qt4 even if Qt5 is found.</para>
    139 
    140124    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
    141125    Install the qca man page in the normal location.</para>
     
    152136
    153137      <seglistitem>
    154         <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
    155         <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
     138        <seg>mozcerts-qt5 and qcatool-qt5</seg>
     139        <seg>libqca-qt5.so</seg>
    156140        <seg>
    157           &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
    158           &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
    159           &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
     141          &qt5-dir;/include/Qca-qt5,
     142          &qt5-dir;/lib/cmake/Qca-qt5, and
     143          &qt5-dir;/lib/qca-qt5
    160144        </seg>
    161145      </seglistitem>
     
    168152
    169153      <varlistentry id="mozcerts">
    170         <term><command>mozcerts</command></term>
     154        <term><command>mozcerts-qt5</command></term>
    171155        <listitem>
    172156          <para>is a command line tool for converting certdata.txt into
    173157          outfile.pem files.</para>
    174158          <indexterm zone="qca mozcerts">
    175             <primary sortas="b-mozcerts">mozcerts</primary>
     159            <primary sortas="b-mozcerts">mozcerts-qt5</primary>
    176160          </indexterm>
    177161        </listitem>
     
    179163
    180164      <varlistentry id="qcatool">
    181         <term><command>qcatool</command></term>
     165        <term><command>qcatool-qt5</command></term>
    182166        <listitem>
    183167          <para>is a command line tool for performing various cryptographic
    184168          operations with Qca.</para>
    185169          <indexterm zone="qca qcatool">
    186             <primary sortas="b-qcatool">qcatool</primary>
     170            <primary sortas="b-qcatool">qcatool-qt5</primary>
    187171          </indexterm>
    188172        </listitem>
     
    190174
    191175      <varlistentry id="libqca">
    192         <term><filename class='libraryfile'>libqca.so</filename></term>
     176        <term><filename class='libraryfile'>libqca-qt5.so</filename></term>
    193177        <listitem>
    194178          <para>is the Qt Cryptography Architecture (Qca) library.</para>
    195179          <indexterm zone="qca libqca">
    196             <primary sortas="c-libqca">libqca.so</primary>
     180            <primary sortas="c-libqca">libqca-qt5.so</primary>
    197181          </indexterm>
    198182        </listitem>
  • general/genutils/pinentry.xml

    r87f9b81 r67b1a0a  
    4242    toolkits.</para>
    4343
    44     &lfs79_checked;
     44    &lfs79_checked;&gcc6_checked;
    4545
    4646    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8080      <xref linkend="gtk3"/>,
    8181      <xref linkend="libcap-pam"/>,
    82       <xref linkend="libsecret"/>,
    83       <xref linkend="qt4"/>, and
     82      <xref linkend="libsecret"/>, and
    8483      <xref linkend="qt5"/>
    8584    </para>
     
    9796
    9897<screen><userinput>./configure --prefix=/usr &amp;&amp;
    99 
    10098make</userinput></screen><!-- &amp;&amp;
    10199
     
    132130  <sect2 role="commands">
    133131    <title>Command Explanations</title>
    134 
    135     <para>
    136       <option>--disable-pinentry-qt5</option>: Default is enable. Don't use qt5
    137       even if it is available. If qt4 is found, <command>pinentry-qt</command>
    138       will be linked to qt4.
    139     </para>
    140132
    141133    <para>
  • general/graphlib/poppler.xml

    r87f9b81 r67b1a0a  
    144144      <xref linkend="libtiff"/>,
    145145      <xref linkend="openjpeg2"/>
    146       (preference is for OpenJPEG1, due to regressions with OpenJPEG2),
    147       <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
    148       is needed for PDF support in <application>Okular</application>), and
     146      (preference is for OpenJPEG1, due to regressions with OpenJPEG2), and
    149147      <xref linkend="qt5"/>
    150148    </para>
  • general/prog/cmake.xml

    r87f9b81 r67b1a0a  
    8585    <bridgehead renderas="sect4">Optional</bridgehead>
    8686    <para role="optional">
    87       <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI),
     87      <xref linkend="qt5"/> (for the Qt-based GUI),
    8888      <xref linkend="subversion"/> (for testing), and
    8989      <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
  • general/prog/doxygen.xml

    r87f9b81 r67b1a0a  
    5151    </para>
    5252
    53     &lfs79_checked;
     53    &lfs79_checked;&gcc6_checked;
    5454
    5555    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    109109      <xref linkend="llvm"/> (with clang),
    110110      <xref linkend="python2"/> or <xref linkend="python3"/>,
    111       <xref linkend="qt4"/> or
    112111      <xref linkend="qt5"/> (for doxywizard),
    113       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>) and
     112      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
    114113      <xref linkend="xapian"/> (for doxyindexer)
    115114    </para>
  • introduction/welcome/changelog.xml

    r87f9b81 r67b1a0a  
    4747      <para>June 4th, 2016</para>
    4848      <itemizedlist>
     49        <listitem>
     50          <para>[bdubbs] - Remove references to qt4 in poppler, cmake,
     51          doxygen, qca, and pinentry.</para>
     52        </listitem>
    4953        <listitem>
    5054          <para>[dj] - Add local user and Linux-PAM configuration to vsftpd.
  • x/lib/qt4.xml

    r87f9b81 r67b1a0a  
    1717  <!ENTITY qt4-buildsize     "2.3 GB">
    1818  <!ENTITY qt4-time          "12 SBU, using parallelism=4">
    19 
     19<!--
    2020  <!ENTITY qtwebkit-download "&webkit-url;/&wk-version;/src/qtwebkit-&wk-version;.tar.gz">
    2121  <!ENTITY qtwebkit-md5sum   "42ef76d0cf7d0c611ef83418e9f297ff">
    22   <!ENTITY qtwebkit-size     "50 MB">
     22  <!ENTITY qtwebkit-size     "50 MB">-->
    2323]>
    2424
     
    8484      </listitem>
    8585    </itemizedlist>
    86 
     86<!--
    8787    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    8888    <itemizedlist spacing="compact">
     
    109109      </listitem>
    110110    </itemizedlist>
    111 
     111-->
    112112    <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
    113113
     
    295295            -i $file
    296296done</userinput></screen>
    297 
     297<!--
    298298    <bridgehead renderas="sect3">Building Qtwebkit</bridgehead>
    299299
     
    317317
    318318QTDIR=$QT4PREFIX PATH=$PATH:$QT4PREFIX/bin \
    319 Tools/Scripts/build-webkit --qt            \
    320                            --no-webkit2    \
    321                            --prefix=$QT4PREFIX</userinput></screen>
     319Tools/Scripts/build-webkit -i -qt            \
     320                           - -no-webkit2    \
     321                           - -prefix=$QT4PREFIX</userinput></screen>
    322322
    323323   <para>If desired, the build process can use parallel processors by
    324    adding the option <option>--makeargs=-j&lt;number&gt;</option> to
     324   adding the option <option>- -makeargs=-j&lt;number&gt;</option> to
    325325   the <command>build-webkit</command> instruction above.</para>
    326326
     
    330330
    331331<screen role="root"><userinput>make -C WebKitBuild/Release install</userinput></screen>
    332 
     332-->
    333333    <bridgehead renderas="sect3">Installing Auxillary Files</bridgehead>
    334334
Note: See TracChangeset for help on using the changeset viewer.