From 29107c3f46e1d011102ee8ef23ec5bcf951a53da Mon Sep 17 00:00:00 2001 From: Peter Kosyh Date: Sat, 27 Oct 2018 17:18:57 +0300 Subject: [PATCH] aspell: build for gcc7, filters fix (#3277) --- app-text/aspell/aspell-0.60.6.1.recipe | 11 +++--- .../aspell/patches/aspell-0.60.6.1.patchset | 35 +++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 app-text/aspell/patches/aspell-0.60.6.1.patchset diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe index d67a03488..3fd344369 100644 --- a/app-text/aspell/aspell-0.60.6.1.recipe +++ b/app-text/aspell/aspell-0.60.6.1.recipe @@ -9,12 +9,14 @@ dictionary. Aspell will also do its best to respect the current locale \ setting. Other advantages over Ispell include support for using multiple \ dictionaries at once and intelligently handling personal dictionaries when \ more than one Aspell process is open at once." -HOMEPAGE="http://aspell.net" +HOMEPAGE="http://aspell.net/" COPYRIGHT="2000-2006 Kevin Atkinson" LICENSE="GNU LGPL v2" -REVISION="3" -SOURCE_URI="ftp://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz" +REVISION="4" +SOURCE_URI="https://ftpmirror.gnu.org/aspell/aspell-$portVersion.tar.gz + https://ftp.gnu.org/gnu/aspell/aspell-$portVersion.tar.gz" CHECKSUM_SHA256="f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" +PATCHES="aspell-$portVersion.patchset" ARCHITECTURES="x86 x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -71,8 +73,9 @@ BUILD() libtoolize --force --copy --install aclocal -I m4 autoconf - automake + automake --add-missing runConfigure ./configure \ + --enable-compile-in-filters \ --enable-dict-dir=$dataDir/aspell-0.60 make } diff --git a/app-text/aspell/patches/aspell-0.60.6.1.patchset b/app-text/aspell/patches/aspell-0.60.6.1.patchset new file mode 100644 index 000000000..8f91d8f63 --- /dev/null +++ b/app-text/aspell/patches/aspell-0.60.6.1.patchset @@ -0,0 +1,35 @@ +From c09a03b927daa852d0f89f6577318716a6f75b42 Mon Sep 17 00:00:00 2001 +From: Peter Kosyh +Date: Sat, 27 Oct 2018 08:25:00 +0300 +Subject: gcc7 compilation fix + + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index a979539..19ab63c 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -174,7 +174,7 @@ namespace { + + if (c == '{') { + +- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0') ++ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0') + push_command(Parm); + + top.in_what = Parm; +diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp +index db54f3d..89ee09d 100644 +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) { + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); +-- +2.19.1 +