Author: fernando
Date: Sun Jul 19 10:26:23 2015
New Revision: 16261
Log:
• LXQt applications: More fixes, including some for building with Qt4.
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/lxqt/apps/lximage_qt.xml
trunk/BOOK/lxqt/apps/obconf_qt.xml
trunk/BOOK/lxqt/apps/qterminal.xml
trunk/BOOK/lxqt/apps/qtermwidget.xml
trunk/BOOK/lxqt/apps/qupzilla.xml
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Jul 18 23:41:38
2015 (r16260)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sun Jul 19 10:26:23
2015 (r16261)
@@ -48,6 +48,11 @@
<para>July 19th, 2015</para>
<itemizedlist>
<listitem>
+ <para>[fernando] - LXQt applications: More fixes, including some for
+ building with Qt4.
+ <ulink url="&blfs-ticket-root;5683">#5683</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[renodr] - Update to libgusb-1.2.6. Fixes
<ulink url="&blfs-ticket-root;6693">#6693</ulink>.</para>
</listitem>
Modified: trunk/BOOK/lxqt/apps/lximage_qt.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/lximage_qt.xml Sat Jul 18 23:41:38 2015 (r16260)
+++ trunk/BOOK/lxqt/apps/lximage_qt.xml Sun Jul 19 10:26:23 2015 (r16261)
@@ -134,7 +134,7 @@
<para>
<command>sed -i ... src/translations/lximage-qt_pt_BR.t</command>: Fixes
a bug introduced by the translation. If you will never use pt_BR as the
- prefix of your locale, this fix can be safely removed.
+ prefix of your locale, this fix can be safely ignored.
</para>
<para>
Modified: trunk/BOOK/lxqt/apps/obconf_qt.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/obconf_qt.xml Sat Jul 18 23:41:38 2015 (r16260)
+++ trunk/BOOK/lxqt/apps/obconf_qt.xml Sun Jul 19 10:26:23 2015 (r16261)
@@ -111,8 +111,8 @@
make</userinput></screen>
<para>
- The choice of <filename class="directory">/usr</filename> for prefix is
- due to the general characteristics of this program, which can be used
+ The choice of <filename class="directory">/usr</filename> prefix is due
+ to the general characteristics of this program, which can be used
without <application>LXQt</application>.
</para>
@@ -136,10 +136,6 @@
this application linked to <application>Qt4</application>.
</para>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/static-libraries.xml"/>
-
</sect2>
<sect2 role="content">
Modified: trunk/BOOK/lxqt/apps/qterminal.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/qterminal.xml Sat Jul 18 23:41:38 2015 (r16260)
+++ trunk/BOOK/lxqt/apps/qterminal.xml Sun Jul 19 10:26:23 2015 (r16261)
@@ -104,8 +104,8 @@
make</userinput></screen>
<para>
- The choice of <filename class="directory">/usr</filename> for prefix is
- due to the general characteristics of this program, which can be used
+ The choice of <filename class="directory">/usr</filename> prefix is due
+ to the general characteristics of this program, which can be used
without <application>LXQt</application>.
</para>
@@ -126,14 +126,18 @@
<para>
<parameter>-DUSE_SYSTEM_QXT=OFF</parameter>: This switch is necessary
- because the option has not yet been implemented.
+ because the option has not been implemented if linking with
+ <application>Qt5</application>. However, use it also if you choose
+ linking to <application>Qt4</application>, because <ulink
+ url="https://bitbucket.org/libqxt/libqxt/wiki/Home";>libqxt</ulink> is
+ required, but is no longer maintained.
</para>
<para>
- <parameter>-DUSE_QT5=true</parameter>: Use this switch, if you prefer to
+ <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
build this application linked to <application>Qt5</application>. Toggle
to <quote>false</quote>, if you prefer to use
- <application>Qt4</application> (not tested by BLFS editors).
+ <application>Qt4</application>.
</para>
</sect2>
Modified: trunk/BOOK/lxqt/apps/qtermwidget.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/qtermwidget.xml Sat Jul 18 23:41:38 2015
(r16260)
+++ trunk/BOOK/lxqt/apps/qtermwidget.xml Sun Jul 19 10:26:23 2015
(r16261)
@@ -89,9 +89,15 @@
<title>Installation of qtermwidget</title>
<para>
- For compilation with <application>Qt4</application>, see <quote>Command
- Explanations</quote>, below. Install
- <application>qtermwidget</application> by running the following commands:
+ If you have <application>Qt4</application> and
+ <application>Qt5</application> installed, run <command>source
+ setqt4</command> or <command>source setqt5</command>, respectively, in
+ order to link <application>qtermwidget</application> to the one of your
+ choice. Following instructions are for <application>Qt5</application>
+ linking. For compilation with <application>Qt4</application>, see
+ <quote>Command Explanations</quote>, below. Install
+ <application>qtermwidget</application> by running the following
+ commands:
</para>
<screen><userinput>mkdir -v build &&
@@ -129,14 +135,16 @@
<para>
<parameter>-DBUILD_DESIGNER_PLUGIN=0</parameter>: This switch is
- necessary because the option has not yet been implemented.
+ necessary, because building the Qt designer plugin is not supported for
+ <application>Qt5</application> yet. Toggle to 1 or remove, if you prefer
+ to use <application>Qt4</application>.
</para>
<para>
- <parameter>-DUSE_QT5=true</parameter>: Use this switch, if you prefer to
+ <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
build this application linked to <application>Qt5</application>. Toggle
to <quote>false</quote>, if you prefer to use
- <application>Qt4</application> (not tested by BLFS editors).
+ <application>Qt4</application>.
</para>
</sect2>
@@ -154,10 +162,13 @@
None
</seg>
<seg>
- libqtermwidget5.so
+ libqtermwidget5.so or
+ libqtermwidget4.so and
+ /usr/lib/qt4/plugins/designer/libqtermwidget4plugin.so
</seg>
<seg>
- /usr/{include,share{/cmake,}}/qtermwidget5
+ /usr/{include,share{/cmake,}}/qtermwidget5 or
+ /usr/{include,share{/cmake,}}/qtermwidget4
</seg>
</seglistitem>
</segmentedlist>
@@ -179,6 +190,29 @@
</listitem>
</varlistentry>
+ <varlistentry id="libqtermwidget4-lib">
+ <term><filename
class="libraryfile">libqtermwidget4.so</filename></term>
+ <listitem>
+ <para>
+ contains the <application>libqtermwidget4</application> API
functions.
+ </para>
+ <indexterm zone="qtermwidget libqtermwidget4-lib">
+ <primary sortas="c-libqtermwidget4">libqtermwidget4.so</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libqtermwidget4plugin-lib">
+ <term><filename
class="libraryfile">libqtermwidget4plugin.so</filename></term>
+ <listitem>
+ <para>
+ contains the <application>qtermwidget Qt4 designer
plugin</application>.
+ </para>
+ <indexterm zone="qtermwidget libqtermwidget4plugin-lib">
+ <primary
sortas="c-libqtermwidget4plugin">libqtermwidget4plugin.so</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
</variablelist>
Modified: trunk/BOOK/lxqt/apps/qupzilla.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/qupzilla.xml Sat Jul 18 23:41:38 2015 (r16260)
+++ trunk/BOOK/lxqt/apps/qupzilla.xml Sun Jul 19 10:26:23 2015 (r16261)
@@ -20,7 +20,7 @@
<date>$Date$</date>
</sect1info>
- <title>QupZilla-&qupzilla-version;</title>
+ <title>qupzilla-&qupzilla-version;</title>
<indexterm zone="qupzilla">
<primary sortas="a-QupZilla">QupZilla</primary>
@@ -30,12 +30,9 @@
<title>Introduction to QupZilla</title>
<para>
- <application>QupZilla</application> is a fast
- <application>QtWebKit</application> browser. It aims to be a lightweight
- web browser available through all major platforms. It has been
- originally started only for educational purposes. But from its start,
- <application>QupZilla</application> has grown into a feature-rich
- browser.
+ <application>QupZilla</application> is a fast, feature-rich and
+ lightweight <application>QtWebKit</application> based browser,
+ originally intended only for educational purposes.
</para>
&lfs77_checked; &gcc5_checked;
@@ -93,7 +90,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="cmake"/>
+ <xref linkend="cmake"/>,
<xref linkend="openssl"/>, and
<xref linkend="qt5"/> or
<xref linkend="qt4"/>
@@ -116,7 +113,8 @@
<title>Installation of QupZilla</title>
<para>
- The following fixes are needed, if building with
<application>Qt5</application>:
+ The following fixes are needed, if building with
+ <application>Qt5</application>:
</para>
<screen><userinput>sed -e '/qtlocalpeer/ i #include <QDataStream>'
\
@@ -131,32 +129,38 @@
setqt4</command> or <command>source setqt5</command>, respectivelly.
</para>
- <para>
- The next commands are used for the build configuration and for fixing
- the submenu in the Desktop Environment. Alternatively, you can add each
- environmet variable, one at a line, to
- <filename>src/defines.pri</filename>.
- </para>
-
-<screen><userinput>export QUPZILLA_PREFIX=/usr \
- USE_WEBGL=true &&
+ <note>
+ <para>
+ By default, <application>QupZilla</application> installs its menu in
+ the Office category, depending on the Desktop Environment. If
+ desired, change it to the Internet category:
+ </para>
-sed -e 's/^TargetEnvironment/#&/' \
+<screen><userinput>sed -e 's/^TargetEnvironment/#&/' \
-e 's/Categories=/&Application;Internet;/' \
-i linux/applications/qupzilla.desktop</userinput></screen>
-
- <para>
- The choice of <filename class="directory">/usr</filename> for prefix is
- due to the general characteristics of this program, which can be used
- without <application>LXQt</application>.
- </para>
+ </note>
<para>
Install <application>QupZilla</application> by running the following
commands:
</para>
-<screen><userinput>qmake</userinput></screen>
+<screen><userinput>export QUPZILLA_PREFIX=/usr \
+ USE_WEBGL=true &&
+
+qmake &&
+
+make</userinput></screen>
+
+ <para>
+ The <command>export</command> command is used for configuring the build.
+ Alternatively, you can add each environmet variable, one at a line, to
+ <filename>src/defines.pri</filename>. The choice of <filename
+ class="directory">/usr</filename> prefix is due to the general
+ characteristics of this program, which can be used without
+ <application>LXQt</application>.
+ </para>
<para>
This package does not come with a test suite.
@@ -182,17 +186,12 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para>
- <command>sed ... -i linux/applications/qupzilla.desktop</command>:
- Fixes location in some Desktop Environment submenu.
- </para>
-
<note>
<para>
- Following variables need to be exported. You can add them to the
- <command>export</command> block in the main instructions.
- Alternatively, instead of exporting, they can be added, one at a line,
- to <filename>src/defines.pri</filename>.
+ If you wish to use any the following variables, they need to be
+ exported. You can add them to the <command>export</command> block in
+ the main instructions. Alternatively, instead of exporting, they can
+ be added, one at a line, to <filename>src/defines.pri</filename>.
</para>
</note>
@@ -202,13 +201,13 @@
</para>
<para>
- <envar>GNOME_INTEGRATION=true</envar>: Enable Gnome integration, this
+ <envar>GNOME_INTEGRATION=true</envar>: Enables Gnome integration, this
meaning the build of Gnome-Keyring Password plugin, which provides
support for storing passwords in Gnome-Keyring.
</para>
<para>
- <envar>KDE_INTEGRATION=true</envar>: Enable KDE integration, this
+ <envar>KDE_INTEGRATION=true</envar>: Enables KDE integration, this
meaning the build of KWallet Password plugin, which provides support for
storing passwords in KWallet.
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
