6 files changed, 171 insertions, 25 deletions
diff --git a/office/abiword/README b/office/abiword/README
index fb12c7ac1a..5b3e9a59bf 100644
--- a/office/abiword/README
+++ b/office/abiword/README
@@ -1,7 +1,9 @@
-The AbiWord word processor is a lightweight and featureful
-productivity tool that is suitable for a wide variety of word
-processing tasks.
+The AbiWord word processor is a lightweight and featureful productivity 
+tool that is suitable for a wide variety of word processing tasks.
 
-AbiWord requires gail, wv, libgnomecanvas, libgnomeprintui, 
-libgnomeprint, and libgnomecups, all of which are available 
-at SlackBuilds.org
+This requires wv.  goffice and gnome-vfs are optional dependencies, but
+gnome-vfs doesn't add anything useful.
+
+evince is an optional runtime dependency since it's the default application
+to show print previews, but you can avoid it by adding something like this
+to your ~/.gtkrc-2.0 file:  gtk-print-preview-command="xpdf -q %f"
diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 73905b01f1..eb541ff748 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -23,9 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Now maintained by Robby Workman <rworkman@slackbuilds.org>
+# Thanks to Tim Goya for all of the hard work in making the 2.8.x releases
+# work correctly on Slackware - the patches are all from him
 
 PRGNAM=abiword
-VERSION=2.6.6
+VERSION=2.8.2
+DOCSVER=$VERSION	# version of abiword-docs
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -37,20 +40,29 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+# If libgsf is built with gio enabled, then use it (for later in -current)
+# Otherwise, 13.0 does not have gio-enabled libgsf
+[ ! -f "/usr/include/libgsf-1/gsf/gsf-input-gio.h" ] && USE_GIO="no"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION 
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+rm -rf abiword-docs-$DOCSVER
+tar xvf $CWD/abiword-docs-$DOCSVER.tar.gz
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -58,6 +70,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# This should make the build use Slackware's Boost Asio
+patch -p1 < $CWD/patches/boost_asio.patch 
+
+# This should make the help stuff work properly
+patch -p1 < $CWD/patches/url_show.patch 
+
+CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,15 +84,36 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-gnome \
-  --enable-threads \
-  --enable-static=no \
+  --disable-static \
+  --enable-shared \
+  --enable-clipart \
+  --enable-templates \
+  --enable-plugins \
+  --with-gio=${USE_GIO:-no} \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
+# Now install the separate abiword-docs
+cd abiword-docs-$DOCSVER
+  PATH="$PKG/usr/bin:$PATH" \
+  PKG_CONFIG_PATH="$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig:$PKG_CONFIG_PATH" \
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --docdir=/usr/doc/$PRGNAM-$VERSION \
+    --build=$ARCH-slackware-linux
+  LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH" \
+    PATH="$PKG/usr/bin:$PATH" \
+    make
+  make install DESTDIR=$PKG
+cd ..
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -82,8 +122,8 @@ mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  BUILD.TXT BiDiReadme.txt COPYING COPYRIGHT.TXT CREDITS.TXT README.TXT \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  *.txt *.TXT AUTHORS COPYING ChangeLog INSTALL NEWS README \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -91,4 +131,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index a463b81322..200f676f51 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,8 +1,12 @@
 PRGNAM="abiword"
-VERSION="2.6.6"
+VERSION="2.8.2"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://www.abisource.com/downloads/abiword/2.6.6/source/abiword-2.6.6.tar.gz"
-MD5SUM="b9de84f03f555d4490b63e5b7f53e2f1"
+DOWNLOAD="http://www.abisource.com/downloads/abiword/2.8.2/source/abiword-2.8.2.tar.gz \
+          http://www.abisource.com/downloads/abiword/2.8.2/source/abiword-docs-2.8.2.tar.gz"
+MD5SUM="b44ffbebd5bd0f5f98f34dc8c688b4ed \
+        82f41f5d47f83d652acdb2ddaf145886"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="Erik Hanson"
+APPROVED="michiel"
diff --git a/office/abiword/patches/boost_asio.patch b/office/abiword/patches/boost_asio.patch
new file mode 100644
index 0000000000..0632f8ff79
--- /dev/null
+++ b/office/abiword/patches/boost_asio.patch
@@ -0,0 +1,42 @@
+--- abiword-2.8.1/asio.hpp	1969-12-31 16:00:00.000000000 -0800
++++ abiword-2.8.1/asio.hpp	2009-10-31 19:01:58.977141321 -0700
+@@ -0,0 +1,10 @@
++#include <boost/asio.hpp>
++#include <boost/thread.hpp>
++
++namespace asio
++{
++   using namespace boost::asio;
++   using boost::system::error_code;
++   using boost::system::system_error;
++   using boost::thread;
++}
+--- abiword-2.8.1/configure	2009-10-30 23:30:30.761312681 -0700
++++ abiword-2.8.1/configure	2009-10-31 19:18:16.581095503 -0700
+@@ -22662,7 +22662,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+-for ac_header in asio.hpp
++for ac_header in boost/asio.hpp
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -22834,7 +22834,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+-for ac_header in asio.hpp
++for ac_header in boost/asio.hpp
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -23838,7 +23838,7 @@
+ 
+ if test "$enable_collab_backend_tcp" == "yes" || \
+    test "$enable_collab_backend_service" == "yes"; then
+-	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread"
++	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread -lboost_system-mt -lboost_thread-mt"
+ fi
+ 
+ test "$enable_collab" == "auto" && PLUGINS="$PLUGINS collab"
diff --git a/office/abiword/patches/url_show.patch b/office/abiword/patches/url_show.patch
new file mode 100644
index 0000000000..78e4b17ce9
--- /dev/null
+++ b/office/abiword/patches/url_show.patch
@@ -0,0 +1,50 @@
+--- abiword-2.8.1/src/af/util/xp/ut_go_file.cpp	2009-10-30 23:30:24.005096842 -0700
++++ abiword-2.8.1/src/af/util/xp/ut_go_file.cpp	2009-10-31 09:32:24.028095222 -0700
+@@ -1665,12 +1665,17 @@
+ #else
+ 	GError *err = NULL;
+ #ifdef HAVE_GTK214
+-	gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &err);
+-	return err;
+-#elif defined(WITH_GNOMEVFS)
+-	gnome_vfs_url_show (url);
+-	return err;
+-#else
++	if(gtk_show_uri (NULL, url, GDK_CURRENT_TIME, &err))
++	{
++		return err;
++	}
++#endif
++#if defined(WITH_GNOMEVFS)
++	if(gnome_vfs_url_show (url))
++	{
++		return err;
++	}
++#endif
+ 	gchar *browser = NULL;
+ 	gchar *clean_url = NULL;
+ 
+@@ -1679,6 +1684,7 @@
+ 
+ 	if (browser == NULL) {
+ 		static char const * const browsers[] = {
++			"xdg-open",		/* freedesktop.org */
+ 			"sensible-browser",	/* debian */
+ 			"epiphany",		/* primary gnome */
+ 			"galeon",		/* secondary gnome */
+@@ -1688,6 +1694,7 @@
+ 			"mozilla",
+ 			"netscape",
+ 			"konqueror",
++			"dillo",
+ 			"xterm -e w3m",
+ 			"xterm -e lynx",
+ 			"xterm -e links"
+@@ -1735,7 +1742,6 @@
+ 	g_free (clean_url);
+ 	return err;
+ #endif
+-#endif
+ }
+ 
+ /**
diff --git a/office/abiword/slack-desc b/office/abiword/slack-desc
index a701722088..9d89d37276 100644
--- a/office/abiword/slack-desc
+++ b/office/abiword/slack-desc
@@ -1,11 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
 abiword: AbiWord (a lightweight and featureful Word Processor)
-abiword: 
+abiword:
 abiword: The AbiWord word processor is a lightweight and featureful
 abiword: productivity tool that is suitable for a wide variety of word
 abiword: processing tasks.
-abiword: 
-abiword: 
-abiword: 
-abiword: 
-abiword: 
-abiword: 
+abiword:
+abiword:
+abiword:
+abiword:
+abiword:
+abiword: