Changeset 4b97925 for xsoft/office/abiword.xml

Timestamp:

11/20/2011 01:02:25 PM (12 years ago)

Author:

Andrew Benton <andy@…>

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:

4662286

Parents:

57a0e04

Message:

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...

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

File:

• xsoft/office/abiword.xml (modified) (4 diffs)

xsoft/office/abiword.xml

@@ -36 +36 @@
     processing application. This is useful for writing reports, letters and
     other formatted documents.</para>
+
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -134 +136 @@
     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>
 
@@ -157 +163 @@
   <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
@@ -170 +183 @@
     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>