Changeset 87dfe6b

Timestamp:

04/03/2013 08:21:38 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

3de403d

Parents:

d6e164b

Message:

Fixes.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11136 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• networking/netutils/networkmanager.xml (modified) (2 diffs)
• x/lib/gdk-pixbuf.xml (modified) (2 diffs)
• x/lib/webkitgtk.xml (modified) (2 diffs)
• xsoft/office/libreoffice.xml (modified) (3 diffs)
• xsoft/other/inkscape.xml (modified) (2 diffs)

networking/netutils/networkmanager.xml

@@ -122 +122 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>sed -e "/memset (buffer, 0, sizeof (buffer));/d" \
+    -i src/dns-manager/nm-dns-manager.c &amp;&amp;
+sed -e "s/sizeof (expected_ssid)/sizeof (char)/" \
+    -i src/settings/plugins/keyfile/tests/test-keyfile.c &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
@@ -144 +148 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -e ...</command>: These <command>sed</command>s prevent
+      build failure when using GCC 4.8.
+    </para>
 
     <para>

x/lib/gdk-pixbuf.xml

@@ -118 +118 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --with-x11 &amp;&amp;
+<screen><userinput>sed -e "s@&lt;stdlib.h&gt;@&amp;\n#include &lt;string.h&gt;@g" \
+    -i gdk-pixbuf/io-png.c &amp;&amp;
+./configure --prefix=/usr --with-x11 &amp;&amp;
 make</userinput></screen>
 
@@ -145 +147 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>sed -e "s@&lt;stdlib.h&gt;@&amp;\n#include &lt;string.h&gt;@g"
+      ..</command>: This <command>sed</command> silences compiler warnings
+      when using GCC 4.8.
+    </para>
 
     <para>

x/lib/webkitgtk.xml

@@ -68 +68 @@
         <para>
           Estimated build time: &webkitgtk-time;
+        </para>
+      </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>
@@ -135 +145 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --libexecdir=/usr/lib/WebKitGTK \
             --with-gstreamer=1.0 \

xsoft/office/libreoffice.xml

@@ -134 +134 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="cups"/>,
       <xref linkend="gperf"/>,
       <xref linkend="gtk2"/>,
@@ -156 +155 @@
 
     <para role="recommended">
+      <xref linkend="cups"/>,
       <xref linkend="curl"/>,
       <xref linkend="dbus"/>,
@@ -404 +404 @@
 
     <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"/>.

xsoft/other/inkscape.xml

@@ -124 +124 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -e "s@commands_toolbox,@commands_toolbox@" -i src/widgets/desktop-widget.h &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 unset LIBRARY_PATH</userinput></screen>
@@ -140 +141 @@
     <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>