[arch-commits] Commit in abiword/repos (10 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Tue Apr 8 14:25:04 UTC 2014
Date: Tuesday, April 8, 2014 @ 16:25:03
Author: andyrtr
Revision: 209914
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
abiword/repos/extra-i686/PKGBUILD
(from rev 209913, abiword/trunk/PKGBUILD)
abiword/repos/extra-i686/abiword.install
(from rev 209913, abiword/trunk/abiword.install)
abiword/repos/extra-i686/fix_crash_saving_pdf.patch
(from rev 209913, abiword/trunk/fix_crash_saving_pdf.patch)
abiword/repos/extra-x86_64/PKGBUILD
(from rev 209913, abiword/trunk/PKGBUILD)
abiword/repos/extra-x86_64/abiword.install
(from rev 209913, abiword/trunk/abiword.install)
abiword/repos/extra-x86_64/fix_crash_saving_pdf.patch
(from rev 209913, abiword/trunk/fix_crash_saving_pdf.patch)
Deleted:
abiword/repos/extra-i686/PKGBUILD
abiword/repos/extra-i686/abiword.install
abiword/repos/extra-x86_64/PKGBUILD
abiword/repos/extra-x86_64/abiword.install
-----------------------------------------+
/PKGBUILD | 160 ++++++++++++++++++++++++++++++
/abiword.install | 24 ++++
extra-i686/PKGBUILD | 75 --------------
extra-i686/abiword.install | 12 --
extra-i686/fix_crash_saving_pdf.patch | 86 ++++++++++++++++
extra-x86_64/PKGBUILD | 75 --------------
extra-x86_64/abiword.install | 12 --
extra-x86_64/fix_crash_saving_pdf.patch | 86 ++++++++++++++++
8 files changed, 356 insertions(+), 174 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-08 14:24:40 UTC (rev 209913)
+++ extra-i686/PKGBUILD 2014-04-08 14:25:03 UTC (rev 209914)
@@ -1,75 +0,0 @@
-# $Id$
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Maël Lavault <moimael at neuf.fr>
-
-pkgbase=abiword
-pkgname=('abiword' 'abiword-plugins')
-pkgver=3.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.abisource.com'
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
- 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant'
- 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
- 'redland' 'libical')
-options=('!makeflags')
-source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz)
-md5sums=('8d9c41cff3a8fbef8d0c835c65600e65')
-
-build() {
- cd $pkgbase-$pkgver
-
-# Collab plugin is somehow broken:
-# part service
-#In file included from ./../../../backends/service/xp/RealmConnection.h:33:0,
-# from ./../../../backends/service/xp/AbiCollabSaveInterceptor.h:23,
-# from ./../../../backends/service/xp/ServiceAccountHandler.h:33,
-# from ServiceUnixAccountHandler.h:23,
-# from ServiceUnixAccountHandler.cpp:20:
-#./../../../core/sync/xp/SynchronizedQueue.h:32:1: error: expected class-name before '{' token
-# {
-# part tcp
-#In file included from ./../../../backends/tcp/xp/IOServerHandler.h:29:0,
-# from ./../../../backends/tcp/xp/TCPAccountHandler.h:25,
-# from TCPUnixAccountHandler.h:22,
-# from TCPUnixAccountHandler.cpp:20:
-#./../../../backends/tcp/xp/Session.h:34:63: error: expected class-name before ',' token
-# class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this<Session>
-
- ./configure --prefix=/usr \
- --enable-shared \
- --disable-static \
- --enable-clipart \
- --enable-templates \
- --disable-builtin-plugins \
- --enable-plugins \
- --disable-collab-backend-service \
- --disable-collab-backend-tcp
- make
-}
-
-package_abiword() {
- pkgdesc='Fully-featured word processor'
- depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
- 'redland' 'libical' 'gtk-update-icon-cache')
- install=$pkgname.install
- optdepends=('abiword-plugins')
- conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
-
- # split out plugins, there's no Makefile target for a clean way
- mkdir ${srcdir}/_pluginsdir
- mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
-}
-
-package_abiword-plugins() {
- pkgdesc='Additional plugins for Abiword'
- depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
- 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
-
- install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
- mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
-}
Copied: abiword/repos/extra-i686/PKGBUILD (from rev 209913, abiword/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-08 14:25:03 UTC (rev 209914)
@@ -0,0 +1,80 @@
+# $Id$
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Maël Lavault <moimael at neuf.fr>
+
+pkgbase=abiword
+pkgname=('abiword' 'abiword-plugins')
+pkgver=3.0.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.abisource.com'
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
+ 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant'
+ 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
+ 'redland' 'libical')
+options=('!makeflags')
+source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz
+ fix_crash_saving_pdf.patch)
+md5sums=('8d9c41cff3a8fbef8d0c835c65600e65'
+ 'c3336f5ac7d227ff755c7e42459f20e1')
+
+build() {
+ cd $pkgbase-$pkgver
+
+# Collab plugin is somehow broken:
+# part service
+#In file included from ./../../../backends/service/xp/RealmConnection.h:33:0,
+# from ./../../../backends/service/xp/AbiCollabSaveInterceptor.h:23,
+# from ./../../../backends/service/xp/ServiceAccountHandler.h:33,
+# from ServiceUnixAccountHandler.h:23,
+# from ServiceUnixAccountHandler.cpp:20:
+#./../../../core/sync/xp/SynchronizedQueue.h:32:1: error: expected class-name before '{' token
+# {
+# part tcp
+#In file included from ./../../../backends/tcp/xp/IOServerHandler.h:29:0,
+# from ./../../../backends/tcp/xp/TCPAccountHandler.h:25,
+# from TCPUnixAccountHandler.h:22,
+# from TCPUnixAccountHandler.cpp:20:
+#./../../../backends/tcp/xp/Session.h:34:63: error: expected class-name before ',' token
+# class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this<Session>
+
+ # fix FS#39652 - http://bugzilla.abisource.com/show_bug.cgi?id=13586#c2
+ patch -Np2 -i ${srcdir}/fix_crash_saving_pdf.patch
+
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --disable-static \
+ --enable-clipart \
+ --enable-templates \
+ --disable-builtin-plugins \
+ --enable-plugins \
+ --disable-collab-backend-service \
+ --disable-collab-backend-tcp
+ make
+}
+
+package_abiword() {
+ pkgdesc='Fully-featured word processor'
+ depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
+ 'redland' 'libical' 'gtk-update-icon-cache')
+ install=$pkgname.install
+ optdepends=('abiword-plugins')
+ conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # split out plugins, there's no Makefile target for a clean way
+ mkdir ${srcdir}/_pluginsdir
+ mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
+}
+
+package_abiword-plugins() {
+ pkgdesc='Additional plugins for Abiword'
+ depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
+ 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
+
+ install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
+ mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
+}
Deleted: extra-i686/abiword.install
===================================================================
--- extra-i686/abiword.install 2014-04-08 14:24:40 UTC (rev 209913)
+++ extra-i686/abiword.install 2014-04-08 14:25:03 UTC (rev 209914)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: abiword/repos/extra-i686/abiword.install (from rev 209913, abiword/trunk/abiword.install)
===================================================================
--- extra-i686/abiword.install (rev 0)
+++ extra-i686/abiword.install 2014-04-08 14:25:03 UTC (rev 209914)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: abiword/repos/extra-i686/fix_crash_saving_pdf.patch (from rev 209913, abiword/trunk/fix_crash_saving_pdf.patch)
===================================================================
--- extra-i686/fix_crash_saving_pdf.patch (rev 0)
+++ extra-i686/fix_crash_saving_pdf.patch 2014-04-08 14:25:03 UTC (rev 209914)
@@ -0,0 +1,86 @@
+--- abiword/trunk/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp 2013/12/23 03:20:34 33661
++++ abiword/trunk/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp 2013/12/28 02:04:39 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();
+-
+- 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::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);
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-08 14:24:40 UTC (rev 209913)
+++ extra-x86_64/PKGBUILD 2014-04-08 14:25:03 UTC (rev 209914)
@@ -1,75 +0,0 @@
-# $Id$
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Maël Lavault <moimael at neuf.fr>
-
-pkgbase=abiword
-pkgname=('abiword' 'abiword-plugins')
-pkgver=3.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.abisource.com'
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
- 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant'
- 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
- 'redland' 'libical')
-options=('!makeflags')
-source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz)
-md5sums=('8d9c41cff3a8fbef8d0c835c65600e65')
-
-build() {
- cd $pkgbase-$pkgver
-
-# Collab plugin is somehow broken:
-# part service
-#In file included from ./../../../backends/service/xp/RealmConnection.h:33:0,
-# from ./../../../backends/service/xp/AbiCollabSaveInterceptor.h:23,
-# from ./../../../backends/service/xp/ServiceAccountHandler.h:33,
-# from ServiceUnixAccountHandler.h:23,
-# from ServiceUnixAccountHandler.cpp:20:
-#./../../../core/sync/xp/SynchronizedQueue.h:32:1: error: expected class-name before '{' token
-# {
-# part tcp
-#In file included from ./../../../backends/tcp/xp/IOServerHandler.h:29:0,
-# from ./../../../backends/tcp/xp/TCPAccountHandler.h:25,
-# from TCPUnixAccountHandler.h:22,
-# from TCPUnixAccountHandler.cpp:20:
-#./../../../backends/tcp/xp/Session.h:34:63: error: expected class-name before ',' token
-# class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this<Session>
-
- ./configure --prefix=/usr \
- --enable-shared \
- --disable-static \
- --enable-clipart \
- --enable-templates \
- --disable-builtin-plugins \
- --enable-plugins \
- --disable-collab-backend-service \
- --disable-collab-backend-tcp
- make
-}
-
-package_abiword() {
- pkgdesc='Fully-featured word processor'
- depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
- 'redland' 'libical' 'gtk-update-icon-cache')
- install=$pkgname.install
- optdepends=('abiword-plugins')
- conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
-
- # split out plugins, there's no Makefile target for a clean way
- mkdir ${srcdir}/_pluginsdir
- mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
-}
-
-package_abiword-plugins() {
- pkgdesc='Additional plugins for Abiword'
- depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
- 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
-
- install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
- mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
-}
Copied: abiword/repos/extra-x86_64/PKGBUILD (from rev 209913, abiword/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-08 14:25:03 UTC (rev 209914)
@@ -0,0 +1,80 @@
+# $Id$
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Maël Lavault <moimael at neuf.fr>
+
+pkgbase=abiword
+pkgname=('abiword' 'abiword-plugins')
+pkgver=3.0.0
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.abisource.com'
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
+ 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant'
+ 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
+ 'redland' 'libical')
+options=('!makeflags')
+source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz
+ fix_crash_saving_pdf.patch)
+md5sums=('8d9c41cff3a8fbef8d0c835c65600e65'
+ 'c3336f5ac7d227ff755c7e42459f20e1')
+
+build() {
+ cd $pkgbase-$pkgver
+
+# Collab plugin is somehow broken:
+# part service
+#In file included from ./../../../backends/service/xp/RealmConnection.h:33:0,
+# from ./../../../backends/service/xp/AbiCollabSaveInterceptor.h:23,
+# from ./../../../backends/service/xp/ServiceAccountHandler.h:33,
+# from ServiceUnixAccountHandler.h:23,
+# from ServiceUnixAccountHandler.cpp:20:
+#./../../../core/sync/xp/SynchronizedQueue.h:32:1: error: expected class-name before '{' token
+# {
+# part tcp
+#In file included from ./../../../backends/tcp/xp/IOServerHandler.h:29:0,
+# from ./../../../backends/tcp/xp/TCPAccountHandler.h:25,
+# from TCPUnixAccountHandler.h:22,
+# from TCPUnixAccountHandler.cpp:20:
+#./../../../backends/tcp/xp/Session.h:34:63: error: expected class-name before ',' token
+# class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this<Session>
+
+ # fix FS#39652 - http://bugzilla.abisource.com/show_bug.cgi?id=13586#c2
+ patch -Np2 -i ${srcdir}/fix_crash_saving_pdf.patch
+
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --disable-static \
+ --enable-clipart \
+ --enable-templates \
+ --disable-builtin-plugins \
+ --enable-plugins \
+ --disable-collab-backend-service \
+ --disable-collab-backend-tcp
+ make
+}
+
+package_abiword() {
+ pkgdesc='Fully-featured word processor'
+ depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
+ 'redland' 'libical' 'gtk-update-icon-cache')
+ install=$pkgname.install
+ optdepends=('abiword-plugins')
+ conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # split out plugins, there's no Makefile target for a clean way
+ mkdir ${srcdir}/_pluginsdir
+ mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
+}
+
+package_abiword-plugins() {
+ pkgdesc='Additional plugins for Abiword'
+ depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
+ 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
+
+ install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
+ mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
+}
Deleted: extra-x86_64/abiword.install
===================================================================
--- extra-x86_64/abiword.install 2014-04-08 14:24:40 UTC (rev 209913)
+++ extra-x86_64/abiword.install 2014-04-08 14:25:03 UTC (rev 209914)
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: abiword/repos/extra-x86_64/abiword.install (from rev 209913, abiword/trunk/abiword.install)
===================================================================
--- extra-x86_64/abiword.install (rev 0)
+++ extra-x86_64/abiword.install 2014-04-08 14:25:03 UTC (rev 209914)
@@ -0,0 +1,12 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: abiword/repos/extra-x86_64/fix_crash_saving_pdf.patch (from rev 209913, abiword/trunk/fix_crash_saving_pdf.patch)
===================================================================
--- extra-x86_64/fix_crash_saving_pdf.patch (rev 0)
+++ extra-x86_64/fix_crash_saving_pdf.patch 2014-04-08 14:25:03 UTC (rev 209914)
@@ -0,0 +1,86 @@
+--- abiword/trunk/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp 2013/12/23 03:20:34 33661
++++ abiword/trunk/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp 2013/12/28 02:04:39 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();
+-
+- 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::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);
+
More information about the arch-commits
mailing list