diff options
| author | tmpfile <tmpfile@users.noreply.github.com> | 2017-05-13 20:19:04 -0300 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-05-16 19:03:03 +0200 |
| commit | a33b0cf2b427883ac19f3b15bc1767db5358026c (patch) | |
| tree | 6ef8c3929b747d9f9c57b3f1b8f8ab48fe7a0b41 /main/abiword/fix-nullptr-c++98.patch | |
| parent | 4d99d3345494ecdd59b7706ce697632e7b1eefa9 (diff) | |
| download | aports-a33b0cf2b427883ac19f3b15bc1767db5358026c.tar.bz2 aports-a33b0cf2b427883ac19f3b15bc1767db5358026c.tar.xz | |
main/abiword: upgrade to 3.0.2 and modernize abuild
Diffstat (limited to 'main/abiword/fix-nullptr-c++98.patch')
| -rw-r--r-- | main/abiword/fix-nullptr-c++98.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/main/abiword/fix-nullptr-c++98.patch b/main/abiword/fix-nullptr-c++98.patch new file mode 100644 index 0000000000..f09319693f --- /dev/null +++ b/main/abiword/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) + { |