Author: krejzi
Date: Sat Jun 1 01:03:58 2013
New Revision: 11231
Log:
Merge trunk and systemd branch
Modified:
branches/systemd/general.ent
branches/systemd/general/genlib/expat.xml
branches/systemd/general/genlib/json-c.xml
branches/systemd/general/genlib/libglade.xml
branches/systemd/general/genlib/lzo.xml
branches/systemd/general/genutils/rxvt-unicode.xml
branches/systemd/general/graphlib/giflib.xml
branches/systemd/general/graphlib/imlib2.xml
branches/systemd/general/graphlib/lcms.xml
branches/systemd/general/graphlib/libmng.xml
branches/systemd/general/prog/python-modules.xml
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/multimedia/libdriv/faac.xml
branches/systemd/multimedia/libdriv/flac.xml
branches/systemd/multimedia/libdriv/gst-plugins-base.xml
branches/systemd/multimedia/libdriv/libmad.xml
branches/systemd/multimedia/libdriv/libogg.xml
branches/systemd/multimedia/libdriv/libsndfile.xml
branches/systemd/multimedia/libdriv/libtheora.xml
branches/systemd/multimedia/libdriv/sdl.xml
branches/systemd/multimedia/libdriv/speex.xml
branches/systemd/multimedia/libdriv/xvid.xml
branches/systemd/networking/netprogs/ntp.xml
branches/systemd/postlfs/security/attr.xml
branches/systemd/postlfs/security/libcap2.xml
branches/systemd/postlfs/security/openssh.xml
branches/systemd/x/installing/libXau.xml
branches/systemd/x/installing/libXdmcp.xml
branches/systemd/x/installing/libXp.xml
branches/systemd/x/installing/mesalib.xml
branches/systemd/x/installing/xterm.xml
branches/systemd/xsoft/other/gnash.xml
Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent Sat Jun 1 00:43:20 2013 (r11230)
+++ branches/systemd/general.ent Sat Jun 1 01:03:58 2013 (r11231)
@@ -3,13 +3,13 @@
$Date$
-->
-<!ENTITY day "24"> <!-- Always 2 digits -->
-<!ENTITY month "05"> <!-- Always 2 digits -->
+<!ENTITY day "01"> <!-- Always 2 digits -->
+<!ENTITY month "06"> <!-- Always 2 digits -->
<!ENTITY year "2013">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "systemd version &year;-&month;-&day;">
-<!ENTITY releasedate "May 22nd, &year;">
+<!ENTITY releasedate "June 1st, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!--
version|testing|unstable|development] -->
@@ -321,7 +321,7 @@
<!ENTITY rarian-version "0.8.1">
<!ENTITY recode-version "3.6">
<!ENTITY rep-gtk-version "0.90.8.1">
-<!ENTITY rxvt-unicode-version "9.16">
+<!ENTITY rxvt-unicode-version "9.18">
<!ENTITY screen-version "4.0.3">
<!ENTITY sharutils-version "4.13.5">
<!ENTITY spidermonkey-version "1.0.0">
Modified: branches/systemd/general/genlib/expat.xml
==============================================================================
--- branches/systemd/general/genlib/expat.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/general/genlib/expat.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -77,7 +77,7 @@
<para>Install <application>Expat</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -110,7 +110,7 @@
<seglistitem>
<seg>xmlwf</seg>
- <seg>libexpat.{so,a}</seg>
+ <seg>libexpat.so</seg>
<seg>/usr/share/doc/expat-&expat-version;</seg>
</seglistitem>
</segmentedlist>
@@ -132,11 +132,11 @@
</varlistentry>
<varlistentry id="libexpat">
- <term><filename class='libraryfile'>libexpat.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libexpat.so</filename></term>
<listitem>
<para>contains API functions for parsing XML.</para>
<indexterm zone="expat libexpat">
- <primary sortas="c-libexpat">libexpat.{so,a}</primary>
+ <primary sortas="c-libexpat">libexpat.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/genlib/json-c.xml
==============================================================================
--- branches/systemd/general/genlib/json-c.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/general/genlib/json-c.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -80,6 +80,12 @@
<sect2 role="installation">
<title>Installation of JSON-C</title>
+ <note>
+ <para>
+ This package does not support parallel build.
+ </para>
+ </note>
+
<para>
Install <application>JSON-C</application> by running the following
commands:
Modified: branches/systemd/general/genlib/libglade.xml
==============================================================================
--- branches/systemd/general/genlib/libglade.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/general/genlib/libglade.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -79,7 +79,7 @@
commands:</para>
<screen><userinput>sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in
&&
-./configure --prefix=/usr &&
+./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>To test the results, issue: <command>make check</command>.
@@ -94,16 +94,16 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/gtk-doc-rebuild.xml"/>
-
<para><command>sed -i '/DG_DISABLE_DEPRECATED/d'</command>: Some of the
<application>glib</application> functions that
<application>libglade</application> uses were declared deprecated in
glib-2.30. This sed removes the G_DISABLE_DEPRECATED CFLAG.</para>
- <para><option>--disable-static</option>: prevent static libraries
- being built and installed.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/gtk-doc-rebuild.xml"/>
</sect2>
@@ -117,7 +117,7 @@
<seglistitem>
<seg>libglade-convert (requires <command>python</command>)</seg>
- <seg>libglade-2.0.{so,a}</seg>
+ <seg>libglade-2.0.so</seg>
<seg>/usr/{include/libglade-2.0/glade,share/{gtk-doc/html/libglade,
xml/libglade}}</seg>
</seglistitem>
@@ -140,12 +140,12 @@
</varlistentry>
<varlistentry id="libglade-lib">
- <term><filename
class='libraryfile'>libglade-2.0.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libglade-2.0.so</filename></term>
<listitem>
<para>contain the functions necessary to load Glade interface
files.</para>
<indexterm zone="libglade libglade-lib">
- <primary sortas="c-libglade-2.0">libglade-2.0.{so,a}</primary>
+ <primary sortas="c-libglade-2.0">libglade-2.0.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/genlib/lzo.xml
==============================================================================
--- branches/systemd/general/genlib/lzo.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/general/genlib/lzo.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -86,6 +86,7 @@
<screen><userinput>./configure --prefix=/usr \
--enable-shared \
+ --disable-static \
--docdir=/usr/share/doc/lzo-&LZO-version; &&
make</userinput></screen>
@@ -103,6 +104,14 @@
</sect2>
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
+ </sect2>
+
<sect2 role="content">
<title>Contents</title>
@@ -116,7 +125,7 @@
None
</seg>
<seg>
- liblzo2.{so,a}
+ liblzo2.so
</seg>
<seg>
/usr/include/lzo and
@@ -131,13 +140,13 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="liblzo2">
- <term><filename class='libraryfile'>liblzo2.{so,a}</filename></term>
+ <term><filename class='libraryfile'>liblzo2.so</filename></term>
<listitem>
<para>
is a data compression and decompression library.
</para>
<indexterm zone="LZO liblzo2">
- <primary sortas="c-liblzo2">liblzo2.{so,a}</primary>
+ <primary sortas="c-liblzo2">liblzo2.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/genutils/rxvt-unicode.xml
==============================================================================
--- branches/systemd/general/genutils/rxvt-unicode.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/general/genutils/rxvt-unicode.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -6,8 +6,8 @@
<!ENTITY rxvt-unicode-download-http
"http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-&rxvt-unicode-version;.tar.bz2";>
<!ENTITY rxvt-unicode-download-ftp " ">
- <!ENTITY rxvt-unicode-md5sum "2e2942e8367624affebc0568e3671b66">
- <!ENTITY rxvt-unicode-size "878 KB">
+ <!ENTITY rxvt-unicode-md5sum "963ccc748fe5bca925e7b92c0404d68b">
+ <!ENTITY rxvt-unicode-size "884 KB">
<!ENTITY rxvt-unicode-buildsize "32 MB">
<!ENTITY rxvt-unicode-time "0.2 SBU">
]>
Modified: branches/systemd/general/graphlib/giflib.xml
==============================================================================
--- branches/systemd/general/graphlib/giflib.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/general/graphlib/giflib.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -87,7 +87,7 @@
<para>Install <application>giflib</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -106,8 +106,8 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>--disable-static</option>: This switch prevents the
- static library from being built.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
</sect2>
@@ -124,7 +124,7 @@
gifclrmp, gifcolor, gifcomb, gifcompose, giffiltr, giffix, gifflip,
gifhisto,
gifinfo, gifinter, gifinto, gifovly, gifpos, gifrotat, gifrsize,
gifspnge,
giftext, gifwedge, icon2gif, raw2gif, rgb2gif, and text2gif</seg>
- <seg>libgif.{so,a}</seg>
+ <seg>libgif.so</seg>
<seg>/usr/share/doc/giflib-&giflib-version;</seg>
</seglistitem>
</segmentedlist>
@@ -437,13 +437,13 @@
</varlistentry>
<varlistentry id="libgif">
- <term><filename class='libraryfile'>libgif.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libgif.so</filename></term>
<listitem>
<para>contains API functions required by the
<application>giflib</application> programs and any other programs
needing
library functionality to read, write and manipulate GIF
images.</para>
<indexterm zone="giflib libgif">
- <primary sortas="c-libgif">libgif.{so,a}</primary>
+ <primary sortas="c-libgif">libgif.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/graphlib/imlib2.xml
==============================================================================
--- branches/systemd/general/graphlib/imlib2.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/general/graphlib/imlib2.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -82,7 +82,7 @@
<para>Install <application>Imlib2</application> by running the
following commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -99,6 +99,9 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
<para><parameter>--without-x</parameter>: Add this parameter if you do not
have an X Window System installed.</para>
@@ -115,7 +118,7 @@
<seglistitem>
<seg>imlib2_bumpmap, imlib2_colorspace, imlib2-config, imlib2_conv,
imlib2_grab, imlib2_poly, imlib2_show, imlib2_test, and
imlib2_view</seg>
- <seg>libImlib2.{so,a} and various filters and image loader
modules.</seg>
+ <seg>libImlib2.so and various filters and image loader modules.</seg>
<seg>/usr/lib/imlib2, /usr/share/doc/imlib2-&imlib2-version;, and
/usr/share/imlib2</seg>
</seglistitem>
@@ -127,12 +130,12 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libImlib2">
- <term><filename class='libraryfile'>libImlib2.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libImlib2.so</filename></term>
<listitem>
<para>provides the functions for programs to deal with various
image data formats.</para>
<indexterm zone="imlib2 libImlib2">
- <primary sortas="c-libImlib2">libImlib2.{so,a}</primary>
+ <primary sortas="c-libImlib2">libImlib2.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/graphlib/lcms.xml
==============================================================================
--- branches/systemd/general/graphlib/lcms.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/general/graphlib/lcms.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -86,7 +86,7 @@
<para>Install <application>Little CMS</application> by running the
following commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>To test the results, issue: <command>make check</command>.</para>
@@ -103,13 +103,13 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
<para><option>--with-python</option>: Use this parameter if
<application>Python</application> and
<application>SWIG</application> are installed.</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/static-libraries.xml"/>
-
</sect2>
<sect2 role="content">
@@ -123,7 +123,7 @@
<seglistitem>
<seg>icc2ps, icclink, icctrans, wtpt and
optionally, jpegicc, tiffdiff and tifficc</seg>
- <seg>liblcms.{so,a} and the optional _lcms.{so,a} Python module</seg>
+ <seg>liblcms.so and the optional _lcms.so Python module</seg>
<seg>/usr/share/doc/lcms-&lcms-version;</seg>
</seglistitem>
</segmentedlist>
@@ -204,12 +204,12 @@
</varlistentry>
<varlistentry id="liblcms">
- <term><filename class='libraryfile'>liblcms.{so,a}</filename></term>
+ <term><filename class='libraryfile'>liblcms.so</filename></term>
<listitem>
<para>is used by the <application>lcms</application> programs as
well as other programs to provide color management facilities.</para>
<indexterm zone="lcms liblcms">
- <primary sortas="c-liblcms">liblcms.{so,a}</primary>
+ <primary sortas="c-liblcms">liblcms.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/graphlib/libmng.xml
==============================================================================
--- branches/systemd/general/graphlib/libmng.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/general/graphlib/libmng.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -82,7 +82,8 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
-<screen role="root"><userinput>make prefix=/usr install &&
+<screen role="root"><userinput>sed -i '/^install\|cp.*libmng.a/ s/libmng.a//'
Makefile &&
+make prefix=/usr install &&
install -v -m644 doc/man/*.3 /usr/share/man/man3 &&
install -v -m644 doc/man/*.5 /usr/share/man/man5 &&
install -v -m755 -d /usr/share/doc/libmng-&libmng-version; &&
@@ -100,6 +101,9 @@
<para><command>sed -i -e 's/unroll-loops/& -fPIC/' Makefile</command>:
Add a gcc option to make the build compatible with x86_64 systems.</para>
+ <para><command>sed -i '/^install\|cp.*libmng.a/ s/libmng.a//'
Makefile</command>
+ This command disables installing the static library.</para>
+
<para><command>install ...</command>: The documentation files are not
installed by the installation procedure, so they are copied
manually.</para>
@@ -115,7 +119,7 @@
<seglistitem>
<seg>None</seg>
- <seg>libmng.{so,a}</seg>
+ <seg>libmng.so</seg>
<seg>/usr/share/doc/libmng-&libmng-version;</seg>
</seglistitem>
</segmentedlist>
@@ -126,13 +130,13 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libmng-lib">
- <term><filename class='libraryfile'>libmng.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libmng.so</filename></term>
<listitem>
<para>provides functions for programs wishing to read and write
MNG files which are animation files without the patent problems
associated
with certain other formats.</para>
<indexterm zone="libmng libmng-lib">
- <primary sortas="c-libmng">libmng.{so,a}</primary>
+ <primary sortas="c-libmng">libmng.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/general/prog/python-modules.xml
==============================================================================
--- branches/systemd/general/prog/python-modules.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/general/prog/python-modules.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -435,8 +435,7 @@
<itemizedlist spacing="compact">
<listitem>
<para>
- Required patch (if you have installed
- <xref linkend="gobject-introspection"/>):
+ Optional patch:
<ulink
url="&patch-root;/pygobject-&pygobject2-version;-introspection-1.patch"/>
</para>
</listitem>
@@ -452,6 +451,7 @@
<bridgehead renderas="sect5">Optional</bridgehead>
<para role="optional">
+ <xref linkend="gobject-introspection"/> and
<xref linkend="libxslt"/> (to Build Documentation)
</para>
@@ -464,12 +464,18 @@
<title>Installation of PyGObject</title>
<para>
+ If you have installed <xref linkend="gobject-introspection"/>, apply
the
+ required patch by running the following commands:
+ </para>
+
+<screen><userinput>patch -p1 <
../pygobject-&pygobject2-version;-introspection-1.patch</userinput></screen>
+
+ <para>
Install <application>PyGObject</application> by running the following
commands:
</para>
-<screen><userinput>patch -p1 <
../pygobject-&pygobject2-version;-introspection-1.patch &&
-./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-introspection &&
make</userinput></screen>
<para>
@@ -487,6 +493,12 @@
<title>Command Explanations</title>
<para>
+ <option>--disable-introspection</option>: Omit this switch if you have
+ installed <xref linkend="gobject-introspection"/>. Note that it
+ conflicts with <xref linkend="pygobject3"/>.
+ </para>
+
+ <para>
<option>--disable-docs</option>: This option disables the rebuilding of
the html documentation if <xref linkend="libxslt"/> is installed.
</para>
@@ -737,7 +749,7 @@
<xref linkend="gtk2"/>.
</para>
- <bridgehead renderas="sect5">Required (gtk.libglade module)</bridgehead>
+ <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
<para role="required">
<xref linkend="py2cairo"/> and
<xref linkend="libglade"/>.
Modified: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/introduction/welcome/changelog.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -44,6 +44,15 @@
-->
<listitem>
+ <para>May 30th, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[ken] - rxvt-unicode-9.18.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>May 24th, 2013</para>
<itemizedlist>
<listitem>
Modified: branches/systemd/multimedia/libdriv/faac.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/faac.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/faac.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -89,7 +89,7 @@
<screen><userinput>patch -Np1 -i ../faac-&faac-version;-glibc_fixes-1.patch
&&
sed -i -e '/obj-type/d' -e '/Long Term/d' frontend/main.c &&
-./configure --prefix=/usr &&
+./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>This package does not come with a test suite. However, basic
@@ -134,6 +134,9 @@
is already disabled in FAAC-&faac-version; due to sound quality issues
with object types other than <quote>Low Complexity</quote>.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
<!-- 1.28: This is still broken, it causes a segfault. -->
<para><option>--enable-drm</option>: This option is supposed to enable
@@ -187,7 +190,7 @@
<seglistitem>
<seg>faac</seg>
- <seg>libfaac.{so,a} and libmp4v2.{so,a}</seg>
+ <seg>libfaac.so and libmp4v2.so</seg>
<seg>None</seg>
</seglistitem>
</segmentedlist>
@@ -208,21 +211,21 @@
</varlistentry>
<varlistentry id="libfaac">
- <term><filename class='libraryfile'>libfaac.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libfaac.so</filename></term>
<listitem>
<para>contains functions for encoding AAC streams.</para>
<indexterm zone="faac libfaac">
- <primary sortas="c-libfaac">libfaac.{so,a}</primary>
+ <primary sortas="c-libfaac">libfaac.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libmp4v2">
- <term><filename class='libraryfile'>libmp4v2.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libmp4v2.so</filename></term>
<listitem>
<para>contains functions for creating and manipulating MP4
files.</para>
<indexterm zone="faac libmp4v2">
- <primary sortas="c-libmp4v2">libmp4v2.{so,a}</primary>
+ <primary sortas="c-libmp4v2">libmp4v2.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/flac.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/flac.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/flac.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -93,6 +93,7 @@
./configure --prefix=/usr \
--mandir=/usr/share/man \
+ --disable-static \
--disable-thorough-tests &&
make</userinput></screen>
@@ -112,6 +113,9 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
<para><parameter>--disable-thorough-tests</parameter>: This parameter is
used so that the test suite will complete in a reasonable amount of time.
Remove it if you desire more extensive tests.</para>
@@ -121,9 +125,6 @@
you have SSE is to issue <command>cat /proc/cpuinfo</command> and see if
<computeroutput>sse</computeroutput> is listed in the flags.</para>
- <para><option>--disable-static</option>: This switch prevents the
- static libraries from being built.</para>
-
</sect2>
<sect2 role="content">
@@ -136,7 +137,7 @@
<seglistitem>
<seg>flac and metaflac</seg>
- <seg>libFLAC.{so,a}, libFLAC++.{so,a} and libxmms-flac.{so,a}</seg>
+ <seg>libFLAC.so and libFLAC++.so</seg>
<seg>/usr/include/FLAC, /usr/include/FLAC++ and
/usr/share/doc/flac-&flac-version;</seg>
</seglistitem>
@@ -170,16 +171,17 @@
</varlistentry>
<varlistentry id="libflac">
- <term><filename
class='libraryfile'>libFLAC{,++}.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libFLAC{,++}.so</filename></term>
<listitem>
<para>these libraries provide native FLAC and Ogg FLAC C/C++ APIs
for programs utilizing FLAC.</para>
<indexterm zone="flac libflac">
- <primary sortas="c-libFLAC">libFLAC{,++}.{so,a}</primary>
+ <primary sortas="c-libFLAC">libFLAC{,++}.so</primary>
</indexterm>
</listitem>
</varlistentry>
+<!--
<varlistentry id="libxmms-flac">
<term><filename
class='libraryfile'>libxmms-flac.{so,a}</filename></term>
<listitem>
@@ -189,6 +191,7 @@
</indexterm>
</listitem>
</varlistentry>
+-->
</variablelist>
Modified: branches/systemd/multimedia/libdriv/gst-plugins-base.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/gst-plugins-base.xml Sat Jun 1
00:43:20 2013 (r11230)
+++ branches/systemd/multimedia/libdriv/gst-plugins-base.xml Sat Jun 1
01:03:58 2013 (r11231)
@@ -136,7 +136,7 @@
the following commands:
</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>
Modified: branches/systemd/multimedia/libdriv/libmad.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/libmad.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/libmad.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -68,7 +68,7 @@
following commands:</para>
<screen><userinput>sed -i '/-fforce-mem/d' configure &&
-./configure --prefix=/usr &&
+./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -106,6 +106,9 @@
<para><command>sed -i '/-fforce-mem/d'</command>: This removes an obsolete
compilation option that causes compilation to fail under GCC 4.4.x</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
</sect2>
<sect2 role="content">
@@ -118,7 +121,7 @@
<seglistitem>
<seg>None</seg>
- <seg>libmad.{so,a}</seg>
+ <seg>libmad.so</seg>
<seg>None</seg>
</seglistitem>
</segmentedlist>
@@ -129,11 +132,11 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libmad-lib">
- <term><filename class='libraryfile'>libmad.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libmad.so</filename></term>
<listitem>
<para>is a MPEG audio decoder library.</para>
<indexterm zone="libmad libmad-lib">
- <primary sortas="c-libmad">libmad.{so,a}</primary>
+ <primary sortas="c-libmad">libmad.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/libogg.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/libogg.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/libogg.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -68,7 +68,7 @@
<para>Install <application>libogg</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>To test the results, issue: <command>make check</command>.</para>
@@ -82,8 +82,8 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>--disable-static</option>: prevent static libraries
- being built and installed.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
</sect2>
@@ -97,7 +97,7 @@
<seglistitem>
<seg>None</seg>
- <seg>libogg.{so,a}</seg>
+ <seg>libogg.so</seg>
<seg>/usr/include/ogg and /usr/share/doc/libogg-&libogg-version;</seg>
</seglistitem>
</segmentedlist>
@@ -108,12 +108,12 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libogg-lib">
- <term><filename class='libraryfile'>libogg.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libogg.so</filename></term>
<listitem>
<para>libraries provide the functions required for programs to
read or write Ogg formatted bit streams.</para>
<indexterm zone="libogg libogg-lib">
- <primary sortas="c-libogg">libogg.{so,a}</primary>
+ <primary sortas="c-libogg">libogg.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/libsndfile.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/libsndfile.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/libsndfile.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -83,7 +83,7 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>To test the results, issue: <command>make check</command>.</para>
@@ -95,6 +95,14 @@
<screen role="root"><userinput>make
htmldocdir=/usr/share/doc/libsndfile-&libsndfile-version;
install</userinput></screen>
</sect2>
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
+ </sect2>
+
<sect2 role="content">
<title>Contents</title>
@@ -239,12 +247,12 @@
</varlistentry>-->
<varlistentry id="libsndfile-lib">
- <term><filename class='libraryfile'>libsndfile.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libsndfile.so</filename></term>
<listitem>
<para>contains the <application>libsndfile</application> API
functions.</para>
<indexterm zone="libsndfile libsndfile-lib">
- <primary sortas="c-libsndfile">libsndfile.{so,a}</primary>
+ <primary sortas="c-libsndfile">libsndfile.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/libtheora.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/libtheora.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/libtheora.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -85,7 +85,7 @@
commands:</para>
<screen><userinput>sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c
&&
-./configure --prefix=/usr &&
+./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>If you wish to run the tests, issue: <command>make
check</command>.</para>
@@ -112,8 +112,8 @@
<application>libpng</application> 1.6.
</para>
- <para><option>--disable-static</option>: This switch prevents building
static
- libraries.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
</sect2>
@@ -127,8 +127,8 @@
<seglistitem>
<seg>None, unless you installed the examples</seg>
- <seg>libtheora.{so,a}, libtheoraenc.{so,a}, and
- libtheoradec.{so,a}</seg>
+ <seg>libtheora.so, libtheoraenc.so, and
+ libtheoradec.so</seg>
<seg>/usr/include/theora and
/usr/share/doc/libtheora-&libtheora-version;</seg>
</seglistitem>
</segmentedlist>
@@ -139,12 +139,12 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libtheora-lib">
- <term><filename class='libraryfile'>libtheora*.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libtheora*.so</filename></term>
<listitem>
<para>libraries provide the functions to read and write video
files.</para>
<indexterm zone="libtheora libtheora-lib">
- <primary sortas="c-libtheora">libtheora*.{so,a}</primary>
+ <primary sortas="c-libtheora">libtheora*.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/sdl.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/sdl.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/multimedia/libdriv/sdl.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -89,7 +89,7 @@
<para>Install <application>SDL</application> by running the
following commands:</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
@@ -125,8 +125,8 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><parameter>--disable-static</parameter>: prevent static libraries
- being built and installed.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
</sect2>
@@ -153,7 +153,7 @@
<seglistitem>
<seg>sdl-config</seg>
- <seg>libSDL.{so,a} and libSDLmain.a</seg>
+ <seg>libSDL.so and libSDLmain.a</seg>
<seg>/usr/include/SDL and /usr/share/doc/SDL-&sdl-version;</seg>
</seglistitem>
</segmentedlist>
@@ -176,13 +176,13 @@
</varlistentry>
<varlistentry id="libsdl">
- <term><filename class='libraryfile'>libSDL.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libSDL.so</filename></term>
<listitem>
<para> library provides low level access to audio, keyboard, mouse,
joystick, 3D hardware via OpenGL, and
2D frame buffer across multiple platforms.</para>
<indexterm zone="sdl libsdl">
- <primary sortas="c-libsdl">libSDL.{so,a}</primary>
+ <primary sortas="c-libsdl">libSDL.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/speex.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/speex.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/speex.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -93,7 +93,8 @@
<sect2 role="commands">
<title>Command Explanations</title>
- <para><option>--disable-static</option>: Disables building of static
libraries.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
</sect2>
@@ -107,7 +108,7 @@
<seglistitem>
<seg>speexdec and speexenc</seg>
- <seg>libspeex.{so,a} and libspeexdsp.{so,a}</seg>
+ <seg>libspeex.so and libspeexdsp.so</seg>
<seg>/usr/share/doc/speex</seg>
</seglistitem>
</segmentedlist>
@@ -140,22 +141,22 @@
</varlistentry>
<varlistentry id="libspeex">
- <term><filename class='libraryfile'>libspeex.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libspeex.so</filename></term>
<listitem>
<para>provides functions for the audio encoding/decoding
programs.</para>
<indexterm zone="speex libspeex">
- <primary sortas="c-libspeex">libspeex.{so,a}</primary>
+ <primary sortas="c-libspeex">libspeex.so</primary>
</indexterm>
</listitem>
</varlistentry>
<varlistentry id="libspeexdsp">
- <term><filename
class='libraryfile'>libspeexdsp.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libspeexdsp.so</filename></term>
<listitem>
<para>is a speech processing library that goes along with the
<application>Speex</application> codec.</para>
<indexterm zone="speex libspeexdsp">
- <primary sortas="c-libspeexdsp">libspeexdsp.{so,a}</primary>
+ <primary sortas="c-libspeexdsp">libspeexdsp.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/multimedia/libdriv/xvid.xml
==============================================================================
--- branches/systemd/multimedia/libdriv/xvid.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/multimedia/libdriv/xvid.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -84,7 +84,8 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
-<screen role="root"><userinput>make install &&
+<screen role="root"><userinput>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile
&&
+make install &&
chmod -v 755 /usr/lib/libxvidcore.so.4.3 &&
ln -v -sf libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4 &&
@@ -100,6 +101,9 @@
<sect2 role="commands">
<title>Command Explanations</title>
+ <para><command>sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile</command>:
+ This command disables installing the static library.</para>
+
<para><command>ln -v -sf libxvidcore.so.4
/usr/lib/libxvidcore.so</command>:
This command makes applications linked against
<filename class="libraryfile">.so</filename> names, link to
@@ -121,7 +125,7 @@
<seglistitem>
<seg>None</seg>
- <seg>libxvidcore.{so,a}</seg>
+ <seg>libxvidcore.so</seg>
<seg>/usr/share/doc/xvidcore-&xvid-version;</seg>
</seglistitem>
</segmentedlist>
@@ -132,12 +136,12 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libxvidcore">
- <term><filename class='libraryfile'>libxvidcore.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libxvidcore.so</filename></term>
<listitem>
<para>provides functions to encode and decode most
MPEG-4 video data.</para>
<indexterm zone="xvid libxvidcore">
- <primary sortas="c-libxvidcore">libxvidcore.{so,a}</primary>
+ <primary sortas="c-libxvidcore">libxvidcore.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/networking/netprogs/ntp.xml
==============================================================================
--- branches/systemd/networking/netprogs/ntp.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/networking/netprogs/ntp.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -75,7 +75,10 @@
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
- <para role="optional"><xref linkend="openssl"/></para>
+ <para role="optional">
+ <xref linkend="openssl"/> and
+ <ulink url="http://www.thrysoee.dk/editline/";>libedit</ulink>
+ </para>
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/ntp"/></para>
Modified: branches/systemd/postlfs/security/attr.xml
==============================================================================
--- branches/systemd/postlfs/security/attr.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/postlfs/security/attr.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -71,7 +71,7 @@
INSTALL_USER=root \
INSTALL_GROUP=root \
-./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib &&
+./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib --disable-static
&&
make</userinput></screen>
<para>There are three sets of tests that come with this package. Issue the
@@ -98,8 +98,11 @@
modifies the documentation directory so that it is a versioned
directory.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+ href="../../xincludes/static-libraries.xml"/>
+
<para><command>sed -i ... /usr/lib/libattr.la</command>: This command
- corrects the location of the installed static library as referenced
+ corrects the location of the installed library as referenced
in the libtool archive.</para>
</sect2>
@@ -135,7 +138,7 @@
<seglistitem>
<seg>attr, getfattr, and setfattr</seg>
- <seg>libattr.{so,a}</seg>
+ <seg>libattr.so</seg>
<seg>/usr/{include/attr,share/doc/attr-&attr-version;}</seg>
</seglistitem>
</segmentedlist>
@@ -176,11 +179,11 @@
</varlistentry>
<varlistentry id="libattr">
- <term><filename class='libraryfile'>libattr.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libattr.so</filename></term>
<listitem>
<para>contains the <application>attr</application> API
functions.</para>
<indexterm zone="attr libattr">
- <primary sortas="c-libattr">libattr.{so,a}</primary>
+ <primary sortas="c-libattr">libattr.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/postlfs/security/libcap2.xml
==============================================================================
--- branches/systemd/postlfs/security/libcap2.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/postlfs/security/libcap2.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -64,6 +64,9 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required"><xref linkend="attr"/></para>
+ <bridgehead renderas="sect4">Optional</bridgehead>
+ <para role="optional"><xref linkend="linux-pam"/></para>
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/libcap2"/></para>
@@ -78,6 +81,13 @@
<screen><userinput>make</userinput></screen>
<para>This package does not come with a test suite.</para>
+
+ <para>
+ If you want to disable installing the static library, use this sed:
+ </para>
+
+<screen><userinput>sed -i '/install.*STALIBNAME/ s/^/#/'
libcap/Makefile</userinput></screen>
+
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
<screen role="root"><userinput>make RAISE_SETFCAP=no
install</userinput></screen>
Modified: branches/systemd/postlfs/security/openssh.xml
==============================================================================
--- branches/systemd/postlfs/security/openssh.xml Sat Jun 1 00:43:20
2013 (r11230)
+++ branches/systemd/postlfs/security/openssh.xml Sat Jun 1 01:03:58
2013 (r11231)
@@ -86,8 +86,7 @@
<xref linkend="linux-pam"/>,
<xref linkend="x-window-system"/>,
<xref linkend="mitkrb"/>,
- <ulink url="http://www.thrysoee.dk/editline/";>libedit</ulink>
- (provides a command-line history feature to <command>sftp</command>),
+ <ulink url="http://www.thrysoee.dk/editline/";>libedit</ulink>,
<ulink url="http://www.opensc-project.org/";>OpenSC</ulink> and
<ulink
url="http://www.citi.umich.edu/projects/smartcard/sectok.html";>libsectok</ulink>
</para>
@@ -208,6 +207,11 @@
include Kerberos 5 support in the build.
</para>
+ <para>
+ <parameter>--with-libedit</parameter>: This option enables line editing
+ and history features for <command>sftp</command>.
+ </para>
+
</sect2>
<sect2 role="configuration">
Modified: branches/systemd/x/installing/libXau.xml
==============================================================================
--- branches/systemd/x/installing/libXau.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/x/installing/libXau.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -88,10 +88,14 @@
<title>Contents</title>
<segmentedlist>
+ <segtitle>Installed Programs</segtitle>
<segtitle>Installed Library</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>libXau.{so,a}</seg>
+ <seg>None</seg>
+ <seg>libXau.so</seg>
+ <seg>None</seg>
</seglistitem>
</segmentedlist>
@@ -101,11 +105,11 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libXau-x7">
- <term><filename class='libraryfile'>libXau.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libXau.so</filename></term>
<listitem>
<para>is the library of X authority database routines.</para>
<indexterm zone="libXau libXau-x7">
- <primary sortas="c-libXau">libXau.{so,a}</primary>
+ <primary sortas="c-libXau">libXau.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/x/installing/libXdmcp.xml
==============================================================================
--- branches/systemd/x/installing/libXdmcp.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/x/installing/libXdmcp.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -94,7 +94,7 @@
<seglistitem>
<seg>None</seg>
- <seg>libXdmcp.{so,a}</seg>
+ <seg>libXdmcp.so</seg>
<seg>None</seg>
</seglistitem>
</segmentedlist>
@@ -105,11 +105,11 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libXdmcp-x7">
- <term><filename class='libraryfile'>libXdmcp.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libXdmcp.so</filename></term>
<listitem>
<para>is the X Display Manager Control Protocol library.</para>
<indexterm zone="libXdmcp libXdmcp-x7">
- <primary sortas="c-libXdmcp">libXdmcp.{so,a}</primary>
+ <primary sortas="c-libXdmcp">libXdmcp.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/x/installing/libXp.xml
==============================================================================
--- branches/systemd/x/installing/libXp.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/x/installing/libXp.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -89,10 +89,14 @@
<title>Contents</title>
<segmentedlist>
+ <segtitle>Installed Programs</segtitle>
<segtitle>Installed Library</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
- <seg>libXp.{so,a}</seg>
+ <seg>None</seg>
+ <seg>libXp.so</seg>
+ <seg>None</seg>
</seglistitem>
</segmentedlist>
@@ -102,11 +106,11 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="libXp-lib">
- <term><filename class='libraryfile'>libXp.{so,a}</filename></term>
+ <term><filename class='libraryfile'>libXp.so</filename></term>
<listitem>
<para>is the library of X authority database routines.</para>
<indexterm zone="libXp libXp">
- <primary sortas="c-libXp">libXp.{so,a}</primary>
+ <primary sortas="c-libXp">libXp.so</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: branches/systemd/x/installing/mesalib.xml
==============================================================================
--- branches/systemd/x/installing/mesalib.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/x/installing/mesalib.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -407,7 +407,7 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="glxgears">
- <term><filename>glxgears</filename></term>
+ <term><command>glxgears</command></term>
<listitem>
<para>
is a GL demo useful for troubleshooting graphics
@@ -420,7 +420,7 @@
</varlistentry>
<varlistentry id="glxinfo">
- <term><filename>glxinfo</filename></term>
+ <term><command>glxinfo</command></term>
<listitem>
<para>
is a diagnostic program that displays information about the
Modified: branches/systemd/x/installing/xterm.xml
==============================================================================
--- branches/systemd/x/installing/xterm.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/x/installing/xterm.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -151,9 +151,13 @@
<segmentedlist>
<segtitle>Installed Programs</segtitle>
+ <segtitle>Installed Libraries</segtitle>
+ <segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>koi8rxterm, resize, uxterm, and xterm</seg>
+ <seg>None</seg>
+ <seg>None</seg>
</seglistitem>
</segmentedlist>
@@ -163,7 +167,7 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="koi8rxterm">
- <term><filename>koi8rxterm</filename></term>
+ <term><command>koi8rxterm</command></term>
<listitem>
<para>is a wrapper script to set up xterm with a KOI8-R
locale.</para>
<indexterm zone="xterm2 koi8rxterm">
@@ -175,7 +179,7 @@
<varlistentry id="resize">
- <term><filename>resize</filename></term>
+ <term><command>resize</command></term>
<listitem>
<para>prints a shell command for setting the TERM and TERMCAP
environment variables to indicate the current size of xterm
@@ -187,7 +191,7 @@
</varlistentry>
<varlistentry id="uxterm">
- <term><filename>uxterm</filename></term>
+ <term><command>uxterm</command></term>
<listitem>
<para>is a wrapper script that modifies the current locale to use
UTF-8
and starts xterm with the proper settings.</para>
@@ -198,7 +202,7 @@
</varlistentry>
<varlistentry id="xterm-bin">
- <term><filename>xterm</filename></term>
+ <term><command>xterm</command></term>
<listitem>
<para>is a terminal emulator for the X Window System.</para>
<indexterm zone="xterm2 xterm2">
Modified: branches/systemd/xsoft/other/gnash.xml
==============================================================================
--- branches/systemd/xsoft/other/gnash.xml Sat Jun 1 00:43:20 2013
(r11230)
+++ branches/systemd/xsoft/other/gnash.xml Sat Jun 1 01:03:58 2013
(r11231)
@@ -89,17 +89,17 @@
<para role="required">
<xref linkend="agg"/>,
<xref linkend="boost"/>,
+ <xref linkend="curl"/>,
<!-- <xref linkend="ffmpeg"/> or -->
<xref linkend="gst-ffmpeg"/>,
- <xref linkend="firefox"/> or <xref linkend="seamonkey"/>,
- <xref linkend="GConf"/> and
+ <xref linkend="firefox"/> or <xref linkend="seamonkey"/> and
<xref linkend="giflib"/>.
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="curl"/>,
<xref linkend="dejagnu"/>,
+ <xref linkend="GConf"/>,
<xref linkend="git"/>,
<xref linkend="libogg"/>,
<xref linkend="libvorbis"/>,
@@ -133,7 +133,8 @@
gui/Makefile.in utilities/Makefile.in &&
./configure --prefix=/usr --sysconfdir=/etc \
--with-npapi-incl=/usr/include/npapi --enable-media=gst \
- --with-npapi-plugindir=/usr/lib/mozilla/plugins &&
+ --with-npapi-plugindir=/usr/lib/mozilla/plugins \
+ --without-gconf &&
make</userinput></screen>
<para>
@@ -176,6 +177,11 @@
</para>
<para>
+ <option>--without-gconf</option>: Omit this switch if you have GConf
+ installed and wish gnash to use it.
+ </para>
+
+ <para>
<command>make install-plugin</command>: This command installs the Mozilla
browser plugin.
</para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
