summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-02-09 18:23:13 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-02-09 19:10:23 +0100
commite957cac52df2d58dd5dfcc43995323ebed149bd9 (patch)
tree54ba5760598a0ad03c7cfb7188347c0561dc475e
parenta92c38dbcb9c864afd65e3fd24debc2e6d721f1b (diff)
downloadoffice-e957cac52df2d58dd5dfcc43995323ebed149bd9.tar.gz
office-e957cac52df2d58dd5dfcc43995323ebed149bd9.tar.xz
abiword: version bump to 3.0.2
Change-Id: I5e7e7692a889881cab8c9919ce43a00129f1e85d Reviewed-on: https://galileo.mailstation.de/gerrit/8284 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/app-office/abiword/abiword-3.0.2.exheres-0 (renamed from packages/app-office/abiword/abiword-3.0.1.exheres-0)12
-rw-r--r--packages/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch38
-rw-r--r--packages/app-office/abiword/files/cec2fda355b67b5b814a803c5ed128c425cbb030.patch56
3 files changed, 102 insertions, 4 deletions
diff --git a/packages/app-office/abiword/abiword-3.0.1.exheres-0 b/packages/app-office/abiword/abiword-3.0.2.exheres-0
index 5ba4560..9b27a49 100644
--- a/packages/app-office/abiword/abiword-3.0.1.exheres-0
+++ b/packages/app-office/abiword/abiword-3.0.2.exheres-0
@@ -6,7 +6,9 @@ require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
SUMMARY="A free word processing program similar to Microsoft Word"
HOMEPAGE="http://www.abiword.com/"
-DOWNLOADS="http://www.abisource.com/downloads/${PN}/${PV}/source/${PNV}.tar.gz"
+# gentoo mirror: wget fails to fetch because of a ssl certificate error
+DOWNLOADS="https://www.abisource.com/downloads/${PN}/${PV}/source/${PNV}.tar.gz
+ http://distfiles.gentoo.org/distfiles/${PNV}.tar.gz"
LICENCES="GPL-2"
SLOT="0"
@@ -26,13 +28,13 @@ DEPENDENCIES="
dev-libs/fribidi[>=0.10.4]
dev-libs/glib:2[>=2.6]
dev-libs/libgcrypt[>=1.4.5]
- dev-libs/libxml2:2.0
+ dev-libs/libxml2:2.0[>=2.4.0]
dev-libs/libxslt
gnome-desktop/librsvg:2[>=2.16]
media-libs/fontconfig
media-libs/libpng:=[>=1.2]
- media-libs/libwmf
- office-libs/goffice:0.10[>=0.10.0]
+ media-libs/libwmf[>=0.2.8]
+ office-libs/goffice:0.10[>=0.10.2]
office-libs/libgsf:1[>=1.14.9]
office-libs/wv:1[>=1.2.0]
x11-libs/cairo
@@ -59,6 +61,8 @@ DEPENDENCIES="
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/0001-BUILD-fix-pkg-config-invocation.patch
+ "${FILES}"/${PN}-3.0.2-fix-nullptr-c++98.patch
+ "${FILES}"/cec2fda355b67b5b814a803c5ed128c425cbb030.patch
)
# TODO: Collab
diff --git a/packages/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch b/packages/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
new file mode 100644
index 0000000..74a39df
--- /dev/null
+++ b/packages/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
@@ -0,0 +1,38 @@
+Source: Gentoo
+Upstream: https://bugzilla.abisource.com/show_bug.cgi?id=13819
+Reason: Fix build error
+
+Replace 'nullptr' by NULL in order to allow compiling in C++98 mode.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=599618
+
+--- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
++++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp
+@@ -180,7 +180,7 @@
+ if (m_styleBg) {
+ g_object_unref(m_styleBg);
+ }
+- m_styleBg = XAP_GtkStyle_get_style(nullptr, "GtkButton"); // "button"
++ m_styleBg = XAP_GtkStyle_get_style(NULL, "GtkButton"); // "button"
+ // guess colours
+ // WHITE
+ GdkRGBA rgba2;
+@@ -627,7 +627,7 @@
+ _setProps();
+ cairo_save (m_cr);
+
+- GtkStyleContext *context = nullptr;
++ GtkStyleContext *context = NULL;
+ switch(c) {
+ case GR_Graphics::CLR3D_Background:
+ context = m_styleBg;
+--- a/src/wp/ap/xp/ap_Dialog_Spell.cpp
++++ b/src/wp/ap/xp/ap_Dialog_Spell.cpp
+@@ -251,7 +251,7 @@
+ UT_return_val_if_fail (m_Suggestions, false);
+
+ // get suggestions from spelling engine
+- const UT_GenericVector<UT_UCSChar*> *cpvEngineSuggestions = nullptr;
++ const UT_GenericVector<UT_UCSChar*> *cpvEngineSuggestions = NULL;
+
+ if (checker->checkWord(m_pWord, m_iWordLength) == SpellChecker::LOOKUP_FAILED)
+ {
diff --git a/packages/app-office/abiword/files/cec2fda355b67b5b814a803c5ed128c425cbb030.patch b/packages/app-office/abiword/files/cec2fda355b67b5b814a803c5ed128c425cbb030.patch
new file mode 100644
index 0000000..a4678c9
--- /dev/null
+++ b/packages/app-office/abiword/files/cec2fda355b67b5b814a803c5ed128c425cbb030.patch
@@ -0,0 +1,56 @@
+Source/Upstream: git master
+
+From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
+From: Hubert Figuiere <hub@figuiere.net>
+Date: Thu, 8 Dec 2016 02:03:10 +0000
+Subject: [PATCH] Bug 13815 - draw event should return TRUE
+
+This fix the black drawing regression with Gtk3.22
+
+git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
+---
+ src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
+ src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+index 780000e..10f8e00 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
+ }
+
+ #if GTK_CHECK_VERSION(3,0,0)
+-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+ #else
+-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
++gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ #endif
+ {
+ XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
+@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+ pView->draw(&rClip);
+ #endif
+ }
+- return FALSE;
++ return TRUE;
+ }
+
+ static bool bScrollWait = false;
+diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
+index 30ee5d8..a0ff57f 100644
+--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
+@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
+ static gint key_release_event(GtkWidget* w, GdkEventKey* e);
+ static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
+ #if GTK_CHECK_VERSION(3,0,0)
+- static gint draw(GtkWidget * w, cairo_t * cr);
++ static gboolean draw(GtkWidget * w, cairo_t * cr);
+ #else
+- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
++ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+ #endif
+ static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
+ static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);