diff --git a/srcpkgs/abiword/patches/fix-gcc6-string_literal.patch b/srcpkgs/abiword/patches/fix-gcc6-string_literal.patch deleted file mode 100644 index 88cad3ecd0e..00000000000 --- a/srcpkgs/abiword/patches/fix-gcc6-string_literal.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 07f4d0a9d5b..5027a315977 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -1,7 +1,7 @@ # Template file for 'abiword' pkgname=abiword -version=3.0.1 -revision=7 +version=3.0.2 +revision=1 build_style=gnu-configure configure_args="--enable-plugins --enable-clipart --enable-templates" hostmakedepends="automake libtool flex pkg-config" @@ -15,7 +15,9 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>" license="GPL-3" homepage="http://www.abisource.com/" distfiles="${homepage}/downloads/${pkgname}/${version}/source/${pkgname}-${version}.tar.gz" -checksum=e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6 +checksum=afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522 + +CXXFLAGS="-std=c++11" libabiword_package() { short_desc+=" - Runtime library"