git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #64285 from tadeokondrak/ispell/update

ispell: 3.3.02 -> 3.4.00

commit72646582a477c7f8666ebfffe1b970487d2d3b93 authorAaron Andersen <aaron@fosslib.net> dateSun 1 Sep 2019, 08:52 (7 years ago) parentd4283f48dec5e6
2 files changed+15−56
pkgs/tools/text/ispell/default.nix+15−4 pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch−52
pkgs/tools/text/ispell/default.nix+15−4
@@ -1,14 +1,17 @@
11{ stdenv, fetchurl, bison, ncurses }:
22
33stdenv.mkDerivation rec {
4− name = "ispell-3.3.02";
4+ pname = "ispell";
5+ version = "3.4.00";
6+
57 src = fetchurl {
6− url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz";
8+ url = "http://fmg-www.cs.ucla.edu/geoff/tars/${pname}-${version}.tar.gz";
79 sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz";
810 };
11+
912 buildInputs = [ bison ncurses ];
13+
1014 patches = [
11− ./patches/0005-Do-not-reorder-words.patch
1215 ./patches/0007-Use-termios.patch
1316 ./patches/0008-Tex-backslash.patch
1417 ./patches/0009-Fix-FTBFS-on-glibc.patch
@@ -21,6 +24,7 @@ stdenv.mkDerivation rec {
2124 ./patches/0025-Languages.patch
2225 ./patches/0030-Display-whole-multibyte-character.patch
2326 ];
27+
2428 postPatch = ''
2529 cat >> local.h <<EOF
2630 ${stdenv.lib.optionalString (!stdenv.isDarwin) "#define USG"}
@@ -37,11 +41,18 @@ stdenv.mkDerivation rec {
3741 #define MINIMENU
3842 #define HAS_RENAME
3943 EOF
40−
4144 '';
45+
4246 preBuild = ''
4347 for dir in $out/share/emacs/site-lisp $out/share/info $out/share/man/man1 $out/share/man/man4 $out/bin $out/lib; do
4448 mkdir -p $dir
4549 done
4650 '';
51+
52+ meta = with stdenv.lib; {
53+ description = "An interactive spell-checking program for Unix";
54+ homepage = "https://www.cs.hmc.edu/~geoff/ispell.html";
55+ license = licenses.free;
56+ platforms = platforms.unix;
57+ };
4758}
pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patchdeleted−52
@@ -1,52 +0,0 @@
1−From: Geoff Kuenning <geoff@cs.hmc.edu>
2−Date: Thu, 3 Nov 2005 14:14:15 -0800
3−Subject: 0005 Do not reorder words
4−
5−ispell reorders words in personal dictionary without good reason.
6−
7−The correct approach is to build the internal data structure with variant
8−spellings stored in the same order as they appear in the personal dictionary.
9−Fortunately, this is easy, though the patch is to a different file. This one
10−has been tested (That's what I get for trying to rush out a fix before a
11−meeting!).
12−---
13− makedent.c | 18 +++++++++++-------
14− 1 files changed, 11 insertions(+), 7 deletions(-)
15−
16−diff --git a/makedent.c b/makedent.c
17−index 0453d11..d121345 100644
18−--- a/makedent.c
19−+++ b/makedent.c
20−@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp)
21− if (retval == 0)
22− {
23− /*
24−- ** Couldn't combine the two entries. Add a new variant. For
25−- ** ease, we'll stick it right behind the header, rather than
26−- ** at the end of the list.
27−+ ** Couldn't combine the two entries. Add a new variant. We
28−+ ** stick it at the end of the variant list because it's
29−+ ** important to maintain order; this causes the personal
30−+ ** dictionary to have a stable ordering.
31− */
32− forcevheader (hdrp, oldp, newp);
33− tdent = (struct dent *) mymalloc (sizeof (struct dent));
34−@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp)
35− return -1;
36− }
37− *tdent = *newp;
38−- tdent->next = hdrp->next;
39−- hdrp->next = tdent;
40−- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS);
41−- hdrp->flagfield |= MOREVARIANTS;
42−+ for (oldp = hdrp;
43−+ oldp->next != NULL && oldp->flagfield & MOREVARIANTS;
44−+ oldp = oldp->next)
45−+ ;
46−+ tdent->next = oldp->next;
47−+ oldp->next = tdent;
48−+ oldp->flagfield |= MOREVARIANTS;
49− combineaffixes (hdrp, newp);
50− hdrp->flagfield |= (newp->flagfield & KEEP);
51− if (captype (newp->flagfield) == FOLLOWCASE)
52−--