Author: rthomsen
Date: Sat Aug 24 11:18:35 2013
New Revision: 11688
Log:
Improvements to qca, qjson and libdbusmenu-qt instructions.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/libdbusmenuqt.xml
trunk/BOOK/general/genlib/qca.xml
trunk/BOOK/general/genlib/qjson.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sat Aug 24 10:02:41 2013 (r11687)
+++ trunk/BOOK/general.ent Sat Aug 24 11:18:35 2013 (r11688)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "23"> <!-- Always 2 digits -->
+<!ENTITY day "24"> <!-- Always 2 digits -->
<!ENTITY month "08"> <!-- Always 2 digits -->
<!ENTITY year "2013">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "August 23rd, &year;">
+<!ENTITY releasedate "August 24th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
Modified: trunk/BOOK/general/genlib/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/general/genlib/libdbusmenuqt.xml Sat Aug 24 10:02:41 2013
(r11687)
+++ trunk/BOOK/general/genlib/libdbusmenuqt.xml Sat Aug 24 11:18:35 2013
(r11688)
@@ -92,6 +92,7 @@
<screen><userinput>mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
+ -DCMAKE_BUILD_TYPE=Release \
-DWITH_DOC=OFF .. &&
make</userinput></screen>
@@ -108,6 +109,10 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
+ build without debugging symbols and apply a higher level of compiler
+ optimizations.</para>
+
<para><option>-DWITH_DOC=OFF</option>: This option is set to avoid building
the API documentation. Omit it if you have
<application>doxygen</application>
installed and want the documentation.</para>
Modified: trunk/BOOK/general/genlib/qca.xml
==============================================================================
--- trunk/BOOK/general/genlib/qca.xml Sat Aug 24 10:02:41 2013 (r11687)
+++ trunk/BOOK/general/genlib/qca.xml Sat Aug 24 11:18:35 2013 (r11688)
@@ -58,15 +58,6 @@
</listitem>
</itemizedlist>
-<!--
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing='compact'>
- <listitem>
- <para>Required patch: <ulink
- url="&patch-root;/qca-&qca-version;-fixes-1.patch"/></para>
- </listitem>
- </itemizedlist>
--->
<bridgehead renderas="sect3">Qca Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -88,7 +79,8 @@
<screen><userinput>sed -i '217s@set@this->set@'
src/botantools/botan/botan/secmem.h &&
./configure --prefix=&qt4-dir; \
- --certstore-path=/etc/ssl/ca-bundle.crt &&
+ --certstore-path=/etc/ssl/ca-bundle.crt \
+ --no-separate-debug-info &&
make</userinput></screen>
<para>To test the results, issue <command>make test</command>.</para>
@@ -103,12 +95,15 @@
<title>Command Explanations</title>
<para><command>sed -i '217s@set@...</command>: This sed fixes compiling
with
- <application>GCC</application> 4.7.x. It is safe to omit when compiling
with
- older <application>GCC</application> versions.</para>
+ <application>GCC</application> 4.7 and newer. It is safe to omit when
compiling
+ with older <application>GCC</application> versions.</para>
- <para><parameter>--certstore-path=/etc/ssl/ca-bundle.crt</parameter>:
Causes
+ <para><option>--certstore-path=/etc/ssl/ca-bundle.crt</option>: Causes
the build to use the system-installed CA Certificates instead of a bundled
copy.</para>
+
+ <para><option>--no-separate-debug-info</option>: Prevents installation
+ of a separate library and program file with debug information.</para>
</sect2>
@@ -121,29 +116,40 @@
<segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>qcatool2 and qcatool2.debug</seg>
- <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
- <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
+ <seg>qcatool2</seg>
+ <seg>libqca.so</seg>
+ <seg>&qt4-dir;/include/QtCrypto</seg>
</seglistitem>
</segmentedlist>
-<!--
+
<variablelist>
<bridgehead renderas="sect3">Short Descriptions</bridgehead>
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="a-automoc4">
- <term><command>automoc4</command></term>
+ <varlistentry id="qcatool2">
+ <term><command>qcatool2</command></term>
<listitem>
- <para>is a testing utility for qca-generated build trees.</para>
- <indexterm zone="a-automoc4 automoc4">
- <primary sortas="b-automoc4">automoc4</primary>
+ <para>is a command line tool for performing various cryptographic
+ operations with Qca.</para>
+ <indexterm zone="qca qcatool2">
+ <primary sortas="b-qcatool2">qcatool2</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libqca">
+ <term><filename class='libraryfile'>libqca.so</filename></term>
+ <listitem>
+ <para>is the Qt Cryptography Architecture (Qca) library.</para>
+ <indexterm zone="qca libqca">
+ <primary sortas="c-libqca">libqca.so</primary>
</indexterm>
</listitem>
</varlistentry>
</variablelist>
--->
+
</sect2>
</sect1>
Modified: trunk/BOOK/general/genlib/qjson.xml
==============================================================================
--- trunk/BOOK/general/genlib/qjson.xml Sat Aug 24 10:02:41 2013 (r11687)
+++ trunk/BOOK/general/genlib/qjson.xml Sat Aug 24 11:18:35 2013 (r11688)
@@ -108,6 +108,15 @@
<screen role="root"><userinput>make install</userinput></screen>
</sect2>
+
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
+ build without debugging symbols and apply a higher level of compiler
+ optimizations.</para>
+
+ </sect2>
<sect2 role="content">
<title>Contents</title>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Aug 24 10:02:41
2013 (r11687)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Aug 24 11:18:35
2013 (r11688)
@@ -44,7 +44,17 @@
-->
<listitem>
- <para>August 23nd, 2013</para>
+ <para>August 24th, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[rthomsen] - Add <option>--no-separate-debug-info</option>
+ switch to Qca instructions.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>August 23rd, 2013</para>
<itemizedlist>
<listitem>
<para>[fernando] - freetype: comment broken ftp link; compressdoc:
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
