cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with clang 6, from upstream.

Browse Source
This commit is contained in:
naddy 2018-04-07 22:50:15 +00:00
parent e42bfe6570
commit 1fe5e104de
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/aspell/core/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.40 2017/07/26 22:45:30 sthen Exp $
# $OpenBSD: Makefile,v 1.41 2018/04/07 22:50:15 naddy Exp $
COMMENT= spell checker designed to eventually replace Ispell
DISTNAME= aspell-0.60.6.1
REVISION= 5
REVISION= 6
SHARED_LIBS += aspell 17.0 # .16.4
SHARED_LIBS += pspell 17.0 # .16.4
DIST_SUBDIR= aspell

17
textproc/aspell/core/patches/patch-modules_filter_tex_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-modules_filter_tex_cpp,v 1.1 2018/04/07 22:50:15 naddy Exp $
Fix compilation with clang 6.
https://git.savannah.gnu.org/cgit/aspell.git/patch/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384
Index: modules/filter/tex.cpp
--- modules/filter/tex.cpp.orig
+++ 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;

17
textproc/aspell/core/patches/patch-prog_check_funs_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-prog_check_funs_cpp,v 1.1 2018/04/07 22:50:15 naddy Exp $
Fix compilation with clang 6.
https://git.savannah.gnu.org/cgit/aspell.git/patch/?id=8089fa02122fed0a6394eba14bbedcb1d18e2384
Index: prog/check_funs.cpp
--- prog/check_funs.cpp.orig
+++ prog/check_funs.cpp
@@ -647,7 +647,7 @@ static void print_truncate(FILE * out, const char * wo
}
}
if (i == width-1) {
- if (word == '\0')
+ if (*word == '\0')
put(out,' ');
else if (word[len] == '\0')
put(out, word, len);