~ubuntu-branches/ubuntu/natty/libreoffice-l10n/natty-updates

« back to all changes in this revision

Viewing changes to sources/libreoffice-libs-extern-sys-3.3.0.4/hunspell/hunspell-solaris.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-01-21 01:37:08 UTC
  • mfrom: (0.6.1) (0.5.1) (0.4.1) (0.1.2)
  • Revision ID: package-import@ubuntu.com-20110121013708-d4rj1blksdgno023
Tags: 1:3.3.0~rc4-1ubuntu1
* Merge 3.3.0~rc4 changes.
* Merged Debian packaging up to r2336.
* libreoffice-writer: Make the java stuff a suggestion instead of a
  recommendation.
* Fix libreoffice-base upgrade, overwriting doc file. LP: #705343.
* Add initial desktop menu translations. LP: #696549. Still needs
  rosetta integration. Use the file lo-desktop.pot.
* Relax dependencies of libreoffice-l10n-xx on libreoffice-common.
* Move the icons zip files back into the libreoffice-style-* packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx     2010-02-27 23:42:05.000000000 +0000
 
2
+++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx    2010-02-27 23:43:02.000000000 +0000
 
3
@@ -10,6 +10,9 @@
 
4
 #include "hunspell.hxx"
 
5
 #include "csutil.hxx"
 
6
 
 
7
+// switch off iconv support for tests (fixing Solaris problems)
 
8
+#undef HAVE_ICONV
 
9
+
 
10
 #ifndef HUNSPELL_EXTRA
 
11
 #define suggest_auto suggest
 
12
 #endif