Author: bdubbs
Date: Sat Jun 4 17:46:57 2016
New Revision: 17444
Log:
Remove references to qt4 in poppler, cmake,
doxygen, qca, and pinentry
Modified:
trunk/BOOK/general/genlib/qca.xml
trunk/BOOK/general/genutils/pinentry.xml
trunk/BOOK/general/graphlib/poppler.xml
trunk/BOOK/general/prog/cmake.xml
trunk/BOOK/general/prog/doxygen.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/qt4.xml
Modified: trunk/BOOK/general/genlib/qca.xml
==============================================================================
--- trunk/BOOK/general/genlib/qca.xml Sat Jun 4 16:08:38 2016 (r17443)
+++ trunk/BOOK/general/genlib/qca.xml Sat Jun 4 17:46:57 2016 (r17444)
@@ -34,7 +34,7 @@
and conventions. <application>Qca</application> separates the API from
the implementation, using plugins known as Providers.</para>
- &lfs79_checked;
+ &lfs79_checked;&gcc6_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -64,7 +64,7 @@
<para role="required">
<xref linkend="cacerts"/>,
<xref linkend="cmake"/>,
- <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
+ <xref linkend="qt5"/>, and
<xref linkend="which"/>
</para>
@@ -94,29 +94,16 @@
<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; &&
-QT4_BUILD=ON</userinput></screen>
-
- <para>If using qt5, run:</para>
-
-<screen><userinput>QT_DIR=&qt5-dir; &&
-QT4_BUILD=OFF</userinput></screen>
-
<para>Install <application>Qca</application> by running the following
commands:</para>
<screen><userinput>mkdir build &&
cd build &&
-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 \
.. &&
-unset QT_DIR QT4_BUILD &&
make</userinput></screen>
@@ -134,9 +121,6 @@
<para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
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>
@@ -151,12 +135,12 @@
<segtitle>Installed Directories</segtitle>
<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>
</segmentedlist>
@@ -167,33 +151,33 @@
<?dbhtml list-presentation="table"?>
<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>
</varlistentry>
<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>
</varlistentry>
<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>
</varlistentry>
Modified: trunk/BOOK/general/genutils/pinentry.xml
==============================================================================
--- trunk/BOOK/general/genutils/pinentry.xml Sat Jun 4 16:08:38 2016
(r17443)
+++ trunk/BOOK/general/genutils/pinentry.xml Sat Jun 4 17:46:57 2016
(r17444)
@@ -41,7 +41,7 @@
<application>GTK</application> and <application>Qt</application>
toolkits.</para>
- &lfs79_checked;
+ &lfs79_checked;&gcc6_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -79,8 +79,7 @@
<xref linkend="gtk2"/>,
<xref linkend="gtk3"/>,
<xref linkend="libcap-pam"/>,
- <xref linkend="libsecret"/>,
- <xref linkend="qt4"/>, and
+ <xref linkend="libsecret"/>, and
<xref linkend="qt5"/>
</para>
@@ -96,7 +95,6 @@
commands:</para>
<screen><userinput>./configure --prefix=/usr &&
-
make</userinput></screen><!-- &&
makeinfo - -html - -no-split -o doc/pinentry_nochunks.html doc/pinentry.texi
&&
@@ -133,12 +131,6 @@
<title>Command Explanations</title>
<para>
- <option>--disable-pinentry-qt5</option>: Default is enable. Don't use qt5
- even if it is available. If qt4 is found, <command>pinentry-qt</command>
- will be linked to qt4.
- </para>
-
- <para>
<option>--enable-pinentry-qt=yes/no</option>: Default is yes.
</para>
Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml Sat Jun 4 16:08:38 2016
(r17443)
+++ trunk/BOOK/general/graphlib/poppler.xml Sat Jun 4 17:46:57 2016
(r17444)
@@ -143,9 +143,7 @@
<xref linkend="lcms"/> or <xref linkend="lcms2"/>,
<xref linkend="libtiff"/>,
<xref linkend="openjpeg2"/>
- (preference is for OpenJPEG1, due to regressions with OpenJPEG2),
- <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
- is needed for PDF support in <application>Okular</application>), and
+ (preference is for OpenJPEG1, due to regressions with OpenJPEG2), and
<xref linkend="qt5"/>
</para>
Modified: trunk/BOOK/general/prog/cmake.xml
==============================================================================
--- trunk/BOOK/general/prog/cmake.xml Sat Jun 4 16:08:38 2016 (r17443)
+++ trunk/BOOK/general/prog/cmake.xml Sat Jun 4 17:46:57 2016 (r17444)
@@ -84,7 +84,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI),
+ <xref linkend="qt5"/> (for the Qt-based GUI),
<xref linkend="subversion"/> (for testing), and
<ulink url="http://pypi.python.org/pypi/Sphinx";>Sphinx</ulink>
(for building documents)
Modified: trunk/BOOK/general/prog/doxygen.xml
==============================================================================
--- trunk/BOOK/general/prog/doxygen.xml Sat Jun 4 16:08:38 2016 (r17443)
+++ trunk/BOOK/general/prog/doxygen.xml Sat Jun 4 17:46:57 2016 (r17444)
@@ -50,7 +50,7 @@
automatically.
</para>
- &lfs79_checked;
+ &lfs79_checked;&gcc6_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -108,9 +108,8 @@
<xref linkend="libxml2"/> (required for the tests),
<xref linkend="llvm"/> (with clang),
<xref linkend="python2"/> or <xref linkend="python3"/>,
- <xref linkend="qt4"/> or
<xref linkend="qt5"/> (for doxywizard),
- <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>) and
+ <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
<xref linkend="xapian"/> (for doxyindexer)
</para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Jun 4 16:08:38
2016 (r17443)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Jun 4 17:46:57
2016 (r17444)
@@ -47,6 +47,10 @@
<para>June 4th, 2016</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Remove references to qt4 in poppler, cmake,
+ doxygen, qca, and pinentry.</para>
+ </listitem>
+ <listitem>
<para>[dj] - Add local user and Linux-PAM configuration to vsftpd.
Fixes <ulink url="&blfs-ticket-root;7896">#7896</ulink>.</para>
</listitem>
Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml Sat Jun 4 16:08:38 2016 (r17443)
+++ trunk/BOOK/x/lib/qt4.xml Sat Jun 4 17:46:57 2016 (r17444)
@@ -16,10 +16,10 @@
<!ENTITY qt4-size "230 MB">
<!ENTITY qt4-buildsize "2.3 GB">
<!ENTITY qt4-time "12 SBU, using parallelism=4">
-
+<!--
<!ENTITY qtwebkit-download
"&webkit-url;/&wk-version;/src/qtwebkit-&wk-version;.tar.gz">
<!ENTITY qtwebkit-md5sum "42ef76d0cf7d0c611ef83418e9f297ff">
- <!ENTITY qtwebkit-size "50 MB">
+ <!ENTITY qtwebkit-size "50 MB">-->
]>
<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
@@ -83,7 +83,7 @@
</para>
</listitem>
</itemizedlist>
-
+<!--
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@@ -108,7 +108,7 @@
</para>
</listitem>
</itemizedlist>
-
+-->
<bridgehead renderas="sect3">Qt Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -294,7 +294,7 @@
-e 's/(QMAKE_PRL_LIBS =).*/\1/' \
-i $file
done</userinput></screen>
-
+<!--
<bridgehead renderas="sect3">Building Qtwebkit</bridgehead>
<para>
@@ -316,12 +316,12 @@
patch -Np1 -i ../../qtwebkit-&wk-version;-gcc5-1.patch &&
QTDIR=$QT4PREFIX PATH=$PATH:$QT4PREFIX/bin \
-Tools/Scripts/build-webkit --qt \
- --no-webkit2 \
- --prefix=$QT4PREFIX</userinput></screen>
+Tools/Scripts/build-webkit -i -qt \
+ - -no-webkit2 \
+ - -prefix=$QT4PREFIX</userinput></screen>
<para>If desired, the build process can use parallel processors by
- adding the option <option>--makeargs=-j<number></option> to
+ adding the option <option>- -makeargs=-j<number></option> to
the <command>build-webkit</command> instruction above.</para>
<para>
@@ -329,7 +329,7 @@
</para>
<screen role="root"><userinput>make -C WebKitBuild/Release
install</userinput></screen>
-
+-->
<bridgehead renderas="sect3">Installing Auxillary Files</bridgehead>
<para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
