[blfs-book] r8994 - trunk/BOOK/xsoft/office

[andy]

Author: andy
Date: 2011-11-20 06:02:25 -0700 (Sun, 20 Nov 2011)
New Revision: 8994

Modified:
   trunk/BOOK/xsoft/office/abiword.xml
Log:
Added a couple of seds to fix compiling Abiword with libpng-1.5 and gcc-4.6.2.
I've not reviewed the page thoroughly as it's still the same version of Abiword 
we're installing,
these are just drive by fixes...

Modified: trunk/BOOK/xsoft/office/abiword.xml
===================================================================
--- trunk/BOOK/xsoft/office/abiword.xml 2011-11-20 11:44:16 UTC (rev 8993)
+++ trunk/BOOK/xsoft/office/abiword.xml 2011-11-20 13:02:25 UTC (rev 8994)
@@ -36,6 +36,8 @@
     processing application. This is useful for writing reports, letters and
     other formatted documents.</para>
 
+    &lfs70_checked;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -133,7 +135,11 @@
     <para>Install <application>AbiWord</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/' 
src/af/util/xp/ut_png.cpp &amp;&amp;
+sed -i 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
+    src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp &amp;&amp;
+sed -i 's/--no-undefined //' src/Makefile* &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>If you wish to run the tests, issue: <command>make check</command>.
@@ -157,6 +163,13 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i 's/ptr->jmpbuf...</command> and
+    <command>sed -i 's/\(m_pPNG\)...</command>: These seds fix compiling
+    Abiword with libpng-1.5.</para>
+
+    <para><command>sed -i 's/--no-undefined...</command>: This sed fixes
+    compiling Abiword-2.8.6 with GCC-4.6.2.</para>
+
     <para><option>--without-inter7eps</option>: Some of the headers from
     the <application>EPS</application> package are not compatible with
     <application>GCC</application>-&gcc-version;. This parameter prevents
@@ -169,11 +182,12 @@
     <para><option>--enable-plugins=collab</option>: Build some or all of the
     collab plugins.</para>
 
+<!-- I don't see this sed on the page?
     <para><command>sed -i '...' tools/ots/xp/AbiOts.cpp </command>:
     This command is used to fix an incompatibility with
     <application>GCC</application> and the
     <application>libots</application> package.</para>
-
+-->
   </sect2>
 
   <sect2 role="configuration">

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page