diff options
| author |   Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-08-08 17:07:47 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-12 16:23:52 +0100 |
| commit | 78189e465f5b7afa756fe20de024c83b3d5ea9a5 (patch) | |
| tree | 7ce81468c39e5650dd05249f771d97743459d196 /meta/recipes-support | |
| parent | 50048ff2da2cc209fe6bf1452dc2cf2a545fe886 (diff) | |
| download | openembedded-core-contrib-78189e465f5b7afa756fe20de024c83b3d5ea9a5.tar.gz | |
aspell: update to 0.60.7
Removed patch was upstreamed.
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/aspell/aspell/gcc7.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-support/aspell/aspell_0.60.7.bb (renamed from meta/recipes-support/aspell/aspell_0.60.6.1.bb) | 8 |
2 files changed, 3 insertions, 45 deletions
diff --git a/meta/recipes-support/aspell/aspell/gcc7.patch b/meta/recipes-support/aspell/aspell/gcc7.patch deleted file mode 100644 index 6ffd0772fa..0000000000 --- a/meta/recipes-support/aspell/aspell/gcc7.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001 -From: Kevin Atkinson <kevina@gnu.org> -Date: Thu, 29 Dec 2016 00:50:31 -0500 -Subject: [PATCH] Compile Fixes for GCC 7. - -Closes #519. ---- -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Backport - - modules/filter/tex.cpp | 2 +- - prog/check_funs.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -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); diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.7.bb index 161bb5ce20..da99d12630 100644 --- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/meta/recipes-support/aspell/aspell_0.60.7.bb @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" PR = "r1" -SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ - file://gcc7.patch \ - " -SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7" -SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI[md5sum] = "8ef2252609c511cd2bb26f3a3932ef28" +SRC_URI[sha256sum] = "5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4" PACKAGECONFIG ??= "" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" |