From 9d59b5164cf00790e5e1faf870c41fc7c4314df7 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Sun, 18 Sep 2016 16:21:52 +0200 Subject: [PATCH] abiword: fix gcc6 build --- .../patches/fix-gcc6-string_literal.patch | 25 +++++++++++++++++++ srcpkgs/abiword/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/abiword/patches/fix-gcc6-string_literal.patch diff --git a/srcpkgs/abiword/patches/fix-gcc6-string_literal.patch b/srcpkgs/abiword/patches/fix-gcc6-string_literal.patch new file mode 100644 index 00000000000..88cad3ecd0e --- /dev/null +++ b/srcpkgs/abiword/patches/fix-gcc6-string_literal.patch @@ -0,0 +1,25 @@ +For gcc6 a string literal must be separated from a macro variable +by at least one space. + +--- plugins/latex/xp/ie_exp_LaTeX.cpp 2013-04-07 15:53:03.000000000 +0200 ++++ plugins/latex/xp/ie_exp_LaTeX.cpp 2016-09-18 16:09:08.087076449 +0200 +@@ -1329,7 +1329,7 @@ + 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) + { +--- plugins/xslfo/xp/ie_exp_XSL-FO.cpp 2013-04-07 15:53:03.000000000 +0200 ++++ plugins/xslfo/xp/ie_exp_XSL-FO.cpp 2016-09-18 16:13:55.980997056 +0200 +@@ -1451,7 +1451,7 @@ + { \ + UT_UTF8String esc = szValue; \ + esc.escapeXML(); \ +- buf += " "x"=\""; \ ++ buf += " " x "=\""; \ + buf += esc.utf8_str(); \ + buf += "\""; \ + } diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template index aed6453d305..42cb4c7745d 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -1,7 +1,7 @@ # Template file for 'abiword' pkgname=abiword version=3.0.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-plugins --enable-clipart --enable-templates" hostmakedepends="automake libtool flex pkg-config"