Author: pierre
Date: Thu Oct 13 07:36:45 2016
New Revision: 17879
Log:
Another set of option vs parameter fixes
Modified:
trunk/BOOK/gnome/applications/gedit.xml
trunk/BOOK/gnome/applications/gucharmap.xml
trunk/BOOK/gnome/platform/gconf.xml
trunk/BOOK/gnome/platform/gcr.xml
trunk/BOOK/gnome/platform/vte.xml
trunk/BOOK/kde/libdbusmenuqt.xml
trunk/BOOK/kde/phonon-backend-gstreamer.xml
trunk/BOOK/kde/phonon-backend-vlc.xml
trunk/BOOK/x/lib/libxklavier.xml
trunk/BOOK/x/lib/qt5.xml
trunk/BOOK/x/wm/icewm.xml
trunk/BOOK/x/wm/openbox.xml
trunk/BOOK/xfce/apps/parole.xml
trunk/BOOK/xfce/core/libwnck2.xml
trunk/BOOK/xfce/core/xfce4-session.xml
trunk/BOOK/xsoft/other/ekiga.xml
trunk/BOOK/xsoft/other/fontforge.xml
trunk/BOOK/xsoft/other/gparted.xml
Modified: trunk/BOOK/gnome/applications/gedit.xml
==============================================================================
--- trunk/BOOK/gnome/applications/gedit.xml Wed Oct 12 06:54:06 2016
(r17878)
+++ trunk/BOOK/gnome/applications/gedit.xml Thu Oct 13 07:36:45 2016
(r17879)
@@ -129,7 +129,7 @@
<title>Command Explanations</title>
<para>
- <option>--disable-spell</option>: Use this switch to disable
+ <parameter>--disable-spell</parameter>: Use this switch to disable
spell-checking capability. It is required if
<application>gspell</application> is not installed.
</para>
Modified: trunk/BOOK/gnome/applications/gucharmap.xml
==============================================================================
--- trunk/BOOK/gnome/applications/gucharmap.xml Wed Oct 12 06:54:06 2016
(r17878)
+++ trunk/BOOK/gnome/applications/gucharmap.xml Thu Oct 13 07:36:45 2016
(r17879)
@@ -136,7 +136,7 @@
</para>
<para>
- <option>--enable-vala</option>: This switch enables building of the
+ <parameter>--enable-vala</parameter>: This switch enables building of the
<application>Vala</application> bindings (auto-detection of
<command>vapigen</command> is currently broken). Remove if you don't
have <xref linkend="vala"/> installed.
Modified: trunk/BOOK/gnome/platform/gconf.xml
==============================================================================
--- trunk/BOOK/gnome/platform/gconf.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/gnome/platform/gconf.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -129,7 +129,7 @@
<title>Command Explanations</title>
<para>
- <option>--disable-orbit</option>: This switch is required if
+ <parameter>--disable-orbit</parameter>: This switch is required if
<application>ORBit2</application> is not installed.
<application>ORBit2</application> is a deprecated package.
</para>
Modified: trunk/BOOK/gnome/platform/gcr.xml
==============================================================================
--- trunk/BOOK/gnome/platform/gcr.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/gnome/platform/gcr.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -138,7 +138,7 @@
</para>
<para>
- <parameter>--without-gtk</parameter>: Use this switch if you
+ <option>--without-gtk</option>: Use this switch if you
haven't installed <xref linkend="gtk3"/>. Note that
<application>gcr-viewer</application> will not be installed
if this is passed to configure.
Modified: trunk/BOOK/gnome/platform/vte.xml
==============================================================================
--- trunk/BOOK/gnome/platform/vte.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/gnome/platform/vte.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -137,7 +137,7 @@
</para>
<para>
- <option>--enable-introspection</option>: This switch enables
+ <parameter>--enable-introspection</parameter>: This switch enables
<application>Gobject Introspection</application> bindings.
Remove if you don't have <xref linkend="gobject-introspection"/>
installed.
Modified: trunk/BOOK/kde/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/kde/libdbusmenuqt.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/kde/libdbusmenuqt.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -106,16 +106,14 @@
<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>-DUSE_QT4=TRUE</option>: This switch is used to ensure that
- Qt4 version of the library is built even if Qt5 is present.</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>
+ <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+ used to build without debugging symbols and apply a higher level of
+ compiler optimizations.</para>
+
+ <para><parameter>-DWITH_DOC=OFF</parameter>: This option is set to avoid
+ building the API documentation. Omit it if you have
+ <application>doxygen</application> installed and want the
+ documentation.</para>
</sect2>
Modified: trunk/BOOK/kde/phonon-backend-gstreamer.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-gstreamer.xml Wed Oct 12 06:54:06 2016
(r17878)
+++ trunk/BOOK/kde/phonon-backend-gstreamer.xml Thu Oct 13 07:36:45 2016
(r17879)
@@ -108,15 +108,16 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
- apply higher level of compiler optimizations.</para>
+ <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+ used to apply higher level of compiler optimizations.</para>
- <para><option>-DCMAKE_INSTALL_LIBDIR=lib</option>: This switch is used to
- get libraries to install to /usr/lib instead of /usr/lib64 on a 64 bit
- system.</para>
+ <para><parameter>-DCMAKE_INSTALL_LIBDIR=lib</parameter>: This switch is
+ used to get libraries to install to /usr/lib instead of /usr/lib64 on a
+ 64 bit system.</para>
- <para><option>-DPHONON_BUILD_PHONON4QT5=ON</option>: This switch is used to
- ensure that Qt5 version of the backend is built even if Qt4 is
present.</para>
+ <para><parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is
+ used to ensure that Qt5 version of the backend is built even if Qt4 is
+ present.</para>
</sect2>
Modified: trunk/BOOK/kde/phonon-backend-vlc.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-vlc.xml Wed Oct 12 06:54:06 2016
(r17878)
+++ trunk/BOOK/kde/phonon-backend-vlc.xml Thu Oct 13 07:36:45 2016
(r17879)
@@ -101,15 +101,16 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
apply
- higher level of compiler optimizations.</para>
+ <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+ used to apply higher level of compiler optimizations.</para>
- <para><option>-DCMAKE_INSTALL_LIBDIR=lib</option>: This switch is used to
- get libraries to install to /usr/lib instead of /usr/lib64 on a 64 bit
- system.</para>
+ <para><parameter>-DCMAKE_INSTALL_LIBDIR=lib</parameter>: This switch is
+ used to get libraries to install to /usr/lib instead of /usr/lib64 on a
+ 64 bit system.</para>
- <para><option>-DPHONON_BUILD_PHONON4QT5=ON</option>: This switch is used to
- ensure that Qt5 version of the backend is built even if Qt4 is
present.</para>
+ <para><parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is
+ used to ensure that Qt5 version of the backend is built even if Qt4 is
+ present.</para>
</sect2>
Modified: trunk/BOOK/x/lib/libxklavier.xml
==============================================================================
--- trunk/BOOK/x/lib/libxklavier.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/x/lib/libxklavier.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -124,12 +124,6 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para>
- <parameter>--with-xkb-base=$XORG_PREFIX/share/X11/xkb</parameter>:
- Use this switch if the $XORG_PREFIX is anything other than
- <filename class="directory">/usr</filename>.
- </para>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/static-libraries.xml"/>
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/x/lib/qt5.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -103,6 +103,7 @@
<xref linkend="cups"/>,
<xref linkend="glib2"/>,
<xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
+ <xref linkend="harfbuzz"/>,
<xref linkend="icu"/>,
<xref linkend="jasper"/>,
<xref linkend="libjpeg"/>,
@@ -128,7 +129,6 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="bluez"/> (runtime, used by QtConnectivity module),
- <xref linkend="harfbuzz"/>,
<phrase revision="systemd"><xref linkend="ibus"/></phrase>
<xref linkend="libinput"/>, <!-- needs -libinput switch -->
<xref linkend="mariadb"/> or <ulink
url="http://www.mysql.com/";>MySQL</ulink>,
@@ -257,7 +257,6 @@
-system-sqlite \
-nomake examples \
-no-rpath \
- -optimized-qmake \
-skip qtwebengine &&
make</userinput></screen>
@@ -402,11 +401,11 @@
<parameter>-opensource</parameter>: Install the opensource
version of <application>Qt</application>.
</para>
-
+<!-- default as of QT-5.7:
<para>
<parameter>-release</parameter>: This switch disables
building with debugging symbols.
- </para>
+ </para>-->
<para>
<parameter>-nomake examples</parameter>: This switch
@@ -419,12 +418,12 @@
<parameter>-system-sqlite</parameter>: This switch enables use
of the system version of <application>SQLite</application>.
</para>
-
+<!-- Tested during configure, and not built if not found:
<para>
<parameter>-no-nis</parameter>: This switch disables support
for Network Information Service (NIS) which has been
removed from recent versions of <application>Glibc</application>.
- </para>
+ </para>-->
<para>
<parameter>-dbus-linked -openssl-linked</parameter>: These
@@ -448,7 +447,7 @@
</para>
<para>
- <option>-system-harfbuzz</option>: This switch enables use
+ <parameter>-system-harfbuzz</parameter>: This switch enables use
of the system version of <application>Harfbuzz</application>
which fixes some font rendering issues in
<application>Qt5</application> applications but doesn't have all the
Modified: trunk/BOOK/x/wm/icewm.xml
==============================================================================
--- trunk/BOOK/x/wm/icewm.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/x/wm/icewm.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -103,10 +103,11 @@
<title>Command Explanations</title>
<para>
- <parameter>rm /usr/share/xsessions/icewm.desktop</parameter>: The package
- ships with both icewm,desktop and icewm-xsession.desktop. The former has
+ <command>rm /usr/share/xsessions/icewm.desktop</command>: The package
+ ships with both icewm.desktop and icewm-xsession.desktop. The former has
apparently been used in the past, but it will hang if used with a modern
- desktop-manager<phrase revision='sysv'> such as <xref
linkend="sddm"/></phrase>.
+ desktop-manager<phrase revision='sysv'> such as
+ <xref linkend="sddm"/></phrase>.
</para>
<para>
Modified: trunk/BOOK/x/wm/openbox.xml
==============================================================================
--- trunk/BOOK/x/wm/openbox.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/x/wm/openbox.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -129,13 +129,13 @@
<title>Command Explanations</title>
<para>
- <option>--sysconfdir=/etc</option>: This option puts
+ <parameter>--sysconfdir=/etc</parameter>: This option puts
<application>Openbox</application>'s configuration files in
/etc/xdg/openbox instead of /usr/etc/xdg/openbox.
</para>
<para>
- <option>--docdir=/usr/share/doc/openbox-&openbox-version;</option>:
+ <parameter>--docdir=/usr/share/doc/openbox-&openbox-version;</parameter>:
this puts a few files in a versioned directory in
<filename class="directory">/usr/share/doc</filename>.
</para>
Modified: trunk/BOOK/xfce/apps/parole.xml
==============================================================================
--- trunk/BOOK/xfce/apps/parole.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/xfce/apps/parole.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -126,7 +126,7 @@
<title>Command Explanations</title>
<para>
- <parameter>--with-gstreamer=1.0</parameter>: Use this switch if
+ <option>--with-gstreamer=1.0</option>: Use this switch if
the deprecated gstreamer-0.x is installed.
</para>
Modified: trunk/BOOK/xfce/core/libwnck2.xml
==============================================================================
--- trunk/BOOK/xfce/core/libwnck2.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/xfce/core/libwnck2.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -127,9 +127,9 @@
href="../../xincludes/static-libraries.xml"/>
<para>
- <option>--program-suffix=-1</option>: This option adds -1 to the end of
- the names of the installed programs to avoid overwriting the programs
- installed by <xref linkend="libwnck"/>.
+ <parameter>--program-suffix=-1</parameter>: This option adds -1 to the
+ end of the names of the installed programs to avoid overwriting the
+ programs installed by <xref linkend="libwnck"/>.
</para>
<para>
Modified: trunk/BOOK/xfce/core/xfce4-session.xml
==============================================================================
--- trunk/BOOK/xfce/core/xfce4-session.xml Wed Oct 12 06:54:06 2016
(r17878)
+++ trunk/BOOK/xfce/core/xfce4-session.xml Thu Oct 13 07:36:45 2016
(r17879)
@@ -130,7 +130,7 @@
<title>Command Explanations</title>
<para>
- <option>--disable-legacy-sm</option>: This switch disables
+ <parameter>--disable-legacy-sm</parameter>: This switch disables
legacy session management which isn't necessary on modern
system.
</para>
Modified: trunk/BOOK/xsoft/other/ekiga.xml
==============================================================================
--- trunk/BOOK/xsoft/other/ekiga.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/xsoft/other/ekiga.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -138,20 +138,20 @@
<title>Command Explanations</title>
<para>
- <option>--disable-eds</option>: This switch disables support for the
+ <parameter>--disable-eds</parameter>: This switch disables support for
the
<application>Evolution Data Server</application>. Remove if you have
installed <application>Evolution Data Server</application>.
</para>
<para>
- <option>--disable-gdu</option>: This switch disables documentation
generation
- using <application>GNOME Doc Utils</application>. Remove if you have
installed
- <application>GNOME Doc Utils</application>.
+ <parameter>--disable-gdu</parameter>: This switch disables documentation
+ generation using <application>GNOME Doc Utils</application>. Remove if
+ you have installed <application>GNOME Doc Utils</application>.
</para>
<para>
- <option>--disable-ldap</option>: This switch disables LDAP support in
- <application>Ekiga</application>. Remove if you have installed
+ <parameter>--disable-ldap</parameter>: This switch disables LDAP support
+ in <application>Ekiga</application>. Remove if you have installed
<application>OpenLDAP</application>.
</para>
@@ -172,9 +172,10 @@
<note>
<para>
- If you have not installed recommended dependencies you will need
additional
- switches passed to <command>configure</command>. Examine
- <command>./configure --help</command> output to see all available
switches.
+ If you have not installed recommended dependencies you will need
+ additional switches passed to <command>configure</command>. Examine
+ <command>./configure --help</command> output to see all available
+ switches.
</para>
</note>
Modified: trunk/BOOK/xsoft/other/fontforge.xml
==============================================================================
--- trunk/BOOK/xsoft/other/fontforge.xml Wed Oct 12 06:54:06 2016
(r17878)
+++ trunk/BOOK/xsoft/other/fontforge.xml Thu Oct 13 07:36:45 2016
(r17879)
@@ -172,7 +172,7 @@
<title>Command Explanations</title>
<para>
- <parameter>sed -i 's/20140101/20160404/g' ...</parameter> : This changes
+ <command>sed -i 's/20140101/20160404/g' ...</command> : This changes
the typo'd date, particularly in the pkgconfig files and the log from the
tests.
</para>
Modified: trunk/BOOK/xsoft/other/gparted.xml
==============================================================================
--- trunk/BOOK/xsoft/other/gparted.xml Wed Oct 12 06:54:06 2016 (r17878)
+++ trunk/BOOK/xsoft/other/gparted.xml Thu Oct 13 07:36:45 2016 (r17879)
@@ -123,7 +123,7 @@
href="../../xincludes/static-libraries.xml"/>
<para>
- <option>--disable-doc</option>: This switch disables building of
+ <parameter>--disable-doc</parameter>: This switch disables building of
the optional documentation. Remove it if you have installed
<application>GNOME Doc Utils</application>.
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
