office/abiword: Updated for version 3.0.1.

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

3 files changed, 7 insertions, 98 deletions

diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 692375f06742..298d4edfa3bf 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -27,9 +27,9 @@
 # Now maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=abiword
-VERSION=3.0.0
+VERSION=3.0.1
 DOCSVER=$VERSION	# version of abiword-docs
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -76,11 +76,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix http://bugzilla.abisource.com/show_bug.cgi?id=13586
-# svn co http://svn.abisource.com/abiword/trunk abiword
-# svn diff -r 33659:33662 > fix-segfault-on-save-pdf.patch
-patch -p0 < $CWD/fix-segfault-on-save-pdf.patch
-
 CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index 6c95d6b9dac8..3eb2982699c9 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,10 +1,10 @@
 PRGNAM="abiword"
-VERSION="3.0.0"
+VERSION="3.0.1"
 HOMEPAGE="http://www.abisource.com"
-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="http://abisource.com/downloads/abiword/3.0.1/source/abiword-3.0.1.tar.gz \
+          http://abisource.com/downloads/abiword/3.0.1/source/abiword-docs-3.0.1.tar.gz"
+MD5SUM="f3f8052e7b4979a43b75775a381e6cb8 \
+        c9b78cb5f9c415ed63ce1cf9874fa8a4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wv"
diff --git a/office/abiword/fix-segfault-on-save-pdf.patch b/office/abiword/fix-segfault-on-save-pdf.patch
deleted file mode 100644
index 95eef0b1894c..000000000000
--- a/office/abiword/fix-segfault-on-save-pdf.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
-===================================================================
---- src/text/fmt/gtk/fv_UnixSelectionHandles.cpp	(revision 33659)
-+++ src/text/fmt/gtk/fv_UnixSelectionHandles.cpp	(revision 33662)
-@@ -36,42 +36,60 @@
- 
- 	mode = _fv_text_handle_get_mode (handle);
- 
--	if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START)
-+	if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START) {
- 		handles->updateSelectionStart ((UT_sint32)x, (UT_sint32)y);
-+        }
- 	else {
--		if (mode == FV_TEXT_HANDLE_MODE_SELECTION)
-+		if (mode == FV_TEXT_HANDLE_MODE_SELECTION) {
- 			handles->updateSelectionEnd ((UT_sint32)x, (UT_sint32)y);
--                else
-+                }
-+                else {
- 			handles->updateCursor((UT_sint32)x, (UT_sint32)y);
-+                }
- 	}
- }
- 
- FV_UnixSelectionHandles::FV_UnixSelectionHandles(FV_View *view, FV_Selection selection)
- 	: FV_SelectionHandles (view, selection)
-+	, m_text_handle(NULL)
- {
- 	XAP_Frame * pFrame = static_cast<XAP_Frame*>(m_pView->getParentData());
--	XAP_UnixFrameImpl * pFrameImpl =static_cast<XAP_UnixFrameImpl *>( pFrame->getFrameImpl());
--	GtkWidget * pWidget = pFrameImpl->getViewWidget();
-+	// When saving to PDF (and printing) we don't have a frame
-+	// See bug 13586
-+	if (pFrame) {
-+		XAP_UnixFrameImpl * pFrameImpl = static_cast<XAP_UnixFrameImpl *>(pFrame->getFrameImpl());
-+		GtkWidget * pWidget = pFrameImpl->getViewWidget();
- 
--	m_text_handle = _fv_text_handle_new (pWidget);
--        _fv_text_handle_set_relative_to (m_text_handle,
--                                         gtk_widget_get_window (pWidget));
--        g_signal_connect (m_text_handle, "handle-dragged",
--                          G_CALLBACK(handle_dragged_cb), this);
-+		m_text_handle = _fv_text_handle_new (pWidget);
-+		_fv_text_handle_set_relative_to (m_text_handle,
-+						 gtk_widget_get_window (pWidget));
-+		g_signal_connect (m_text_handle, "handle-dragged",
-+				  G_CALLBACK(handle_dragged_cb), this);
-+	}
- }
- 
- FV_UnixSelectionHandles::~FV_UnixSelectionHandles()
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
- 	g_object_unref (m_text_handle);
- }
- 
- void FV_UnixSelectionHandles::hide()
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
- 	_fv_text_handle_set_mode (m_text_handle, FV_TEXT_HANDLE_MODE_NONE);
- }
- 
- void FV_UnixSelectionHandles::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint32 height, bool visible)
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
-+
- 	GdkRectangle rect;
- 
- 	_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_CURSOR);
-@@ -92,6 +110,10 @@
- void FV_UnixSelectionHandles::setSelectionCoords(UT_sint32 start_x, UT_sint32 start_y, UT_uint32 start_height, bool start_visible,
-                                                  UT_sint32 end_x, UT_sint32 end_y, UT_uint32 end_height, bool end_visible)
- {
-+	if(!m_text_handle) {
-+		return;
-+	}
-+
- 	GdkRectangle rect;
- 
- 	_fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_SELECTION);