office/abiword: Updated for version 3.0.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 12 insertions, 158 deletions

diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 33f1aef69016..3685327c8d62 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -27,9 +27,9 @@
 # work correctly on Slackware - the patches are all from him
 
 PRGNAM=abiword
-VERSION=2.8.6
+VERSION=3.0.0
 DOCSVER=$VERSION	# version of abiword-docs
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -76,18 +76,6 @@ 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
-
-# This fixes building with gcc-4.7
-sed -i "s|--no-undefined||" src/Makefile.{am,in}
-
-# This fixes building with glib >= 2.31 (thanks to gentoo)
-patch -p0 < $CWD/patches/abiword-2.8.6-glib-2.31.patch
-
 CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index 52dfcaa16b06..6c95d6b9dac8 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,10 +1,10 @@
 PRGNAM="abiword"
-VERSION="2.8.6"
+VERSION="3.0.0"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz \
-          http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-docs-2.8.6.tar.gz"
-MD5SUM="f883b0a7f26229a9c66fd6a1a94381aa\
-        197df94c1d9ed287903cb5aa0b60bbc1"
+DOWNLOAD="http://abisource.com/downloads/abiword/3.0.0/source/abiword-3.0.0.tar.gz \
+          http://abisource.com/downloads/abiword/3.0.0/source/abiword-docs-3.0.0.tar.gz"
+MD5SUM="8d9c41cff3a8fbef8d0c835c65600e65 \
+        ed73d0743a19eb85e46b59464e0ef2bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wv"
diff --git a/office/abiword/patches/abiword-2.8.6-glib-2.31.patch b/office/abiword/patches/abiword-2.8.6-glib-2.31.patch
deleted file mode 100644
index 8b938cc25a7e..000000000000
--- a/office/abiword/patches/abiword-2.8.6-glib-2.31.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-------------------------------------------------------------------------
-r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines
-Changed paths:
-   M /abiword/trunk/src/af/util/xp/ut_go_file.h
-
-Bug 13197: only import glib.h
-Patch by Dominique Leuenberger.
-------------------------------------------------------------------------
-r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines
-Changed paths:
-   M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h
-
-Bug 13247 - Fix glib headers. Patch by Funda Wang
-(safe to backport)
-------------------------------------------------------------------------
-Index: src/af/util/xp/ut_go_file.h
-===================================================================
---- src/af/util/xp/ut_go_file.h	(revision 30478)
-+++ src/af/util/xp/ut_go_file.h	(revision 30479)
-@@ -31,7 +31,6 @@
- 
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
- 
- G_BEGIN_DECLS
-Index: goffice-bits/goffice/app/goffice-app.h
-===================================================================
---- goffice-bits/goffice/app/goffice-app.h	(revision 30601)
-+++ goffice-bits/goffice/app/goffice-app.h	(revision 30602)
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/office/abiword/patches/boost_asio.patch b/office/abiword/patches/boost_asio.patch
deleted file mode 100644
index 11b1fea6353c..000000000000
--- a/office/abiword/patches/boost_asio.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nur abiword-2.8.5.orig//asio.hpp abiword-2.8.5/asio.hpp
---- abiword-2.8.5.orig//asio.hpp	1969-12-31 18:00:00.000000000 -0600
-+++ abiword-2.8.5/asio.hpp	2010-06-04 02:13:57.279465007 -0500
-@@ -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;
-+}
-diff -Nur abiword-2.8.5.orig//configure abiword-2.8.5/configure
---- abiword-2.8.5.orig//configure	2010-05-30 14:34:39.000000000 -0500
-+++ abiword-2.8.5/configure	2010-06-04 02:13:39.961560728 -0500
-@@ -19815,7 +19815,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--		for ac_header in asio.hpp
-+		for ac_header in boost/asio.hpp
- do :
-   ac_fn_cxx_check_header_mongrel "$LINENO" "asio.hpp" "ac_cv_header_asio_hpp" "$ac_includes_default"
- if test "x$ac_cv_header_asio_hpp" = x""yes; then :
-@@ -19847,7 +19847,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--	for ac_header in asio.hpp
-+	for ac_header in boost/asio.hpp
- do :
-   ac_fn_cxx_check_header_mongrel "$LINENO" "asio.hpp" "ac_cv_header_asio_hpp" "$ac_includes_default"
- if test "x$ac_cv_header_asio_hpp" = x""yes; then :
-@@ -20353,7 +20353,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 -lboost_thread"
- fi
- 
- test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"
diff --git a/office/abiword/patches/url_show.patch b/office/abiword/patches/url_show.patch
deleted file mode 100644
index 78e4b17ce911..000000000000
--- a/office/abiword/patches/url_show.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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 9d89d372762b..d6272682d4a6 100644
--- a/office/abiword/slack-desc
+++ b/office/abiword/slack-desc
@@ -1,9 +1,9 @@
 # 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 ':'.
+# 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 ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 abiword: AbiWord (a lightweight and featureful Word Processor)