Bug#774288: unblock: abiword/3.0.0-8
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
I would like to upload a fix for Bug #766845: Abiword crashes when I click the
eye dropper on the toolbar to paste formatting. Upstream has a change that
stops this crash, I've added it as a patch and built a new version of abiword.
My version of the package is ready for upload. The debdiff output is below.
Please can you unblock the abiword package.
Thanks,
--
Edward.
diff -Nru abiword-3.0.0/debian/changelog abiword-3.0.0/debian/changelog
--- abiword-3.0.0/debian/changelog 2014-10-02 11:04:18.000000000 +0100
+++ abiword-3.0.0/debian/changelog 2014-12-04 22:00:20.000000000 +0000
@@ -1,3 +1,10 @@
+abiword (3.0.0-8) unstable; urgency=medium
+
+ * QA upload.
+ * Apply an upstream patch to fix format painter bug. (Closes: #766845).
+
+ -- Edward Betts <edward@4angle.com> Thu, 04 Dec 2014 22:00:10 +0000
+
abiword (3.0.0-7) unstable; urgency=medium
* Build-Depends: libjpeg8-dev --> libjpeg-dev (Closes: #763464).
diff -Nru abiword-3.0.0/debian/patches/format-painter-fix.patch abiword-3.0.0/debian/patches/format-painter-fix.patch
--- abiword-3.0.0/debian/patches/format-painter-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ abiword-3.0.0/debian/patches/format-painter-fix.patch 2014-11-15 18:38:24.000000000 +0000
@@ -0,0 +1,92 @@
+Last-Update: 2014-11-15
+Bug-Debian: http://bugs.debian.org/766845
+Bug-Abiword: http://bugzilla.abisource.com/13586
+Description: fix format painter bug
+
+Index: abiword/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
+===================================================================
+--- abiword.orig/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
++++ abiword/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp
+@@ -36,42 +36,60 @@ static void handle_dragged_cb (FvTextHan
+
+ 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();
+-
+- 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);
++ // 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);
++ }
+ }
+
+ 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::setCursorC
+ 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);
diff -Nru abiword-3.0.0/debian/patches/series abiword-3.0.0/debian/patches/series
--- abiword-3.0.0/debian/patches/series 2014-08-09 02:07:57.000000000 +0100
+++ abiword-3.0.0/debian/patches/series 2014-11-15 18:37:02.000000000 +0000
@@ -10,3 +10,4 @@
ctrl-comma-subscript.diff -p1
mime-types-desktop.diff -p1
mime-types.diff -p1
+format-painter-fix.patch
Reply to: