diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-12-25 12:33:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-12-25 12:33:46 +0000 |
| commit | 318ad331e239e410b199e29c82e3f412a1b5a1b8 (patch) | |
| tree | 5a0df46daa6143420fddf71fe60b6bb2bf0b61d9 /community/abiword/fix-nullptr-c++98.patch | |
| parent | 50ecbf794e52b2cb2ed1ba07b83a11c80352a5bf (diff) | |
| download | aports-318ad331e239e410b199e29c82e3f412a1b5a1b8.tar.bz2 aports-318ad331e239e410b199e29c82e3f412a1b5a1b8.tar.xz | |
community/{goffice,abiword,gnumeric}: move from main
Diffstat (limited to 'community/abiword/fix-nullptr-c++98.patch')
| -rw-r--r-- | community/abiword/fix-nullptr-c++98.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/community/abiword/fix-nullptr-c++98.patch b/community/abiword/fix-nullptr-c++98.patch new file mode 100644 index 0000000000..f09319693f --- /dev/null +++ b/community/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) + { |