abiword-plugins: fix build with GCC6. From upstream.

PR pkg/53412

5 files changed, 71 insertions, 1 deletions

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index c37c871d113..4f0f5abb2f5 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2018/04/25 05:53:53 markd Exp $
+$NetBSD: distinfo,v 1.74 2018/06/30 12:43:28 maya Exp $
 
 SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
 RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
@@ -7,11 +7,14 @@ Size (abiword-3.0.1.tar.gz) = 11144990 bytes
 SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7
 SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
 SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
+SHA1 (patch-plugins_collab_backends_service_xp_RealmProtocol.cpp) = 8b46d71b4ebb23aa4720e6d2d544004e178c1f2f
+SHA1 (patch-plugins_collab_backends_service_xp_soa__soup.cpp) = 219532cffebd67a9ed2e62fd318ccfb7eee57036
 SHA1 (patch-plugins_collab_backends_service_xp_tls__tunnel.cpp) = f8eed4520951653822c6de8da371c8cb42dcbc89
 SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
 SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
 SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445
 SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
+SHA1 (patch-plugins_latex_xp_ie__exp__LaTeX.cpp) = bffa5e143147214af4baf8bf778123ca7223a8eb
 SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee
 SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
 SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
@@ -22,6 +25,7 @@ SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1c
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
 SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
+SHA1 (patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp) = 8dfb1c643d70ff1813fd3d9eaa71074e8954975a
 SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4
 SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
diff --git a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp
new file mode 100644
index 00000000000..b864d847ebe
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_RealmProtocol.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-plugins_collab_backends_service_xp_RealmProtocol.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $
+
+Bug 13754 - Fix build on gcc-6 (default to C++11)
+https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130
+
+--- plugins/collab/backends/service/xp/RealmProtocol.cpp.orig	2009-05-27 05:41:59.000000000 +0000
++++ plugins/collab/backends/service/xp/RealmProtocol.cpp
+@@ -6,8 +6,8 @@ namespace protocolv1 {
+ 
+ #define MAX_PACKET_DATA_SIZE 64*1024*1024
+ 		
+-#define RPV1_PACKET_NONEXISTENT -2
+-#define RPV1_PACKET_VARIABLE -1
++#define RPV1_PACKET_NONEXISTENT uint32_t(-2)
++#define RPV1_PACKET_VARIABLE uint32_t(-1)
+ 	
+ static uint32_t body_size[6] = {
+ 	RPV1_PACKET_NONEXISTENT, /* 0: reserved */
diff --git a/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp
new file mode 100644
index 00000000000..45fd11228cf
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_collab_backends_service_xp_soa__soup.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_collab_backends_service_xp_soa__soup.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $
+
+Bug 13754 - Fix build on gcc-6 (default to C++11).
+https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130
+
+--- plugins/collab/backends/service/xp/soa_soup.cpp.orig	2009-09-29 13:58:11.000000000 +0000
++++ plugins/collab/backends/service/xp/soa_soup.cpp
+@@ -163,7 +163,7 @@ namespace soup_soa {
+ 	
+ 	static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) {
+ 		if (!sess.m_session || !sess.m_msg )
+-			return soa::GenericPtr();
++			return false;
+ 
+ 		guint status = soup_session_send_message (sess.m_session, sess.m_msg);
+ 		if (!(SOUP_STATUS_IS_SUCCESSFUL (status) ||
diff --git a/editors/abiword/patches/patch-plugins_latex_xp_ie__exp__LaTeX.cpp b/editors/abiword/patches/patch-plugins_latex_xp_ie__exp__LaTeX.cpp
new file mode 100644
index 00000000000..c2565e2886a
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_latex_xp_ie__exp__LaTeX.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_latex_xp_ie__exp__LaTeX.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $
+
+Bug 13754 - Fix build on gcc-6 (default to C++11)
+https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130
+
+--- plugins/latex/xp/ie_exp_LaTeX.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/latex/xp/ie_exp_LaTeX.cpp
+@@ -1329,7 +1329,7 @@ void s_LaTeX_Listener::_outputData(const
+ 	m_pie->write(sBuf.c_str(),sBuf.size());
+ }
+ 
+-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true;
++#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true;
+ #define SUBd(a,who) case a: subst = who; return true;
+ static bool _convertLettersToSymbols(char c, const char *& subst)
+ {
diff --git a/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp b/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp
new file mode 100644
index 00000000000..34077b43a57
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_xslfo_xp_ie__exp__XSL-FO.cpp,v 1.1 2018/06/30 12:43:29 maya Exp $
+
+Bug 13754 - Fix build on gcc-6 (default to C++11)
+https://github.com/AbiWord/abiword/commit/a83e6f50dbd5efa16fb39efe32b9de370f103130
+
+--- plugins/xslfo/xp/ie_exp_XSL-FO.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp
+@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_
+ 	{ \
+ 		UT_UTF8String esc = szValue; \
+ 		esc.escapeXML(); \
+-		buf += " "x"=\""; \
++		buf += " " x"=\""; \
+ 		buf += esc.utf8_str(); \
+ 		buf += "\""; \
+ 	}