Author: bdubbs
Date: 2012-10-26 12:21:11 -0600 (Fri, 26 Oct 2012)
New Revision: 10803
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/libcroco.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/xsoft/office/abiword.xml
Log:
Update to AbiWord-2.9.3
Modified: trunk/BOOK/general/genlib/libcroco.xml
===================================================================
--- trunk/BOOK/general/genlib/libcroco.xml 2012-10-26 11:28:27 UTC (rev
10802)
+++ trunk/BOOK/general/genlib/libcroco.xml 2012-10-26 18:21:11 UTC (rev
10803)
@@ -100,7 +100,8 @@
make</userinput></screen>
<para>
- This package does not have a working testsuite.
+ To run the test suite, run
+ <command>LD_LIBRARY_PATH=$(pwd)/src/.libs make test</command>.
</para>
<para>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-10-26 11:28:27 UTC (rev 10802)
+++ trunk/BOOK/general.ent 2012-10-26 18:21:11 UTC (rev 10803)
@@ -779,7 +779,7 @@
<!-- Part X -->
<!-- Chapter 35 -->
-<!ENTITY AbiWord-version "2.8.6">
+<!ENTITY AbiWord-version "2.9.3">
<!ENTITY gnumeric-version "1.10.17">
<!ENTITY gnucash-version "2.4.11">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-10-26 11:28:27 UTC
(rev 10802)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-10-26 18:21:11 UTC
(rev 10803)
@@ -47,6 +47,10 @@
<para>October 26th, 2012</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to AbiWord-2.9.3. Fixes
+ <ulink url="&blfs-ticket-root;3621">#3621</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[krejzi] - Added libkcddb 4.9.1.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/xsoft/office/abiword.xml
===================================================================
--- trunk/BOOK/xsoft/office/abiword.xml 2012-10-26 11:28:27 UTC (rev 10802)
+++ trunk/BOOK/xsoft/office/abiword.xml 2012-10-26 18:21:11 UTC (rev 10803)
@@ -7,13 +7,13 @@
<!ENTITY AbiWord-download-http
"http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz";>
<!ENTITY AbiWord-download-ftp " ">
- <!ENTITY AbiWord-md5sum "f883b0a7f26229a9c66fd6a1a94381aa">
- <!ENTITY AbiWord-size "9 MB">
- <!ENTITY AbiWord-buildsize "684 MB">
+ <!ENTITY AbiWord-md5sum "cb9852ee7245eea41a290e8fe5e2dff2">
+ <!ENTITY AbiWord-size "10 MB">
+ <!ENTITY AbiWord-buildsize "484 MB">
<!ENTITY AbiWord-time "6.6 SBU">
<!ENTITY AbiWordDocs-download-http
"http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz";>
- <!ENTITY AbiWord-minor-version "2.8">
+ <!ENTITY AbiWord-minor-version "2.9">
]>
<sect1 id="abiword" xreflabel="AbiWord-&AbiWord-version;">
@@ -84,7 +84,7 @@
wish to install a copy of the en-US, fr-FR and pl-PL HTML
documentation on your machine, download
<ulink url="&AbiWordDocs-download-http;"/> (size 1.4MB md5sum
- 197df94c1d9ed287903cb5aa0b60bbc1). The local files will not be
+ ca0b5bc27d20d542297bffd707b07d63). The local files will not be
automatically referenced if you do not have a fairly complete gnome
desktop (epiphany and yelp on their own are not enough), but you can
still open them in your browser of choice.
@@ -96,6 +96,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
+ <xref linkend="boost"/>,
<xref linkend="fribidi"/>,
<xref linkend="libjpeg"/>,
<xref linkend="libpng"/>,
@@ -110,24 +111,22 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
+ <xref linkend="dbus-glib"/> (for the collab sugar backend),
+ <xref linkend="goffice"/>,
+ <xref linkend="empathy"/> and
+ <xref linkend="telepathy-glib"/> (for the collab telepathy backend),
+ <xref linkend="gnutls"/> and
+ <xref linkend="libsoup"/> (for the collab service),
<ulink url="http://www.abisource.com/projects/link-grammar/";>Link
Grammar Parser</ulink>,
<ulink url="http://aiksaurus.sourceforge.net/";>Aiksaurus</ulink>,
- <xref linkend="boost"/> (required for the collab and openxml/docx
plugins,
- but broken in at least LFS-7.2 with g++ scope errors),
- <xref linkend="dbus-glib"/> (for the collab sugar backend),
- <xref linkend="goffice"/>),
<ulink url="http://helm.cs.unibo.it/mml-widget/";>GtkMathView</ulink>
(requires
<ulink url="http://www.gnome-db.org/";>libgnomedb version
<1.3.0</ulink>*
which requires
<ulink url="http://www.gnome-db.org/";>libgda version <1.3.0</ulink>),
<ulink
url="http://sourceforge.net/projects/mission-control/files/";>libmissioncontrol</ulink>,
- <xref linkend="empathy"/> and
- <xref linkend="telepathy-glib"/> (for the collab telepathy backend),
<ulink
url="http://ftp.imendio.com/pub/imendio/loudmouth/src/";>loudmouth</ulink>
(for the collab xmpp backend),
- <xref linkend="gnutls"/> and
- <xref linkend="libsoup"/> (for the collab service),
<ulink url="http://sourceforge.net/projects/wvware";>libwmf</ulink>,
<ulink url="http://helm.cs.unibo.it/mml-widget/";>GtkMathView</ulink>
(requires
<ulink url="http://sourceforge.net/projects/gmetadom/";>Gnome DOM
Bindings</ulink>
@@ -165,16 +164,11 @@
commands:
</para>
-<screen><userinput>sed -i '/#include <glib\/gerror.h>/d'
src/af/util/xp/ut_go_file.h &&
-sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/' src/af/util/xp/ut_png.cpp &&
-sed -i 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/' \
- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp &&
-sed -i 's/--no-undefined //' src/Makefile* &&
-./configure --prefix=/usr --disable-static &&
+<screen><userinput>./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>
- If you wish to run the tests, issue: <command>make check</command>.
+ This program does not come with a functional test suite.
</para>
<para>
@@ -203,33 +197,6 @@
<title>Command Explanations</title>
<para>
- <command>sed -i '/#include <glib\/gerror.h>/d'
- src/af/util/xp/ut_go_file.h</command>: This sed fixes compiling
- <application>Abiword</application> with
- <application>Glib-2.32</application> installed.
- </para>
-
- <para>
- <command>sed -i 's/ptr->jmpbuf/jmpbuf(png_ptr)/'
- src/af/util/xp/ut_png.cpp</command> and
- <command>sed -i 's/\(m_pPNG\)->\(jmpbuf\)/png_\2(\1)/'
- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp</command>: These seds fix
- compiling Abiword with libpng-1.5 installed.
- </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
- linking to the package and incurring a build failure.
- </para>
-
- <para>
<option>--disable-static</option>: This switch prevents the static
library
being built.
</para>
@@ -237,8 +204,8 @@
<para>
<option>--enable-plugins="collab openxml goffice grammar"</option>: Build
some or all of the collab plugins. The openxml plugin enables
- <application>Abiword</application> to open some .docx files (requires
- <xref linkend="boost"/>). The grammar plugin requires
+ <application>Abiword</application> to open some .docx files.
+ The grammar plugin requires
<ulink url="http://www.abisource.com/projects/link-grammar/";>Link Grammar
Parser</ulink>
</para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
