summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2009-11-29 18:52:56 +0100
committerEric Sandall2009-12-05 12:07:04 -0800
commit658ad32c07af0ac96127577e2cab666b5f454a16 (patch)
treedfdb55625435d1f73584a4caa8a23cd420fa6f4e
parent585f55daff1dcc9dac51937bf6dc1ee9df50441a (diff)
ispell: fixed #15502, fails to cast with glibc >= 2.10.1
(cherry picked from commit 1253eabc49e87bdf6c802f19d3b86ebf5d66a9ee)
-rw-r--r--spelling/ispell/HISTORY4
-rwxr-xr-xspelling/ispell/PRE_BUILD3
-rw-r--r--spelling/ispell/ispell-3.3.02-glibc-2.10.patch48
3 files changed, 55 insertions, 0 deletions
diff --git a/spelling/ispell/HISTORY b/spelling/ispell/HISTORY
index 83dacedb85..0f2fa19306 100644
--- a/spelling/ispell/HISTORY
+++ b/spelling/ispell/HISTORY
@@ -1,3 +1,7 @@
+2009-11-29 Ladislav Hagara <hgr@vabo.cz>
+ * PRE_BUILD, ispell-3.3.02-glibc-2.10.patch: added patch from Gentoo
+ #15502
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2 and MAINTAINER.
diff --git a/spelling/ispell/PRE_BUILD b/spelling/ispell/PRE_BUILD
new file mode 100755
index 0000000000..ed8f3d3c83
--- /dev/null
+++ b/spelling/ispell/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/ispell-3.3.02-glibc-2.10.patch
diff --git a/spelling/ispell/ispell-3.3.02-glibc-2.10.patch b/spelling/ispell/ispell-3.3.02-glibc-2.10.patch
new file mode 100644
index 0000000000..8ccd5cc788
--- /dev/null
+++ b/spelling/ispell/ispell-3.3.02-glibc-2.10.patch
@@ -0,0 +1,48 @@
+diff -ur ispell-3.3.02.orig/correct.c ispell-3.3.02/correct.c
+--- ispell-3.3.02.orig/correct.c 2009-08-06 18:28:32.000000000 +0300
++++ ispell-3.3.02/correct.c 2009-08-06 18:28:57.000000000 +0300
+@@ -247,7 +247,7 @@
+ struct flagent * sufent,
+ ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
+ int * nsaved));
+-static char * getline P ((char * buf, int bufsize));
++static char * get_line P ((char * buf, int bufsize));
+ void askmode P ((void));
+ void copyout P ((unsigned char ** cc, int cnt));
+ static void lookharder P ((unsigned char * string));
+@@ -573,7 +573,7 @@
+
+ imove (li - 1, 0);
+ (void) putchar ('!');
+- if (getline ((char *) buf, sizeof buf) == NULL)
++ if (get_line ((char *) buf, sizeof buf) == NULL)
+ {
+ (void) putchar (7);
+ ierase ();
+@@ -598,7 +598,7 @@
+ (void) printf ("%s ", CORR_C_READONLY);
+ }
+ (void) printf (CORR_C_REPLACE_WITH);
+- if (getline ((char *) ctok, ctokl) == NULL)
++ if (get_line ((char *) ctok, ctokl) == NULL)
+ {
+ (void) putchar (7);
+ /* Put it back */
+@@ -666,7 +666,7 @@
+ unsigned char buf[100];
+ imove (li - 1, 0);
+ (void) printf (CORR_C_LOOKUP_PROMPT);
+- if (getline ((char *) buf, sizeof buf) == NULL)
++ if (get_line ((char *) buf, sizeof buf) == NULL)
+ {
+ (void) putchar (7);
+ ierase ();
+@@ -1585,7 +1585,7 @@
+ return;
+ }
+
+-static char * getline (s, len)
++static char * get_line (s, len)
+ register char * s;
+ register int len;
+ {