summaryrefslogtreecommitdiff
path: root/hunspell
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-02-27 23:44:26 +0000
committerCaolán McNamara <cmc@openoffice.org>2010-02-27 23:44:26 +0000
commit1964ee5d1c40331e72429a54877022777b67d8a5 (patch)
treefcb4a0dbb0a8ac5b976b5bdf8a4c9b21658584bc /hunspell
parent912fbc40dfc95782f6d04d49c94326cce3d00bf9 (diff)
hunspell129: add back in solaris ICONV disable
Diffstat (limited to 'hunspell')
-rw-r--r--hunspell/hunspell-solaris.patch12
-rw-r--r--hunspell/makefile.mk3
2 files changed, 14 insertions, 1 deletions
diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch
new file mode 100644
index 000000000000..37c5101364b4
--- /dev/null
+++ b/hunspell/hunspell-solaris.patch
@@ -0,0 +1,12 @@
+--- 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
+@@ -10,6 +10,9 @@
+ #include "hunspell.hxx"
+ #include "csutil.hxx"
+
++// switch off iconv support for tests (fixing Solaris problems)
++#undef HAVE_ICONV
++
+ #ifndef HUNSPELL_EXTRA
+ #define suggest_auto suggest
+ #endif
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 4221ce4d686d..64e35afdfb3e 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -41,7 +41,8 @@ TARFILE_ROOTDIR=hunspell-1.2.9
ADDITIONAL_FILES+=config.h
PATCH_FILES=\
- hunspell-wntconfig.patch
+ hunspell-wntconfig.patch \
+ hunspell-solaris.patch
.IF "$(GUI)"=="UNX"