summaryrefslogtreecommitdiffstats
path: root/hunspell
diff options
context:
space:
mode:
Diffstat (limited to 'hunspell')
-rw-r--r--hunspell/hunspell-1.2.8-thesfix.patch28
-rw-r--r--hunspell/hunspell-mingw.patch4
-rw-r--r--hunspell/hunspell-solaris.patch4
-rw-r--r--hunspell/hunspell-stacksmash.patch28
-rw-r--r--hunspell/hunspell-static.patch11
-rw-r--r--hunspell/hunspell-wntconfig.patch4
-rw-r--r--hunspell/makefile.mk19
-rw-r--r--hunspell/prj/d.lst1
8 files changed, 30 insertions, 69 deletions
diff --git a/hunspell/hunspell-1.2.8-thesfix.patch b/hunspell/hunspell-1.2.8-thesfix.patch
deleted file mode 100644
index c41fde45050f..000000000000
--- a/hunspell/hunspell-1.2.8-thesfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:36.998879385 +0100
-+++ misc/build/hunspell-1.2.8/src/hunspell/hunspell.cxx 2010-03-16 14:37:10.416222464 +0100
-@@ -1666,7 +1666,7 @@
- if (!q2) return 0; // bad XML input
- if (check_xml_par(q, "type=", "analyze")) {
- int n = 0, s = 0;
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
- if (n == 0) return 0;
- // convert the result to <code><a>ana1</a><a>ana2</a></code> format
- for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
-@@ -1687,13 +1687,13 @@
- (*slst)[0] = r;
- return 1;
- } else if (check_xml_par(q, "type=", "stem")) {
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
- } else if (check_xml_par(q, "type=", "generate")) {
-- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
-+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
- if (n == 0) return 0;
- char * q3 = strstr(q2 + 1, "<word");
- if (q3) {
-- if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
-+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
- return generate(slst, cw, cw2);
- }
- } else {
diff --git a/hunspell/hunspell-mingw.patch b/hunspell/hunspell-mingw.patch
index 0120e01ddba1..391aa9220fc1 100644
--- a/hunspell/hunspell-mingw.patch
+++ b/hunspell/hunspell-mingw.patch
@@ -1,5 +1,5 @@
---- misc/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:37:14.000000000 +0900
-+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-04-25 07:57:39.233875000 +0900
+--- misc/hunspell-1.3.1/src/tools/hunspell.cxx 2010-02-27 23:37:14.000000000 +0900
++++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx 2010-04-25 07:57:39.233875000 +0900
@@ -27,7 +27,9 @@
#ifdef WIN32
diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch
index 37c5101364b4..3a5146250b99 100644
--- a/hunspell/hunspell-solaris.patch
+++ b/hunspell/hunspell-solaris.patch
@@ -1,5 +1,5 @@
---- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000
-+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000
+--- misc/hunspell-1.3.1.orig/src/tools/hunspell.cxx 2010-02-27 23:42:05.000000000 +0000
++++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx 2010-02-27 23:43:02.000000000 +0000
@@ -10,6 +10,9 @@
#include "hunspell.hxx"
#include "csutil.hxx"
diff --git a/hunspell/hunspell-stacksmash.patch b/hunspell/hunspell-stacksmash.patch
deleted file mode 100644
index 8765b6d784d3..000000000000
--- a/hunspell/hunspell-stacksmash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:06.000000000 +0000
-+++ misc/build/hunspell-1.2.9/src/hunspell/hunspell.cxx 2010-03-04 10:25:38.000000000 +0000
-@@ -1665,7 +1665,7 @@
- if (!q2) return 0; // bad XML input
- if (check_xml_par(q, "type=", "analyze")) {
- int n = 0, s = 0;
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
- if (n == 0) return 0;
- // convert the result to <code><a>ana1</a><a>ana2</a></code> format
- for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
-@@ -1686,13 +1686,13 @@
- (*slst)[0] = r;
- return 1;
- } else if (check_xml_par(q, "type=", "stem")) {
-- if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
-+ if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
- } else if (check_xml_par(q, "type=", "generate")) {
-- int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
-+ int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
- if (n == 0) return 0;
- char * q3 = strstr(q2 + 1, "<word");
- if (q3) {
-- if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
-+ if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
- return generate(slst, cw, cw2);
- }
- } else {
diff --git a/hunspell/hunspell-static.patch b/hunspell/hunspell-static.patch
new file mode 100644
index 000000000000..08a23206255e
--- /dev/null
+++ b/hunspell/hunspell-static.patch
@@ -0,0 +1,11 @@
+--- misc/hunspell-1.3.1/src/hunspell/makefile.mk 2010-06-17 15:56:41.000000000 +0200
++++ misc/build/hunspell-1.3.1/src/hunspell/makefile.mk 2011-02-10 20:47:22.000000000 +0100
+@@ -39,7 +39,7 @@
+
+ # --- Files --------------------------------------------------------
+
+-CFLAGS+=-I..$/..$/
++CFLAGS+=-I..$/..$/ -DHUNSPELL_STATIC
+ CDEFS+=-DOPENOFFICEORG
+
+ SLOFILES= \
diff --git a/hunspell/hunspell-wntconfig.patch b/hunspell/hunspell-wntconfig.patch
index 9b6bc9c3fbb2..1d35c362d1fd 100644
--- a/hunspell/hunspell-wntconfig.patch
+++ b/hunspell/hunspell-wntconfig.patch
@@ -1,4 +1,4 @@
---- misc/hunspell-1.2.9/config.h 2010-02-25 14:38:38.000000000 +0000
-+++ misc/build/hunspell-1.2.9/config.h 2010-02-25 14:38:42.000000000 +0000
+--- misc/hunspell-1.3.1/config.h 2010-02-25 14:38:38.000000000 +0000
++++ misc/build/hunspell-1.3.1/config.h 2010-02-25 14:38:42.000000000 +0000
@@ -1 +0,0 @@
-dummy
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 7b2bc84e0789..9c213a4d9a9a 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -36,24 +36,28 @@ TARGET=hunspell
# --- Files --------------------------------------------------------
-TARFILE_NAME=hunspell-1.2.9
-TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
+TARFILE_NAME=hunspell-1.3.1
+TARFILE_MD5=9ed97fce60a9a65852402248a6659492
ADDITIONAL_FILES+=config.h
PATCH_FILES=\
+ hunspell-static.patch \
hunspell-wntconfig.patch \
- hunspell-solaris.patch \
- hunspell-stacksmash.patch
+ hunspell-solaris.patch
.IF "$(GUI)"=="UNX"
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic
.IF "$(COMNAME)"=="sunpro5"
CONFIGURE_FLAGS+= CFLAGS=-xc99=none
.ENDIF # "$(COMNAME)"=="sunpro5"
+.IF "$(OS)"=="AIX"
+CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
+.ENDIF
+
.IF "$(SYSBASE)"!=""
.IF "$(EXTRA_CFLAGS)"!=""
CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
@@ -75,7 +79,7 @@ PATCH_FILES=\
hunspell-mingw.patch
CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
+CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
BUILD_ACTION=make
OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
.ELSE
@@ -88,7 +92,8 @@ BUILD_ACTION=cd src/hunspell && dmake
.ENDIF # "$(GUI)"=="OS2"
OUT2INC= \
- $(BUILD_DIR)$/src$/hunspell$/*.hxx
+ $(BUILD_DIR)$/src$/hunspell$/*.hxx \
+ $(BUILD_DIR)$/src$/hunspell$/*.h
# --- Targets ------------------------------------------------------
diff --git a/hunspell/prj/d.lst b/hunspell/prj/d.lst
index a323ce9f6344..10f44f4ae96d 100644
--- a/hunspell/prj/d.lst
+++ b/hunspell/prj/d.lst
@@ -3,3 +3,4 @@
mkdir: %_DEST%\inc%_EXT%\hunspell
..\%__SRC%\inc\*.hxx %_DEST%\inc%_EXT%\hunspell\*.hxx
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\hunspell\*.h
generated by cgit (git 2.34.1) at 2024-08-02 00:23:32 +0000