main/abiword: upgrade to 3.0.1

3 files changed, 5 insertions, 149 deletions

diff --git a/main/abiword/APKBUILD b/main/abiword/APKBUILD
index 3c9dbad0ec..cf9a6bb518 100644
--- a/main/abiword/APKBUILD
+++ b/main/abiword/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abiword
-pkgver=3.0.0
-pkgrel=4
+pkgver=3.0.1
+pkgrel=0
 pkgdesc="A fully-featured word processor"
 url="http://www.abisource.com"
 arch="all"
@@ -29,8 +29,6 @@ for _i in $_plugins; do
 done
 
 source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz
-	pdf.patch
-	fix-ruler.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -85,12 +83,6 @@ plugins() {
 	mkdir -p "$subpkgdir"
 }
 
-md5sums="8d9c41cff3a8fbef8d0c835c65600e65  abiword-3.0.0.tar.gz
-ba81b555f1980b2f070c494fce50b830  pdf.patch
-4afd1975c3b9de7ed48f2fd01f80a5f4  fix-ruler.patch"
-sha256sums="d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01  abiword-3.0.0.tar.gz
-94ab986c208fe13c2f89a0b6af5983dee19f8e9e6267e07f95e053e2c50826d4  pdf.patch
-ad605e37716731c58e15d68e3e7527b03506fe807b3475fbf60f05eb3e9ebddf  fix-ruler.patch"
-sha512sums="3f9804b17f27b8afa2f5bcccdb1b5d6270339ad4f518523208f2e2cde54cb28391575cfd3639aaadc13ab50d5908260b159ca7b41fd92ed5a449d7012e5a4637  abiword-3.0.0.tar.gz
-6c5c25d049254e16577f8adb0d046e52cbf1d5dfc7c89dc8a23357447d17ce07f09b5864f0ccd0dfefa289ced685aa22de7de51f0681f50373728c9764cf5650  pdf.patch
-a1f52bdf1e7e2d21c63c334ba624a5a6ee62b6c06f31ebc8d74e9fa2dbd5022a2c09fb16c743f2dab7ba3e9ce41989908fb47638c4593cbe5f9d8c537e2fbddd  fix-ruler.patch"
+md5sums="f3f8052e7b4979a43b75775a381e6cb8  abiword-3.0.1.tar.gz"
+sha256sums="e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6  abiword-3.0.1.tar.gz"
+sha512sums="c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf  abiword-3.0.1.tar.gz"
diff --git a/main/abiword/fix-ruler.patch b/main/abiword/fix-ruler.patch
deleted file mode 100644
index 3f470831c4..0000000000
--- a/main/abiword/fix-ruler.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit f1d711aa84c95430319fd92ffbcb03df36e5e76e
-Author: Hubert Figuière <hub@figuiere.net>
-Date:   Sat Feb 22 10:41:55 2014 -0500
-
-    Bug 13582 - Fix redraw region in custom widget.
-    
-    Cherry-picked from trunk@33870 and reworked for 3.0.x
-
-diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-index 4c8d23c..15d7a7d 100644
---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
-@@ -520,7 +520,7 @@ void GR_UnixCairoGraphics::_beginPaint()
- 		{
- 			UT_ASSERT(ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE);
- 			if (ev->type == GDK_EXPOSE || ev->type == GDK_DAMAGE)
--				UT_ASSERT(ev->expose.window == m_pWin);
-+				UT_ASSERT(ev->expose.window == m_pWin || ev->expose.window == gdk_window_get_effective_parent (m_pWin));
- 		}
- 	}
- #endif
-diff --git a/src/af/xap/gtk/xap_UnixCustomWidget.cpp b/src/af/xap/gtk/xap_UnixCustomWidget.cpp
-index b0b7015..5150afe 100644
---- a/src/af/xap/gtk/xap_UnixCustomWidget.cpp
-+++ b/src/af/xap/gtk/xap_UnixCustomWidget.cpp
-@@ -45,16 +45,18 @@ void XAP_UnixCustomWidget::_fe::expose(XAP_UnixCustomWidget *self, GdkEventExpos
- #endif
- {
- #if GTK_CHECK_VERSION(3,0,0)
--	GdkEventExpose *ev = reinterpret_cast<GdkEventExpose *>(gtk_get_current_event());
--#endif
-+	self->m_cr = cr;
-+	double x1, y1, x2, y2;
-+	cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
-+
-+	UT_Rect r(x1, y1, x2 - x1, y2 - y1);
-+#else
- 	UT_Rect r(
- 			ev->area.x,
- 			ev->area.y,
- 			ev->area.width,
- 			ev->area.height
- 		);
--#if GTK_CHECK_VERSION(3,0,0)
--	self->m_cr = cr;
- #endif
- 	self->draw(&r);
- }
diff --git a/main/abiword/pdf.patch b/main/abiword/pdf.patch
deleted file mode 100644
index 0c3d0bb98c..0000000000
--- a/main/abiword/pdf.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-http://bugzilla.abisource.com/show_bug.cgi?id=13586
-
-Index: src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
-===================================================================
---- ./src/text/fmt/gtk/fv_UnixSelectionHandles.cpp	(revision 33662)
-+++ ./src/text/fmt/gtk/fv_UnixSelectionHandles.cpp	(revision 33663)
-@@ -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);