[blfs-book] r12042 - in trunk/BOOK: introduction/welcome xsoft/other

ken at higgs.linuxfromscratch.org ken at higgs.linuxfromscratch.org
Wed Oct 23 13:01:14 PDT 2013


Author: ken
Date: Wed Oct 23 13:01:13 2013
New Revision: 12042

Log:
gnash: fix build when kdelibs4 has been installed (a gcc-4.7 change) and add kdelibs as an optional dependency.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/other/gnash.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Wed Oct 23 09:12:40 2013	(r12041)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Wed Oct 23 13:01:13 2013	(r12042)
@@ -47,6 +47,9 @@
       <para>October 23nd, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Fix gnash build if kde4 is installed.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Remove extraneous '**' from libquicktime's configure
           which broke it.</para>
         </listitem>

Modified: trunk/BOOK/xsoft/other/gnash.xml
==============================================================================
--- trunk/BOOK/xsoft/other/gnash.xml	Wed Oct 23 09:12:40 2013	(r12041)
+++ trunk/BOOK/xsoft/other/gnash.xml	Wed Oct 23 13:01:13 2013	(r12042)
@@ -101,6 +101,7 @@
       <xref linkend="dejagnu"/>,
       <xref linkend="GConf"/>,
       <xref linkend="git"/>,
+      <xref linkend="kdelibs"/>,
       <xref linkend="libogg"/>,
       <xref linkend="libvorbis"/>,
       <xref linkend="qt4"/>,
@@ -132,6 +133,7 @@
 sed -i '/^LIBS/s/\(.*\)/\1 -lboost_system/' \
   gui/Makefile.in utilities/Makefile.in &&
 sed -i "/DGifOpen/s:Data:&, NULL:" libbase/GnashImageGif.cpp &&
+sed -i '/#include <csignal>/a\#include <unistd.h>' plugin/klash4/klash_part.cpp &&
 ./configure --prefix=/usr --sysconfdir=/etc               \
   --with-npapi-incl=/usr/include/npapi-sdk --enable-media=gst \
   --with-npapi-plugindir=/usr/lib/mozilla/plugins         \
@@ -165,6 +167,11 @@
     </para>
 
     <para>
+      <command>sed -i '/#include <csignal>/a\#include <unistd.h>' ...</command>:
+      This fixes building when <application>kdelibs</application> has been installed.
+    </para>
+
+    <para>
       <option>--enable-media=gst</option>: This tells it to use Gstreamer for
       to play video and audio (--enable-media=ffmpeg is broken with
       FFmpeg-0.11.1).



More information about the blfs-book mailing list