diff -Nru abiword-3.0.0/debian/changelog abiword-3.0.0/debian/changelog --- abiword-3.0.0/debian/changelog 2014-02-05 19:04:16.000000000 +0100 +++ abiword-3.0.0/debian/changelog 2014-04-12 11:50:20.000000000 +0200 @@ -1,3 +1,12 @@ +abiword (3.0.0-4ubuntu1) trusty; urgency=medium + + * New backported patches: + + r33663_fix-crash-when-saving-to-pdf.patch (LP: #1262375) + + r33871_fix-redraw-region-in-custom-widget.patch (LP: #1261203) + * New patch to fix icon path in about dialog (LP: #1299582). + + -- Thaddäus Tintenfisch Sat, 12 Apr 2014 11:49:49 +0200 + abiword (3.0.0-4) unstable; urgency=medium * New patch to fix FTBFS with libboost1.54 (Closes: #737551). diff -Nru abiword-3.0.0/debian/control abiword-3.0.0/debian/control --- abiword-3.0.0/debian/control 2013-11-10 01:30:52.000000000 +0100 +++ abiword-3.0.0/debian/control 2014-04-12 11:50:25.000000000 +0200 @@ -1,7 +1,8 @@ Source: abiword Section: gnome Priority: optional -Maintainer: Dmitry Smirnov +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Dmitry Smirnov Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, imagemagick ,bison ,flex diff -Nru abiword-3.0.0/debian/patches/fix-icon-path-in-about-dialog.patch abiword-3.0.0/debian/patches/fix-icon-path-in-about-dialog.patch --- abiword-3.0.0/debian/patches/fix-icon-path-in-about-dialog.patch 1970-01-01 01:00:00.000000000 +0100 +++ abiword-3.0.0/debian/patches/fix-icon-path-in-about-dialog.patch 2014-04-12 11:47:40.000000000 +0200 @@ -0,0 +1,17 @@ +Author: Thaddaeus Tintenfisch +Description: Fix icon path in about dialog +Bug-Ubuntu: https://launchpad.net/bugs/1299582 + +--- a/src/af/xap/gtk/xap_UnixDlg_About.cpp ++++ b/src/af/xap/gtk/xap_UnixDlg_About.cpp +@@ -70,9 +70,7 @@ void XAP_UnixDialog_About::runModal(XAP_ + + // TODO Rob: use the more fancy "sidebar.png" logo, just like win32 + if (!logo) { +- std::string str (ICONDIR); +- str += "/abiword.png"; +- logo = gdk_pixbuf_new_from_file (str.c_str(), NULL); // ignore errors ++ logo = gdk_pixbuf_new_from_file ("/usr/share/pixmaps/abiword.png", NULL); // ignore errors + } + + dlg = gtk_about_dialog_new(); diff -Nru abiword-3.0.0/debian/patches/r33663_fix-crash-when-saving-as-pdf.patch abiword-3.0.0/debian/patches/r33663_fix-crash-when-saving-as-pdf.patch --- abiword-3.0.0/debian/patches/r33663_fix-crash-when-saving-as-pdf.patch 1970-01-01 01:00:00.000000000 +0100 +++ abiword-3.0.0/debian/patches/r33663_fix-crash-when-saving-as-pdf.patch 2014-03-26 15:33:21.000000000 +0100 @@ -0,0 +1,102 @@ +From 128dfbc82cbd5c2c1bb6d0cde238a933639fba50 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere +Date: Sat, 28 Dec 2013 02:05:23 +0000 +Subject: [PATCH] Bug 13586 - We don't have a frame when printing. + +UPLIFTED from trunk + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@33663 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + src/text/fmt/gtk/fv_UnixSelectionHandles.cpp | 44 +++++++++++++++++++++------- + 1 file changed, 33 insertions(+), 11 deletions(-) + +diff --git a/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp b/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp +index a3a3347..8bc187c 100644 +--- a/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp ++++ b/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp +@@ -36,42 +36,60 @@ static void handle_dragged_cb (FvTextHandle *handle, + + 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(m_pView->getParentData()); +- XAP_UnixFrameImpl * pFrameImpl =static_cast( 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(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::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint3 + 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); +-- +1.9.1 + diff -Nru abiword-3.0.0/debian/patches/r33871_fix-redraw-region-in-custom-widget.patch abiword-3.0.0/debian/patches/r33871_fix-redraw-region-in-custom-widget.patch --- abiword-3.0.0/debian/patches/r33871_fix-redraw-region-in-custom-widget.patch 1970-01-01 01:00:00.000000000 +0100 +++ abiword-3.0.0/debian/patches/r33871_fix-redraw-region-in-custom-widget.patch 2014-03-26 15:33:11.000000000 +0100 @@ -0,0 +1,56 @@ +From c260e8d107a8708d57a60fbc18ef71ffeb88fcf1 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere +Date: Sat, 22 Feb 2014 18:42:56 +0000 +Subject: [PATCH] Bug 13582 - Fix redraw region in custom widget. + +Cherry-picked from trunk@33870 and reworked for 3.0.x + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@33871 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 2 +- + src/af/xap/gtk/xap_UnixCustomWidget.cpp | 10 ++++++---- + 2 files changed, 7 insertions(+), 5 deletions(-) + +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(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); + } +-- +1.9.1 + diff -Nru abiword-3.0.0/debian/patches/series abiword-3.0.0/debian/patches/series --- abiword-3.0.0/debian/patches/series 2014-02-05 18:23:56.000000000 +0100 +++ abiword-3.0.0/debian/patches/series 2014-04-12 11:48:26.000000000 +0200 @@ -7,3 +7,6 @@ ctrl-comma-subscript.diff -p1 mime-types-desktop.diff -p1 mime-types.diff -p1 +r33663_fix-crash-when-saving-as-pdf.patch +r33871_fix-redraw-region-in-custom-widget.patch +fix-icon-path-in-about-dialog.patch