summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/aspell
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2019-08-08 17:07:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-12 16:23:57 +0100
commit2cf7d0f0b357ba842d015df0c93e0733bad11f96 (patch)
tree27b4425a5b43b756c4ce8be49d57bd5b3dc13972 /meta/recipes-support/aspell
parente8cca73c92ebf046d103dec0811afeff157197e0 (diff)
downloadpoky-2cf7d0f0b357ba842d015df0c93e0733bad11f96.tar.gz
aspell: update to 0.60.7
Removed patch was upstreamed. (From OE-Core rev: 78189e465f5b7afa756fe20de024c83b3d5ea9a5) 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/aspell')
-rw-r--r--meta/recipes-support/aspell/aspell/gcc7.patch40
-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 @@
1From 8089fa02122fed0a6394eba14bbedcb1d18e2384 Mon Sep 17 00:00:00 2001
2From: Kevin Atkinson <kevina@gnu.org>
3Date: Thu, 29 Dec 2016 00:50:31 -0500
4Subject: [PATCH] Compile Fixes for GCC 7.
5
6Closes #519.
7---
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Upstream-Status: Backport
10
11 modules/filter/tex.cpp | 2 +-
12 prog/check_funs.cpp | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp
16index a979539..19ab63c 100644
17--- a/modules/filter/tex.cpp
18+++ b/modules/filter/tex.cpp
19@@ -174,7 +174,7 @@ namespace {
20
21 if (c == '{') {
22
23- if (top.in_what == Parm || top.in_what == Opt || top.do_check == '\0')
24+ if (top.in_what == Parm || top.in_what == Opt || *top.do_check == '\0')
25 push_command(Parm);
26
27 top.in_what = Parm;
28diff --git a/prog/check_funs.cpp b/prog/check_funs.cpp
29index db54f3d..89ee09d 100644
30--- a/prog/check_funs.cpp
31+++ b/prog/check_funs.cpp
32@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * word, int width) {
33 }
34 }
35 if (i == width-1) {
36- if (word == '\0')
37+ if (*word == '\0')
38 put(out,' ');
39 else if (word[len] == '\0')
40 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"
6 6
7PR = "r1" 7PR = "r1"
8 8
9SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \ 9SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz"
10 file://gcc7.patch \ 10SRC_URI[md5sum] = "8ef2252609c511cd2bb26f3a3932ef28"
11 " 11SRC_URI[sha256sum] = "5ca8fc8cb0370cc6c9eb5b64c6d1bc5d57b3750dbf17887726c3407d833b70e4"
12SRC_URI[md5sum] = "e66a9c9af6a60dc46134fdacf6ce97d7"
13SRC_URI[sha256sum] = "f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1"
14 12
15PACKAGECONFIG ??= "" 13PACKAGECONFIG ??= ""
16PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" 14PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses"