commit a8317b2a9119c56365b644e4473ae2350ef48433 · pyrox.dev/nixpkgs

+1 -21

pkgs/tools/text/ispell/default.nix

··· 6 6 7 7 src = fetchurl { 8 8 url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz"; 9 - sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz"; 9 + sha256 = "1hmfnz55qzfpz7lz0r3m4kkv31smir92ks9s5l1iiwimhr2jxi2x"; 10 10 }; 11 11 12 12 buildInputs = [ bison ncurses ]; 13 13 14 - patches = [ 15 - ./patches/0007-Use-termios.patch 16 - ./patches/0008-Tex-backslash.patch 17 - ./patches/0009-Fix-FTBFS-on-glibc.patch 18 - ./patches/0011-Missing-prototypes.patch 19 - ./patches/0012-Fix-getline.patch 20 - ./patches/0013-Fix-man-pages.patch 21 - ./patches/0021-Fix-gcc-warnings.patch 22 - ./patches/0023-Exclusive-options.patch 23 - ./patches/0024-Check-tempdir-creation.patch 24 - ./patches/0025-Languages.patch 25 - ./patches/0030-Display-whole-multibyte-character.patch 26 - ]; 27 - 28 14 postPatch = '' 29 15 cat >> local.h <<EOF 30 16 ${lib.optionalString (!stdenv.isDarwin) "#define USG"} ··· 41 27 #define MINIMENU 42 28 #define HAS_RENAME 43 29 EOF 44 - ''; 45 - 46 - preBuild = '' 47 - for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do 48 - mkdir -p $dir 49 - done 50 30 ''; 51 31 52 32 meta = with lib; {

-188

pkgs/tools/text/ispell/patches/0007-Use-termios.patch

··· 1 - From: Torsten Landschoff <t.landschoff@gmx.net> 2 - Date: Tue, 30 Mar 1999 21:05:09 +0100 3 - Subject: 0007 Use termios 4 - 5 - Use termios instead of termio (Closes: #35288). 6 - 7 - Patch updated on Mon, 07 Mar 2011 20:40:53 +0100 based on 8 - ispell-3.3.02-terminal.patch from ispell-3.3.02-102.1.src.rpm 9 - --- 10 - term.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 11 - 1 files changed, 58 insertions(+), 0 deletions(-) 12 - 13 - diff --git a/term.c b/term.c 14 - index 4923844..47c1aa0 100644 15 - --- a/term.c 16 - +++ b/term.c 17 - @@ -87,13 +87,22 @@ static char Rcs_Id[] = 18 - #include "proto.h" 19 - #include "msgs.h" 20 - #ifdef USG 21 - +#if defined(__GLIBC__) && __GLIBC__ >= 2 22 - +/* Use termios under at least glibc */ 23 - + #include <termios.h> 24 - + #define USE_TERMIOS 25 - +#else 26 - #include <termio.h> 27 - +#endif 28 - #else 29 - #ifndef __DJGPP__ 30 - #include <sgtty.h> 31 - #endif 32 - #endif 33 - #include <signal.h> 34 - +#include <unistd.h> 35 - +#include <sys/types.h> 36 - +#include <sys/wait.h> 37 - 38 - void ierase P ((void)); 39 - void imove P ((int row, int col)); 40 - @@ -166,8 +175,13 @@ static int iputch (c) 41 - } 42 - 43 - #ifdef USG 44 - +#ifdef USE_TERMIOS 45 - +static struct termios sbuf; 46 - +static struct termios osbuf; 47 - +#else 48 - static struct termio sbuf; 49 - static struct termio osbuf; 50 - +#endif 51 - #else 52 - static struct sgttyb sbuf; 53 - static struct sgttyb osbuf; 54 - @@ -190,9 +204,13 @@ void terminit () 55 - int tpgrp; 56 - #else 57 - #ifdef TIOCGPGRP 58 - +#ifdef USE_TERMIOS 59 - + pid_t tpgrp; 60 - +#else 61 - int tpgrp; 62 - #endif 63 - #endif 64 - +#endif 65 - #ifdef TIOCGWINSZ 66 - struct winsize wsize; 67 - #endif /* TIOCGWINSZ */ 68 - @@ -276,7 +294,11 @@ retry: 69 - (void) fprintf (stderr, TERM_C_NO_BATCH); 70 - exit (1); 71 - } 72 - +#ifdef USE_TERMIOS 73 - + (void) tcgetattr (0, &osbuf); 74 - +#else 75 - (void) ioctl (0, TCGETA, (char *) &osbuf); 76 - +#endif 77 - termchanged = 1; 78 - 79 - sbuf = osbuf; 80 - @@ -285,7 +307,11 @@ retry: 81 - sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL); 82 - sbuf.c_cc[VMIN] = 1; 83 - sbuf.c_cc[VTIME] = 1; 84 - +#ifdef USE_TERMIOS 85 - + (void) tcsetattr (0, TCSADRAIN, &sbuf); 86 - +#else 87 - (void) ioctl (0, TCSETAW, (char *) &sbuf); 88 - +#endif 89 - 90 - uerasechar = osbuf.c_cc[VERASE]; 91 - ukillchar = osbuf.c_cc[VKILL]; 92 - @@ -298,7 +324,11 @@ retry: 93 - #endif 94 - #endif 95 - #ifdef TIOCGPGRP 96 - +#ifdef USE_TERMIOS 97 - + if ((tpgrp = tcgetpgrp (0)) == -1) 98 - +#else 99 - if (ioctl (0, TIOCGPGRP, (char *) &tpgrp) != 0) 100 - +#endif 101 - { 102 - (void) fprintf (stderr, TERM_C_NO_BATCH); 103 - exit (1); 104 - @@ -373,7 +403,11 @@ SIGNAL_TYPE done (signo) 105 - if (te) 106 - tputs (te, 1, iputch); 107 - #ifdef USG 108 - +#ifdef USE_TERMIOS 109 - + (void) tcsetattr (0, TCSADRAIN, &osbuf); 110 - +#else 111 - (void) ioctl (0, TCSETAW, (char *) &osbuf); 112 - +#endif 113 - #else 114 - (void) ioctl (0, TIOCSETP, (char *) &osbuf); 115 - #ifdef TIOCSLTC 116 - @@ -394,7 +428,11 @@ static SIGNAL_TYPE onstop (signo) 117 - if (te) 118 - tputs (te, 1, iputch); 119 - #ifdef USG 120 - +#ifdef USE_TERMIOS 121 - + (void) tcsetattr (0, TCSANOW, &osbuf); /* OpenSuse: TCSADRAIN */ 122 - +#else 123 - (void) ioctl (0, TCSETAW, (char *) &osbuf); 124 - +#endif 125 - #else 126 - (void) ioctl (0, TIOCSETP, (char *) &osbuf); 127 - #ifdef TIOCSLTC 128 - @@ -413,7 +451,11 @@ static SIGNAL_TYPE onstop (signo) 129 - if (termchanged) 130 - { 131 - #ifdef USG 132 - +#ifdef USE_TERMIOS 133 - + (void) tcsetattr (0, TCSANOW, &sbuf); 134 - +#else 135 - (void) ioctl (0, TCSETAW, (char *) &sbuf); 136 - +#endif 137 - #else 138 - (void) ioctl (0, TIOCSETP, (char *) &sbuf); 139 - #ifdef TIOCSLTC 140 - @@ -481,7 +523,11 @@ int shellescape (buf) 141 - argv[i] = NULL; 142 - 143 - #ifdef USG 144 - +#ifdef USE_TERMIOS 145 - + (void) tcsetattr (0, TCSADRAIN, &osbuf); 146 - +#else 147 - (void) ioctl (0, TCSETAW, (char *) &osbuf); 148 - +#endif 149 - #else 150 - (void) ioctl (0, TIOCSETP, (char *) &osbuf); 151 - #ifdef TIOCSLTC 152 - @@ -527,7 +573,11 @@ int shellescape (buf) 153 - #endif 154 - 155 - #ifdef USG 156 - +#ifdef USE_TERMIOS 157 - + (void) tcsetattr (0, TCSADRAIN, &sbuf); 158 - +#else 159 - (void) ioctl (0, TCSETAW, (char *) &sbuf); 160 - +#endif 161 - #else 162 - (void) ioctl (0, TIOCSETP, (char *) &sbuf); 163 - #ifdef TIOCSLTC 164 - @@ -563,7 +613,11 @@ void shescape (buf) 165 - #endif 166 - 167 - #ifdef USG 168 - +#ifdef USE_TERMIOS 169 - + (void) tcsetattr (0, TCSADRAIN, &osbuf); 170 - +#else 171 - (void) ioctl (0, TCSETAW, (char *) &osbuf); 172 - +#endif 173 - #else 174 - (void) ioctl (0, TIOCSETP, (char *) &osbuf); 175 - #ifdef TIOCSLTC 176 - @@ -611,7 +665,11 @@ void shescape (buf) 177 - #endif 178 - 179 - #ifdef USG 180 - +#ifdef USE_TERMIOS 181 - + (void) tcsetattr (0, TCSADRAIN, &sbuf); 182 - +#else 183 - (void) ioctl (0, TCSETAW, (char *) &sbuf); 184 - +#endif 185 - #else 186 - (void) ioctl (0, TIOCSETP, (char *) &sbuf); 187 - #ifdef TIOCSLTC 188 - --

-48

pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch

··· 1 - From: Ken Stevens <kstevens@ece.utah.edu> 2 - Date: Sat, 15 Jul 2000 22:10:53 -0400 3 - Subject: 0008 Tex backslash 4 - 5 - Version 3.1.20 contains an irritating bug when using latex that causes all 6 - sorts of problems when the backslash is used. (The backslash is a common 7 - character in latex that is used, among other things, to create a forced space 8 - similar to the tilde character.) In the current version, 3.1.20, the next TWO 9 - characters are skipped after a backslash. This can results in misspellings and 10 - the file being incorrectly parsed. (For example, if the text contains the 11 - sequence `\ $' math mode will not be entered until the matching $ which should 12 - end it, resulting in the body of the text not being spell checked and the math 13 - region being checked.) 14 - 15 - Make sure to undefine NO8BIT and use a larger number for MASKBITS if you are 16 - using iso character sets. 17 - 18 - http://www.kdstevens.com/~stevens/ispell-faq.html#bslash 19 - --- 20 - defmt.c | 7 +++---- 21 - 1 files changed, 3 insertions(+), 4 deletions(-) 22 - 23 - diff --git a/defmt.c b/defmt.c 24 - index 35f93e4..7499752 100644 25 - --- a/defmt.c 26 - +++ b/defmt.c 27 - @@ -884,6 +884,8 @@ static int TeX_math_end (bufp) 28 - return 0; 29 - } 30 - 31 - +/* Updates bufp to point to the next character to skip. */ 32 - +/* Should only be called on non-word characters. */ 33 - static int TeX_math_begin (bufp) 34 - unsigned char ** bufp; 35 - { 36 - @@ -902,10 +904,7 @@ static int TeX_math_begin (bufp) 37 - if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) 38 - return 1; 39 - else if (!isalpha(**bufp) && **bufp != '@') 40 - - { 41 - - (*bufp)++; 42 - - continue; 43 - - } 44 - + return 0; 45 - else if (TeX_strncmp (*bufp, "begin", 5) == 0) 46 - { 47 - if (TeX_math_check ('b', bufp)) 48 - --

-23

pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch

··· 1 - From: Richard Braakman <dark@dark.wapit.fi> 2 - Date: Fri, 2 Feb 2001 17:22:53 +0200 3 - Subject: 0009 Fix FTBFS on glibc 4 - 5 - Fix FTBFS on glibc (Closes: #75377) 6 - --- 7 - config.X | 2 +- 8 - 1 files changed, 1 insertions(+), 1 deletions(-) 9 - 10 - diff --git a/config.X b/config.X 11 - index 18bf621..0a47cb2 100644 12 - --- a/config.X 13 - +++ b/config.X 14 - @@ -531,7 +531,7 @@ 15 - #endif /* NO_MKSTEMP */ 16 - 17 - /* Aliases for some routines */ 18 - -#ifdef USG 19 - +#if defined (USG) && !defined(__GLIBC__) 20 - #define BCOPY(s, d, n) memcpy (d, s, n) 21 - #define BZERO(d, n) memset (d, 0, n) 22 - #define index strchr 23 - --

-84

pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch

··· 1 - From: Doug Porter <dsp@debian.org> 2 - Date: Tue, 22 Jan 2002 10:28:44 -0500 3 - Subject: 0011 Missing prototypes 4 - 5 - Fixing implicit declarations (Closes: #130405). 6 - --- 7 - correct.c | 1 + 8 - ijoin.c | 2 +- 9 - ispell.c | 2 ++ 10 - lookup.c | 2 ++ 11 - tree.c | 1 + 12 - 5 files changed, 7 insertions(+), 1 deletions(-) 13 - 14 - diff --git a/correct.c b/correct.c 15 - index e2b63c8..661bf57 100644 16 - --- a/correct.c 17 - +++ b/correct.c 18 - @@ -201,6 +201,7 @@ static char Rcs_Id[] = 19 - */ 20 - 21 - #include <ctype.h> 22 - +#include <unistd.h> 23 - #include "config.h" 24 - #include "ispell.h" 25 - #include "proto.h" 26 - diff --git a/ijoin.c b/ijoin.c 27 - index edb18d1..5da039a 100644 28 - --- a/ijoin.c 29 - +++ b/ijoin.c 30 - @@ -115,6 +115,7 @@ static char Rcs_Id[] = 31 - */ 32 - 33 - #include <stdio.h> 34 - +#include <string.h> 35 - #include "config.h" 36 - #include "ispell.h" 37 - #include "proto.h" 38 - @@ -169,7 +170,6 @@ static char * tabchar = " \t"; /* Field separator character(s) */ 39 - static int unpairable1 = 0; /* NZ if -a1 */ 40 - static int unpairable2 = 0; /* NZ if -a2 */ 41 - 42 - -extern int strcmp (); 43 - 44 - int main (argc, argv) /* Join files */ 45 - int argc; /* Argument count */ 46 - diff --git a/ispell.c b/ispell.c 47 - index 9b509d0..59fe358 100644 48 - --- a/ispell.c 49 - +++ b/ispell.c 50 - @@ -235,6 +235,8 @@ static char Rcs_Id[] = 51 - #include <fcntl.h> 52 - #endif /* NO_FCNTL_H */ 53 - #include <sys/stat.h> 54 - +#include <ctype.h> 55 - +#include <unistd.h> 56 - 57 - static void usage P ((void)); 58 - int main P ((int argc, char * argv[])); 59 - diff --git a/lookup.c b/lookup.c 60 - index 648f9c8..8bf1f6c 100644 61 - --- a/lookup.c 62 - +++ b/lookup.c 63 - @@ -87,6 +87,8 @@ static char Rcs_Id[] = 64 - 65 - #include <fcntl.h> 66 - 67 - +#include <sys/types.h> 68 - +#include <unistd.h> 69 - #include "config.h" 70 - #include "ispell.h" 71 - #include "proto.h" 72 - diff --git a/tree.c b/tree.c 73 - index 073a6a6..c26f635 100644 74 - --- a/tree.c 75 - +++ b/tree.c 76 - @@ -94,6 +94,7 @@ static char Rcs_Id[] = 77 - 78 - #include <ctype.h> 79 - #include <errno.h> 80 - +#include <unistd.h> 81 - #include "config.h" 82 - #include "ispell.h" 83 - #include "proto.h" 84 - --

-62

pkgs/tools/text/ispell/patches/0012-Fix-getline.patch

··· 1 - From: Stefan Potyra <sistpoty@ubuntu.com> 2 - Date: Sat, 3 Oct 2009 04:00:34 +0200 3 - Subject: 0012 Fix getline 4 - 5 - getline is not provided by eglibc, avoid conflict 6 - 7 - Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549401 8 - Forwarded: no 9 - --- 10 - correct.c | 10 +++++----- 11 - 1 files changed, 5 insertions(+), 5 deletions(-) 12 - 13 - diff --git a/correct.c b/correct.c 14 - index 661bf57..ff7cb99 100644 15 - --- a/correct.c 16 - +++ b/correct.c 17 - @@ -246,7 +246,7 @@ static void save_root_cap P ((ichar_t * word, ichar_t * pattern, 18 - struct flagent * sufent, 19 - ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], 20 - int * nsaved)); 21 - -static char * getline P ((char * buf, int bufsize)); 22 - +static char * getline_ispell P ((char * buf, int bufsize)); 23 - void askmode P ((void)); 24 - void copyout P ((unsigned char ** cc, int cnt)); 25 - static void lookharder P ((unsigned char * string)); 26 - @@ -572,7 +572,7 @@ checkagain: 27 - 28 - imove (li - 1, 0); 29 - (void) putchar ('!'); 30 - - if (getline ((char *) buf, sizeof buf) == NULL) 31 - + if (getline_ispell ((char *) buf, sizeof buf) == NULL) 32 - { 33 - (void) putchar (7); 34 - ierase (); 35 - @@ -597,7 +597,7 @@ checkagain: 36 - (void) printf ("%s ", CORR_C_READONLY); 37 - } 38 - (void) printf (CORR_C_REPLACE_WITH); 39 - - if (getline ((char *) ctok, ctokl) == NULL) 40 - + if (getline_ispell ((char *) ctok, ctokl) == NULL) 41 - { 42 - (void) putchar (7); 43 - /* Put it back */ 44 - @@ -665,7 +665,7 @@ checkagain: 45 - unsigned char buf[100]; 46 - imove (li - 1, 0); 47 - (void) printf (CORR_C_LOOKUP_PROMPT); 48 - - if (getline ((char *) buf, sizeof buf) == NULL) 49 - + if (getline_ispell ((char *) buf, sizeof buf) == NULL) 50 - { 51 - (void) putchar (7); 52 - ierase (); 53 - @@ -1584,7 +1584,7 @@ static void save_root_cap (word, pattern, prestrip, preadd, sufstrip, sufadd, 54 - return; 55 - } 56 - 57 - -static char * getline (s, len) 58 - +static char * getline_ispell(s, len) 59 - register char * s; 60 - register int len; 61 - { 62 - --

-227

pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch

··· 1 - From: David Paleino <d.paleino@gmail.com> 2 - Date: Mon, 9 Nov 2009 09:22:12 +0000 3 - Subject: 0013 Fix man pages 4 - 5 - Fix man pages, manpage-has-errors-from-man and hyphen-used-as-minus-sign 6 - 7 - Forwarded: no 8 - --- 9 - ispell.1X | 26 +++++++++++++------------- 10 - ispell.5X | 26 +++++++++++++------------- 11 - 2 files changed, 26 insertions(+), 26 deletions(-) 12 - 13 - diff --git a/ispell.1X b/ispell.1X 14 - index b27b120..79894d4 100644 15 - --- a/ispell.1X 16 - +++ b/ispell.1X 17 - @@ -236,8 +236,8 @@ count affix-file 18 - .RB [ \-p | \-s] 19 - .RB [ \-c ] 20 - .I expanded-file 21 - -.IR affix [ +addition ] 22 - -... 23 - +.IR affix 24 - +.RI [ +addition ] 25 - .PP 26 - .B icombine 27 - .RB [ \-T 28 - @@ -336,7 +336,7 @@ The amount of context is subject to a system-imposed limit. 29 - If the 30 - .B \-V 31 - flag is given, characters that are not in the 7-bit ANSI printable 32 - -character set will always be displayed in the style of "cat -v", even if 33 - +character set will always be displayed in the style of "cat \-v", even if 34 - .I ispell 35 - thinks that these characters are legal ISO Latin-1 on your system. 36 - This is useful when working with older terminals. 37 - @@ -542,7 +542,7 @@ option is used to specify an alternate hashed dictionary file, 38 - other than the default. 39 - If the filename does not contain a "/", 40 - the library directory for the default dictionary file is prefixed; 41 - -thus, to use a dictionary in the local directory "-d ./xxx.hash" must 42 - +thus, to use a dictionary in the local directory "\-d ./xxx.hash" must 43 - be used. 44 - This is useful to allow dictionaries for alternate languages. 45 - Unlike previous versions of 46 - @@ -615,7 +615,7 @@ alphabetics have no meaning - alphabetics are already accepted. 47 - .I Ispell 48 - will typically be used with input from a file, meaning that preserving 49 - parity for possible 8 bit characters from the input text is OK. If you 50 - -specify the -l option, and actually type text from the terminal, this may 51 - +specify the \-l option, and actually type text from the terminal, this may 52 - create problems if your stty settings preserve parity. 53 - .PP 54 - It is not possible to use 55 - @@ -799,7 +799,7 @@ that the '&' is replaced by '?' (and the near-miss count is always zero). 56 - The suggested derivations following the near misses are in the form: 57 - .PP 58 - .RS 59 - -[prefix+] root [-prefix] [-suffix] [+suffix] 60 - +[prefix+] root [\-prefix] [\-suffix] [+suffix] 61 - .RE 62 - .PP 63 - (e.g., "re+fry-y+ies" to get "refries") 64 - @@ -841,7 +841,7 @@ These output lines can be summarized as follows: 65 - .PP 66 - For example, a dummy dictionary containing the words "fray", "Frey", 67 - "fry", and "refried" might produce the following response to the 68 - -command "echo 'frqy refries | ispell -a -m -d ./test.hash": 69 - +command "echo 'frqy refries | ispell \-a \-m \-d ./test.hash": 70 - .RS 71 - .nf 72 - (#) International Ispell Version 3.0.05 (beta), 08/10/91 73 - @@ -1036,7 +1036,7 @@ script does this. 74 - As an example, the command: 75 - .PP 76 - .RS 77 - -echo BOTHER | ispell -c 78 - +echo BOTHER | ispell \-c 79 - .RE 80 - .PP 81 - produces: 82 - @@ -1055,7 +1055,7 @@ it expands affix flags to produce a list of words. 83 - For example, the command: 84 - .PP 85 - .RS 86 - -echo BOTH/R | ispell -e 87 - +echo BOTH/R | ispell \-e 88 - .RE 89 - .PP 90 - produces: 91 - @@ -1268,7 +1268,7 @@ hash file if it were added to the language table. 92 - Only affixes that generate legal roots (found in the original input) 93 - are listed. 94 - .PP 95 - -If the "-c" option is not given, the output lines are in the 96 - +If the "\-c" option is not given, the output lines are in the 97 - following format: 98 - .IP 99 - strip/add/count/bytes 100 - @@ -1298,7 +1298,7 @@ If the 101 - the output is made visually cleaner (but harder to post-process) 102 - by changing it to: 103 - .IP 104 - --strip+add<tab>count<tab>bytes 105 - +\-strip+add<tab>count<tab>bytes 106 - .PP 107 - where 108 - .IR strip , 109 - @@ -1313,7 +1313,7 @@ represents the ASCII tab character. 110 - The method used to generate possible affixes will also generate 111 - longer affixes which have common headers or trailers. For example, 112 - the two words "moth" and "mother" will generate not only the obvious 113 - -substitution "+er" but also "-h+her" and "-th+ther" (and possibly 114 - +substitution "+er" but also "\-h+her" and "\-th+ther" (and possibly 115 - even longer ones, depending on the value of 116 - .IR min ). 117 - To prevent 118 - @@ -1621,7 +1621,7 @@ redirected. 119 - However, a lot of the temporary space needed is for sorting, so TMPDIR 120 - is only a partial help on systems with an uncooperative 121 - .IR sort (1). 122 - -("Cooperative" is defined as accepting the undocumented -T switch). 123 - +("Cooperative" is defined as accepting the undocumented \-T switch). 124 - At its peak usage, 125 - .I munchlist 126 - takes 10 to 40 times the original 127 - diff --git a/ispell.5X b/ispell.5X 128 - index ab526ed..7a1c2e5 100644 129 - --- a/ispell.5X 130 - +++ b/ispell.5X 131 - @@ -137,8 +137,8 @@ This feature can be used to convert an entire dictionary if necessary:) 132 - echo qqqqq > dummy.dict 133 - buildhash dummy.dict \fIaffix-file\fP dummy.hash 134 - awk '{print "*"}END{print "#"}' \fIold-dict-file\fP \e 135 - - | ispell -a -T \fIold-dict-string-type\fP \e 136 - - -d ./dummy.hash -p ./\fInew-dict-file\fP \e 137 - + | ispell \-a \-T \fIold-dict-string-type\fP \e 138 - + \-d ./dummy.hash \-p ./\fInew-dict-file\fP \e 139 - > /dev/null 140 - rm dummy.* 141 - .fi 142 - @@ -622,7 +622,7 @@ or 143 - .B stringchar 144 - statements. 145 - For example, if the hyphen is a boundary character (useful in French), 146 - -the string "foo-bar" would be a single word, but "-foo" would be the 147 - +the string "foo-bar" would be a single word, but "\-foo" would be the 148 - same as "foo", and "foo--bar" would be two words separated by non-word 149 - characters. 150 - .PP 151 - @@ -916,7 +916,7 @@ The following (suffix) replacements: 152 - .RS 153 - .nf 154 - \&. > MENT 155 - -Y > -Y,IES 156 - +Y > \-Y,IES 157 - .fi 158 - .RE 159 - .PP 160 - @@ -956,8 +956,8 @@ Instead, you must use two separate rules: 161 - .PP 162 - .RS 163 - .nf 164 - -E > -E,IES 165 - -Y > -Y,IES 166 - +E > \-E,IES 167 - +Y > \-Y,IES 168 - .fi 169 - .RE 170 - .PP 171 - @@ -1005,7 +1005,7 @@ For example, to specify words ending in "ED", write: 172 - .PP 173 - .RS 174 - .nf 175 - -E D > -ED,ING # As in covered > covering 176 - +E D > \-ED,ING # As in covered > covering 177 - .fi 178 - .RE 179 - .PP 180 - @@ -1013,7 +1013,7 @@ If you write: 181 - .PP 182 - .RS 183 - .nf 184 - -ED > -ED,ING 185 - +ED > \-ED,ING 186 - .fi 187 - .RE 188 - .PP 189 - @@ -1021,7 +1021,7 @@ the effect will be the same as: 190 - .PP 191 - .RS 192 - .nf 193 - -[ED] > -ED,ING 194 - +[ED] > \-ED,ING 195 - .fi 196 - .RE 197 - .PP 198 - @@ -1047,7 +1047,7 @@ is useful, as in the following example: 199 - .PP 200 - .RS 201 - .nf 202 - -$ munchlist -c oldaffixes -l newaffixes olddict > newdict 203 - +$ munchlist \-c oldaffixes \-l newaffixes olddict > newdict 204 - .fi 205 - .RE 206 - .PP 207 - @@ -1070,7 +1070,7 @@ flag from the English affix file: 208 - .RS 209 - .nf 210 - flag *S: 211 - - [^AEIOU]Y > -Y,IES # As in imply > implies 212 - + [^AEIOU]Y > \-Y,IES # As in imply > implies 213 - [AEIOU]Y > S # As in convey > conveys 214 - [SXZH] > ES # As in fix > fixes 215 - [^SXZHY] > S # As in bat > bats 216 - @@ -1099,8 +1099,8 @@ For example, we could extend the English "R" flag as follows: 217 - flag *R: 218 - E > R # As in skate > skater 219 - E > RS # As in skate > skaters 220 - - [^AEIOU]Y > -Y,IER # As in multiply > multiplier 221 - - [^AEIOU]Y > -Y,IERS # As in multiply > multipliers 222 - + [^AEIOU]Y > \-Y,IER # As in multiply > multiplier 223 - + [^AEIOU]Y > \-Y,IERS # As in multiply > multipliers 224 - [AEIOU]Y > ER # As in convey > conveyer 225 - [AEIOU]Y > ERS # As in convey > conveyers 226 - [^EY] > ER # As in build > builder 227 - --

-57

pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch

··· 1 - From: Robert Luberda <robert@debian.org> 2 - Date: Mon, 7 Mar 2011 22:23:56 +0100 3 - Subject: 0021 Fix gcc warnings 4 - 5 - Fix some gcc warnings. 6 - --- 7 - correct.c | 2 +- 8 - languages/english/msgs.h | 8 ++++---- 9 - tree.c | 2 +- 10 - 3 files changed, 6 insertions(+), 6 deletions(-) 11 - 12 - diff --git a/correct.c b/correct.c 13 - index 79b259f..982b7c6 100644 14 - --- a/correct.c 15 - +++ b/correct.c 16 - @@ -825,7 +825,7 @@ static void inserttoken (buf, start, tok, curchar, oktochange) 17 - for (p = start; p != *curchar; p++) 18 - (void) putc (*p, logfile); 19 - (void) putc (' ', logfile); 20 - - (void) fputs (tok, logfile); 21 - + (void) fputs ((char*) tok, logfile); 22 - (void) putc ('\n', logfile); 23 - (void) fflush (logfile); 24 - } 25 - diff --git a/languages/english/msgs.h b/languages/english/msgs.h 26 - index d33b42b..f9c87ca 100644 27 - --- a/languages/english/msgs.h 28 - +++ b/languages/english/msgs.h 29 - @@ -182,10 +182,10 @@ 30 - #define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n" 31 - #define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n" 32 - /* You may add HELP_6 through HELP_9 if your language needs more lines */ 33 - -#define CORR_C_HELP_6 "" 34 - -#define CORR_C_HELP_7 "" 35 - -#define CORR_C_HELP_8 "" 36 - -#define CORR_C_HELP_9 "" 37 - +#define CORR_C_HELP_6 "%s" 38 - +#define CORR_C_HELP_7 "%s" 39 - +#define CORR_C_HELP_8 "%s" 40 - +#define CORR_C_HELP_9 "%s" 41 - #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n" 42 - #define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n" 43 - #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n" 44 - diff --git a/tree.c b/tree.c 45 - index 05a6918..229ae16 100644 46 - --- a/tree.c 47 - +++ b/tree.c 48 - @@ -351,7 +351,7 @@ void treeinsert (word, wordlen, keep) 49 - struct dent * oldhtab; 50 - unsigned int oldhsize; 51 - ichar_t nword[INPUTWORDLEN + MAXAFFIXLEN]; 52 - - int isvariant; 53 - + MASKTYPE isvariant; 54 - 55 - /* 56 - * Expand hash table when it is MAXPCT % full. 57 - --

-38

pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch

··· 1 - From: Robert Luberda <robert@debian.org> 2 - Date: Tue, 8 Mar 2011 21:12:23 +0100 3 - Subject: 0023 Exclusive options 4 - 5 - Make options -x and -b mutually exclusive 6 - --- 7 - ispell.c | 6 ++++-- 8 - 1 files changed, 4 insertions(+), 2 deletions(-) 9 - 10 - diff --git a/ispell.c b/ispell.c 11 - index d130a0e..cd5802a 100644 12 - --- a/ispell.c 13 - +++ b/ispell.c 14 - @@ -279,6 +279,7 @@ int main (argc, argv) 15 - static char outbuf[BUFSIZ]; 16 - int argno; 17 - int arglen; 18 - + int bflag = 0; 19 - 20 - Cmd = *argv; 21 - 22 - @@ -728,12 +729,13 @@ int main (argc, argv) 23 - nodictflag++; 24 - break; 25 - case 'b': 26 - - if (arglen > 2) 27 - + if (arglen > 2 || xflag == 1) 28 - usage (); 29 - xflag = 0; /* Keep a backup file */ 30 - + bflag = 1; 31 - break; 32 - case 'x': 33 - - if (arglen > 2) 34 - + if (arglen > 2 || bflag == 1) 35 - usage (); 36 - xflag = 1; /* Don't keep a backup file */ 37 - break; 38 - --

-69

pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch

··· 1 - From: Robert Luberda <robert@debian.org> 2 - Date: Tue, 8 Mar 2011 21:00:31 +0100 3 - Subject: 0024 Check tempdir creation 4 - 5 - Fail if temporary directory cannot be created. 6 - --- 7 - findaffix.X | 3 ++- 8 - munchlist.X | 3 ++- 9 - subset.X | 3 ++- 10 - zapdups.X | 3 ++- 11 - 4 files changed, 8 insertions(+), 4 deletions(-) 12 - 13 - diff --git a/findaffix.X b/findaffix.X 14 - index 2c253e2..58cabab 100755 15 - --- a/findaffix.X 16 - +++ b/findaffix.X 17 - @@ -179,7 +179,8 @@ TEMPDIR=`mktemp -d ${TDIR}/faffXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" 18 - TMP=${TEMPDIR}/faff$$ 19 - if [ "$TEMPDIR" = "$TDIR" ] 20 - then 21 - - TOREMOVE="${TMP}*" 22 - + echo "Failed to create temporary directory; exiting" 23 - + exit 1 24 - else 25 - TOREMOVE="$TEMPDIR" 26 - fi 27 - diff --git a/munchlist.X b/munchlist.X 28 - index ada3f1d..47bb908 100755 29 - --- a/munchlist.X 30 - +++ b/munchlist.X 31 - @@ -180,7 +180,8 @@ MUNCHDIR=`mktemp -d ${TDIR}/munchXXXXXXXXXX 2>/dev/null` || MUNCHDIR="$TDIR" 32 - TMP=${MUNCHDIR}/munch$$ 33 - if [ "$MUNCHDIR" = "$TDIR" ] 34 - then 35 - - TOREMOVE="${TMP}*" 36 - + echo "$0: Failed to create temporary directory, exiting..." 37 - + exit 1 38 - else 39 - TOREMOVE="$MUNCHDIR" 40 - fi 41 - diff --git a/subset.X b/subset.X 42 - index cc748ec..9c904cc 100755 43 - --- a/subset.X 44 - +++ b/subset.X 45 - @@ -125,7 +125,8 @@ TEMPDIR=`mktemp -d ${TDIR}/ssetXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" 46 - TMP=${TEMPDIR}/sset$$ 47 - if [ "$TEMPDIR" = "$TDIR" ] 48 - then 49 - - TOREMOVE="${TMP}*" 50 - + echo "$0: Failed to create temporary directory, exiting..." 51 - + exit 1 52 - else 53 - TOREMOVE="$TEMPDIR" 54 - fi 55 - diff --git a/zapdups.X b/zapdups.X 56 - index a68852a..1c610d4 100755 57 - --- a/zapdups.X 58 - +++ b/zapdups.X 59 - @@ -111,7 +111,8 @@ TEMPDIR=`mktemp -d ${TDIR}/zapdXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" 60 - TMP=${TEMPDIR}/zapd$$ 61 - if [ "$TEMPDIR" = "$TDIR" ] 62 - then 63 - - TOREMOVE="${TMP}*" 64 - + echo "$0: Failed to create temporary directory, exiting..." 65 - + exit 1 66 - else 67 - TOREMOVE="$TEMPDIR" 68 - fi 69 - --

-81

pkgs/tools/text/ispell/patches/0025-Languages.patch

··· 1 - From: Robert Luberda <robert@debian.org> 2 - Date: Tue, 8 Mar 2011 21:02:47 +0100 3 - Subject: 0025 Languages 4 - 5 - Fix a few words. 6 - --- 7 - languages/english/british.0 | 1 + 8 - languages/english/english.0 | 8 ++++++-- 9 - languages/english/english.1 | 3 ++- 10 - 3 files changed, 9 insertions(+), 3 deletions(-) 11 - 12 - diff --git a/languages/english/british.0 b/languages/english/british.0 13 - index dc4caa7..04d9177 100644 14 - --- a/languages/english/british.0 15 - +++ b/languages/english/british.0 16 - @@ -46,6 +46,7 @@ armour/DGMRSZ 17 - armoured/U 18 - armourer/MS 19 - armoury/DMS 20 - +artefact/MS 21 - atomisation/MS 22 - atomise/DGRSZ 23 - authorisation/AMS 24 - diff --git a/languages/english/english.0 b/languages/english/english.0 25 - index fc13212..f85e15a 100644 26 - --- a/languages/english/english.0 27 - +++ b/languages/english/english.0 28 - @@ -3502,6 +3502,7 @@ closure/DGMS 29 - cloth/DGS 30 - clothe/DGS 31 - clothed/U 32 - +cloths 33 - cloud/DGS 34 - clouded/U 35 - cloudless/PY 36 - @@ -10019,9 +10020,10 @@ mystery/MS 37 - mystic/MS 38 - mystical/Y 39 - mysticism/S 40 - -myth/MS 41 - +myth/M 42 - mythical/Y 43 - mythology/MS 44 - +myths 45 - nag/MS 46 - nail/DGRS 47 - naive/PRY 48 - @@ -14818,6 +14820,7 @@ tent/DGRS 49 - tentacle/DS 50 - tentative/PY 51 - tented/U 52 - +tenth 53 - tenths 54 - tenure/DS 55 - tenured/U 56 - @@ -16511,8 +16514,9 @@ youngster/MS 57 - your/MS 58 - yourself 59 - yourselves 60 - -youth/MS 61 - +youth/M 62 - youthful/PY 63 - +youths 64 - yuck 65 - Yugoslavian/MS 66 - yummy/R 67 - diff --git a/languages/english/english.1 b/languages/english/english.1 68 - index 2bfac86..78a7edf 100644 69 - --- a/languages/english/english.1 70 - +++ b/languages/english/english.1 71 - @@ -7449,7 +7449,8 @@ metalloid 72 - metallurgic 73 - metallurgical/Y 74 - metallurgists 75 - -metalsmith/S 76 - +metalsmith 77 - +metalsmiths 78 - metalwork/GJR 79 - metamorphic 80 - metamorphism 81 - --

-35

pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch

··· 1 - From: Robert Luberda <robert@debian.org> 2 - Date: Mon, 21 Mar 2011 10:36:15 +0100 3 - Subject: 0030 Display whole multibyte character 4 - 5 - Display all bytes from multibyte characters instead of converting them 6 - into `cat -v' format. This fixes an ugly screen content shown while 7 - checking UTF-8 files. 8 - --- 9 - correct.c | 11 +++++++---- 10 - 1 files changed, 7 insertions(+), 4 deletions(-) 11 - 12 - diff --git a/correct.c b/correct.c 13 - index 982b7c6..c91b41b 100644 14 - --- a/correct.c 15 - +++ b/correct.c 16 - @@ -733,11 +733,14 @@ static int show_char (cp, linew, output, maxw) 17 - ichar = SET_SIZE + laststringch; 18 - else 19 - ichar = chartoichar (ch); 20 - - if (!vflag && iswordch (ichar) && len == 1) 21 - + if (!vflag && iswordch (ichar) && len >= 1) 22 - { 23 - - if (output) 24 - - (void) putchar (ch); 25 - - (*cp)++; 26 - + for (i = 0; i < len; ++i) 27 - + { 28 - + if (output) 29 - + (void) putchar (**cp); 30 - + (*cp)++; 31 - + } 32 - return 1; 33 - } 34 - if (ch == '\t') 35 - --