diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-05-24 09:13:09 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-05-24 09:13:09 +0000 |
commit | c8454062200832e3230c381fbc7d753e286081c7 (patch) | |
tree | e25922e5e7299237c424082bccf0613238bf73c3 | |
parent | 872c1e3261d4df7de881c3ec985d624eb9a1c0a1 (diff) | |
download | pkgsrc-c8454062200832e3230c381fbc7d753e286081c7.tar.gz |
Pointer fixes, found by GCC 7.1
-rw-r--r-- | textproc/aspell/distinfo | 5 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-ac | 25 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-modules_filter_tex.cpp | 15 |
3 files changed, 35 insertions, 10 deletions
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index 3199d90f722..ca6bcc1b3ff 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.28 2015/11/04 01:59:18 agc Exp $ +$NetBSD: distinfo,v 1.29 2017/05/24 09:13:09 jperkin Exp $ SHA1 (aspell-0.60.6.1.tar.gz) = ff1190db8de279f950c242c6f4c5d5cdc2cbdc49 RMD160 (aspell-0.60.6.1.tar.gz) = 6d4e29228e5c47cd4dbd780a73dbc1d2222e8266 SHA512 (aspell-0.60.6.1.tar.gz) = f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f Size (aspell-0.60.6.1.tar.gz) = 1878163 bytes SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f -SHA1 (patch-ac) = 8adbd2b330830ba0fb3fc063bee0fac69b0a1f64 +SHA1 (patch-ac) = e483c9aa23472734d3ccb9611f6f49fb576f6fc1 SHA1 (patch-ad) = 5e525ed1e91b3271567f4255729e94159be86f58 SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836 SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138 @@ -13,5 +13,6 @@ SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0 SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626 SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5 SHA1 (patch-interfaces_cc_aspell.h) = f824d0bb1e3c55faaf6ecae10b44169d91b41517 +SHA1 (patch-modules_filter_tex.cpp) = f10257c4c62efe39e15bbcd3dd2ee0b2744733f8 SHA1 (patch-prog_aspell.cpp) = 5caf4556a48db8219e95d1ec0034efc81c4f7e34 SHA1 (patch-prog_checker__string.hpp) = b070e776a0998f17e4ff30cd004179585f70f3df diff --git a/textproc/aspell/patches/patch-ac b/textproc/aspell/patches/patch-ac index c92d59f8492..070b51816a7 100644 --- a/textproc/aspell/patches/patch-ac +++ b/textproc/aspell/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ +$NetBSD: patch-ac,v 1.7 2017/05/24 09:13:09 jperkin Exp $ ---- prog/check_funs.cpp.orig 2005-06-19 14:25:01.000000000 +0200 -+++ prog/check_funs.cpp 2006-09-18 21:46:40.000000000 +0200 +--- prog/check_funs.cpp.orig 2011-07-04 09:17:27.000000000 +0000 ++++ prog/check_funs.cpp @@ -28,6 +28,12 @@ #include <signal.h> @@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ #include "asc_ctype.hpp" #include "check_funs.hpp" #include "convert.hpp" -@@ -174,8 +180,8 @@ +@@ -174,8 +180,8 @@ static void suspend_handler(int) { static void continue_handler(int) { restore_state(); @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ last_signal = 0; } -@@ -191,7 +197,7 @@ +@@ -191,7 +197,7 @@ static void resize() { static void suspend() { save_state(); @@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ raise(SIGTSTP); last_signal = 0; } -@@ -200,7 +206,7 @@ +@@ -200,7 +206,7 @@ static inline void handle_last_signal() switch (last_signal) { case SIGWINCH: resize(); @@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ break; case SIGTSTP: suspend(); -@@ -216,7 +222,8 @@ +@@ -216,7 +222,8 @@ static void layout_screen() { choice_w = 0; nonl(); noecho(); @@ -54,7 +54,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ keypad(stdscr, true); clear(); int height, width; -@@ -272,9 +279,9 @@ +@@ -272,9 +279,9 @@ void begin_check() { } } if (use_curses) { @@ -67,3 +67,12 @@ $NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $ } #endif if (use_curses) { +@@ -647,7 +654,7 @@ static void print_truncate(FILE * out, c + } + } + if (i == width-1) { +- if (word == '\0') ++ if (*word == '\0') + put(out,' '); + else if (word[len] == '\0') + put(out, word, len); diff --git a/textproc/aspell/patches/patch-modules_filter_tex.cpp b/textproc/aspell/patches/patch-modules_filter_tex.cpp new file mode 100644 index 00000000000..20797013345 --- /dev/null +++ b/textproc/aspell/patches/patch-modules_filter_tex.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-modules_filter_tex.cpp,v 1.1 2017/05/24 09:13:09 jperkin Exp $ + +Pointer fixes. + +--- modules/filter/tex.cpp.orig 2011-07-02 21:09:09.000000000 +0000 ++++ 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; |