abiword: fix gcc6 build
This commit is contained in:
parent
ac8c92434d
commit
9d59b5164c
2 changed files with 26 additions and 1 deletions
25
srcpkgs/abiword/patches/fix-gcc6-string_literal.patch
Normal file
25
srcpkgs/abiword/patches/fix-gcc6-string_literal.patch
Normal file
|
@ -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 += "\""; \
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'abiword'
|
# Template file for 'abiword'
|
||||||
pkgname=abiword
|
pkgname=abiword
|
||||||
version=3.0.1
|
version=3.0.1
|
||||||
revision=5
|
revision=6
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-plugins --enable-clipart --enable-templates"
|
configure_args="--enable-plugins --enable-clipart --enable-templates"
|
||||||
hostmakedepends="automake libtool flex pkg-config"
|
hostmakedepends="automake libtool flex pkg-config"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue