Author: krejzi
Date: Wed Apr 3 13:21:38 2013
New Revision: 11136
Log:
Fixes.
Modified:
trunk/BOOK/networking/netutils/networkmanager.xml
trunk/BOOK/x/lib/gdk-pixbuf.xml
trunk/BOOK/x/lib/webkitgtk.xml
trunk/BOOK/xsoft/office/libreoffice.xml
trunk/BOOK/xsoft/other/inkscape.xml
Modified: trunk/BOOK/networking/netutils/networkmanager.xml
==============================================================================
--- trunk/BOOK/networking/netutils/networkmanager.xml Sun Mar 31 04:38:14
2013 (r11135)
+++ trunk/BOOK/networking/netutils/networkmanager.xml Wed Apr 3 13:21:38
2013 (r11136)
@@ -121,7 +121,11 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>sed -e "/memset (buffer, 0, sizeof (buffer));/d" \
+ -i src/dns-manager/nm-dns-manager.c &&
+sed -e "s/sizeof (expected_ssid)/sizeof (char)/" \
+ -i src/settings/plugins/keyfile/tests/test-keyfile.c &&
+./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/NetworkManager \
@@ -145,6 +149,11 @@
<title>Command Explanations</title>
<para>
+ <command>sed -e ...</command>: These <command>sed</command>s prevent
+ build failure when using GCC 4.8.
+ </para>
+
+ <para>
<option>--without-systemdsystemunitdir</option>: This parameter is needed
to avoid <application>systemd</application> files being installed.
</para>
Modified: trunk/BOOK/x/lib/gdk-pixbuf.xml
==============================================================================
--- trunk/BOOK/x/lib/gdk-pixbuf.xml Sun Mar 31 04:38:14 2013 (r11135)
+++ trunk/BOOK/x/lib/gdk-pixbuf.xml Wed Apr 3 13:21:38 2013 (r11136)
@@ -117,7 +117,9 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr --with-x11 &&
+<screen><userinput>sed -e "s@<stdlib.h>@&\n#include
<string.h>@g" \
+ -i gdk-pixbuf/io-png.c &&
+./configure --prefix=/usr --with-x11 &&
make</userinput></screen>
<para>
@@ -146,6 +148,12 @@
<title>Command Explanations</title>
<para>
+ <command>sed -e "s@<stdlib.h>@&\n#include <string.h>@g"
+ ..</command>: This <command>sed</command> silences compiler warnings
+ when using GCC 4.8.
+ </para>
+
+ <para>
<option>--with-x11</option>: This switch enables building of the
<application>Gdk Pixbuf</application> <application>X11</application>
library which is needed for <emphasis>many</emphasis> packages.
Modified: trunk/BOOK/x/lib/webkitgtk.xml
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk.xml Sun Mar 31 04:38:14 2013 (r11135)
+++ trunk/BOOK/x/lib/webkitgtk.xml Wed Apr 3 13:21:38 2013 (r11136)
@@ -71,6 +71,16 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Required patch:
+ <ulink
url="&patch-root;/webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch"/>
+ </para>
+ </listitem>
+ </itemizedlist>
+
<bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -134,7 +144,8 @@
following commands:
</para>
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i
../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &&
+./configure --prefix=/usr \
--libexecdir=/usr/lib/WebKitGTK \
--with-gstreamer=1.0 \
--enable-introspection &&
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml Sun Mar 31 04:38:14 2013
(r11135)
+++ trunk/BOOK/xsoft/office/libreoffice.xml Wed Apr 3 13:21:38 2013
(r11136)
@@ -133,7 +133,6 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="cups"/>,
<xref linkend="gperf"/>,
<xref linkend="gtk2"/>,
<application>Perl Modules</application>
@@ -155,6 +154,7 @@
</note>
<para role="recommended">
+ <xref linkend="cups"/>,
<xref linkend="curl"/>,
<xref linkend="dbus"/>,
<xref linkend="expat"/>,
@@ -403,6 +403,11 @@
</para>
<para>
+ <option>--disable-cups</option>: Use this switch if you don't need
+ printing support.
+ </para>
+
+ <para>
<option>--disable-gstreamer-0.10</option>: Use this switch if you've
not installed <xref linkend="gst-plugins-base"/>.
</para>
Modified: trunk/BOOK/xsoft/other/inkscape.xml
==============================================================================
--- trunk/BOOK/xsoft/other/inkscape.xml Sun Mar 31 04:38:14 2013 (r11135)
+++ trunk/BOOK/xsoft/other/inkscape.xml Wed Apr 3 13:21:38 2013 (r11136)
@@ -123,7 +123,8 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>sed -e "s@commands_toolbox,@commands_toolbox@" -i
src/widgets/desktop-widget.h &&
+./configure --prefix=/usr &&
make &&
unset LIBRARY_PATH</userinput></screen>
@@ -139,6 +140,17 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/update-icons-and-desktop.xml"/>
+
+ </sect2>
+
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para>
+ <command>sed -e "s@commands_toolbox,@commands_toolbox@" ...</command>:
+ This <command>sed</command> fixes building with GCC 4.8.
+ </para>
+
</sect2>
<sect2 role="content">
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
