commit: 12776b3b9276b01f3e8e6d3157157177fce8f17c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 09:34:40 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 09:38:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12776b3b
app-office/abiword: Replace 'nullptr' by 'NULL'
Gentoo-bug: 599618
Package-Manager: portage-2.3.2
app-office/abiword/abiword-3.0.2.ebuild | 1 +
.../files/abiword-3.0.2-fix-nullptr-c++98.patch | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/app-office/abiword/abiword-3.0.2.ebuild
b/app-office/abiword/abiword-3.0.2.ebuild
index f84d0cd..346ca4a 100644
--- a/app-office/abiword/abiword-3.0.2.ebuild
+++ b/app-office/abiword/abiword-3.0.2.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.1-libwps-0.4.patch
"${FILESDIR}"/${PN}-3.0.1-fixwps.patch
"${FILESDIR}"/${PN}-3.0.2-fix-installing-readme.patch
+ "${FILESDIR}"/${PN}-3.0.2-fix-nullptr-c++98.patch
)
src_prepare() {
diff --git a/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
b/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
new file mode 100644
index 00000000..f093196
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.2-fix-nullptr-c++98.patch
@@ -0,0 +1,34 @@
+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)
+ {
