Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=d62434bedb5c5bc47d32bebe6b4144f42584d4de
commit d62434bedb5c5bc47d32bebe6b4144f42584d4de Author: crazy <[email protected]> Date: Sun Jan 28 13:57:27 2018 +0100 aspell-0.60.6.1-5-x86_64 * rebuild with tc * added gcc7 patch diff --git a/source/apps/aspell/FrugalBuild b/source/apps/aspell/FrugalBuild index bf55c92..bae901f 100644 --- a/source/apps/aspell/FrugalBuild +++ b/source/apps/aspell/FrugalBuild @@ -3,16 +3,18 @@ pkgname=aspell pkgver=0.60.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="A spell checker designed to eventually replace Ispell" url="http://aspell.net/"; -depends=('libstdc++>=6.2.1-5' 'ncurses>=6.0-12') +depends=('libstdc++>=7.3.0-4' 'ncurses>=6.0-18') groups=('apps') archs=("x86_64") up2date="Flasttar $url" -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz aspell.conf) +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz + aspell.conf aspell-0.60.6.1-gcc7-fixes.patch) sha1sums=('ff1190db8de279f950c242c6f4c5d5cdc2cbdc49' \ - '0121a76aa0c70aac82defe8e891f251a99742255') + '0121a76aa0c70aac82defe8e891f251a99742255' \ + 'b3eef4ccb69552daad5c92cc7ed797e6825d8ce4') backup=(etc/aspell/aspell.conf) _F_archive_grepv="201\|rc" diff --git a/source/apps/aspell/aspell-0.60.6.1-gcc7-fixes.patch b/source/apps/aspell/aspell-0.60.6.1-gcc7-fixes.patch new file mode 100644 index 0000000..4eb825a --- /dev/null +++ b/source/apps/aspell/aspell-0.60.6.1-gcc7-fixes.patch @@ -0,0 +1,34 @@ +commit 8089fa02122fed0a6394eba14bbedcb1d18e2384 +Author: Kevin Atkinson <[email protected]> +Date: Thu Dec 29 00:50:31 2016 -0500 + + Compile Fixes for GCC 7. + + Closes #519. + +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); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
