Author: pfg
Date: Mon Jan 23 22:55:59 2017
New Revision: 1779997
URL: http://svn.apache.org/viewvc?rev=1779997&view=rev
Log:
Update Hunspell to version 1.3.3 (minor)
This is the last version available on sourceforge, new versions are
available through github.
Main changes are:
2014-06-02: Hunspell 1.3.3 release:
- OpenDocument (ODF and Flat ODF) support (ODF needs unzip program)
- various bug fixes
Added:
openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.3-overflow.patch
- copied, changed from r1779996,
openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.2-overflow.patch
Removed:
openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.2-overflow.patch
openoffice/trunk/ext_libraries/hunspell/hunspell-mingw.patch
openoffice/trunk/ext_libraries/hunspell/hunspell-wntconfig.patch
Modified:
openoffice/trunk/ext_libraries/hunspell/hunspell-bash.patch
openoffice/trunk/ext_libraries/hunspell/hunspell-cxx11-literal.patch
openoffice/trunk/ext_libraries/hunspell/hunspell-solaris.patch
openoffice/trunk/ext_libraries/hunspell/makefile.mk
openoffice/trunk/main/external_deps.lst
Copied: openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.3-overflow.patch
(from r1779996,
openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.2-overflow.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.3-overflow.patch?p2=openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.3-overflow.patch&p1=openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.2-overflow.patch&r1=1779996&r2=1779997&rev=1779997&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.2-overflow.patch
(original)
+++ openoffice/trunk/ext_libraries/hunspell/hunspell-1.3.3-overflow.patch Mon
Jan 23 22:55:59 2017
@@ -1,15 +1,15 @@
---- misc/hunspell-1.3.2/src/hunspell/affixmgr.cxx 2010-02-27
12:59:53.000000000 +0100
-+++ misc/build/hunspell-1.3.2/src/hunspell/affixmgr.cxx 2011-05-18
16:29:45.919141893 +0200
-@@ -6,6 +6,8 @@
- #include <stdio.h>
- #include <ctype.h>
+--- misc/hunspell-1.3.3/src/hunspell/affixmgr.cxx 2010-02-27
12:59:53.000000000 +0100
++++ misc/build/hunspell-1.3.3/src/hunspell/affixmgr.cxx 2011-05-18
16:29:45.919141893 +0200
+@@ -8,6 +8,8 @@
+
+ #include <vector>
+#include <limits>
+
#include "affixmgr.hxx"
#include "affentry.hxx"
#include "langnum.hxx"
-@@ -4000,7 +4002,10 @@
+@@ -4238,7 +4240,10 @@
case 3: {
np++;
numents = atoi(piece);
@@ -21,8 +21,8 @@
char * err = pHMgr->encode_flag(aflag);
if (err) {
HUNSPELL_WARNING(stderr, "error: line %d: bad
entry number\n",
---- misc/hunspell-1.3.2/src/tools/munch.c 2010-02-27 21:49:49.000000000
+0100
-+++ misc/build/hunspell-1.3.2/src/tools/munch.c 2011-05-18
15:53:53.427072106 +0200
+--- misc/hunspell-1.3.3/src/tools/munch.c 2010-02-27 21:49:49.000000000
+0100
++++ misc/build/hunspell-1.3.3/src/tools/munch.c 2011-05-18
15:53:53.427072106 +0200
@@ -4,6 +4,7 @@
#include <string.h>
#include <unistd.h>
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-@@ -233,10 +233,19 @@
+@@ -235,10 +235,19 @@
case 1: { achar = *piece; break; }
case 2: { if (*piece == 'Y') ff = XPRODUCT; break; }
case 3: { numents = atoi(piece);
@@ -55,8 +55,8 @@
break;
}
default: break;
---- misc/hunspell-1.3.2/src/tools/unmunch.c 2010-02-23 15:53:29.000000000
+0100
-+++ misc/build/hunspell-1.3.2/src/tools/unmunch.c 2011-05-18
20:53:43.843599726 +0200
+--- misc/hunspell-1.3.3/src/tools/unmunch.c 2010-02-23 15:53:29.000000000
+0100
++++ misc/build/hunspell-1.3.3/src/tools/unmunch.c 2011-05-18
20:53:43.843599726 +0200
@@ -6,6 +6,7 @@
#include <string.h>
#include <unistd.h>
@@ -65,7 +65,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
-@@ -158,10 +159,19 @@
+@@ -160,10 +161,19 @@
case 1: { achar = *piece; break; }
case 2: { if (*piece == 'Y') ff = XPRODUCT; break; }
case 3: { numents = atoi(piece);
Modified: openoffice/trunk/ext_libraries/hunspell/hunspell-bash.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/hunspell/hunspell-bash.patch?rev=1779997&r1=1779996&r2=1779997&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/hunspell/hunspell-bash.patch (original)
+++ openoffice/trunk/ext_libraries/hunspell/hunspell-bash.patch Mon Jan 23
22:55:59 2017
@@ -1,5 +1,5 @@
---- misc/hunspell-1.3.2/tests/test.sh 2010-02-23 21:18:50.000000000 +0900
-+++ misc/build/hunspell-1.3.2/tests/test.sh 2010-05-05 13:01:42.000000000
+0900
+--- misc/hunspell-1.3.3/tests/test.sh 2010-02-23 21:18:50.000000000 +0900
++++ misc/build/hunspell-1.3.3/tests/test.sh 2010-05-05 13:01:42.000000000
+0900
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
Modified: openoffice/trunk/ext_libraries/hunspell/hunspell-cxx11-literal.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/hunspell/hunspell-cxx11-literal.patch?rev=1779997&r1=1779996&r2=1779997&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/hunspell/hunspell-cxx11-literal.patch
(original)
+++ openoffice/trunk/ext_libraries/hunspell/hunspell-cxx11-literal.patch Mon
Jan 23 22:55:59 2017
@@ -1,6 +1,6 @@
---- misc/hunspell-1.3.2/src/tools/hunspell.cxx 2013-04-19 15:49:08.000000000
+0200
-+++ misc/build/hunspell-1.3.2/src/tools/hunspell.cxx 2013-04-19
15:48:51.000000000 +0200
-@@ -20,7 +20,7 @@
+--- misc/hunspell-1.3.3/src/tools/hunspell.cxx 2013-04-19 15:49:08.000000000
+0200
++++ misc/build/hunspell-1.3.3/src/tools/hunspell.cxx 2013-04-19
15:48:51.000000000 +0200
+@@ -17,7 +17,7 @@
#define HUNSPELL_VERSION VERSION
#define INPUTLEN 50
Modified: openoffice/trunk/ext_libraries/hunspell/hunspell-solaris.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/hunspell/hunspell-solaris.patch?rev=1779997&r1=1779996&r2=1779997&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/hunspell/hunspell-solaris.patch (original)
+++ openoffice/trunk/ext_libraries/hunspell/hunspell-solaris.patch Mon Jan 23
22:55:59 2017
@@ -1,5 +1,5 @@
---- misc/hunspell-1.3.2.orig/src/tools/hunspell.cxx 2010-02-27
23:42:05.000000000 +0000
-+++ misc/build/hunspell-1.3.2/src/tools/hunspell.cxx 2010-02-27
23:43:02.000000000 +0000
+--- misc/hunspell-1.3.3.orig/src/tools/hunspell.cxx 2010-02-27
23:42:05.000000000 +0000
++++ misc/build/hunspell-1.3.3/src/tools/hunspell.cxx 2010-02-27
23:43:02.000000000 +0000
@@ -10,6 +10,9 @@
#include "hunspell.hxx"
#include "csutil.hxx"
Modified: openoffice/trunk/ext_libraries/hunspell/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/hunspell/makefile.mk?rev=1779997&r1=1779996&r2=1779997&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/hunspell/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/hunspell/makefile.mk Mon Jan 23 22:55:59 2017
@@ -39,14 +39,14 @@ all:
.ELSE
-TARFILE_NAME=hunspell-1.3.2
-TARFILE_MD5=3121aaf3e13e5d88dfff13fb4a5f1ab8
+TARFILE_NAME=hunspell-1.3.3
+TARFILE_MD5=4967da60b23413604c9e563beacc63b4
PATCH_FILES= \
hunspell-cxx11-literal.patch \
hunspell-solaris.patch \
hunspell-bash.patch \
- hunspell-1.3.2-overflow.patch
+ hunspell-1.3.3-overflow.patch
.IF "$(GUI)"=="UNX"
@@ -76,8 +76,6 @@ OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.li
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
-PATCH_FILES=\
- hunspell-mingw.patch
CONFIGURE_ACTION=configure
CONFIGURE_FLAGS= --disable-shared --with-pic
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1779997&r1=1779996&r2=1779997&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Mon Jan 23 22:55:59 2017
@@ -296,9 +296,9 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_HYP
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
- name = hunspell-1.3.2.tar.gz
- MD5 = 3121aaf3e13e5d88dfff13fb4a5f1ab8
- URL1 =
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.2/hunspell-1.3.2.tar.gz/download
+ name = hunspell-1.3.3.tar.gz
+ MD5 = 4967da60b23413604c9e563beacc63b4
+ URL1 =
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.3/hunspell-1.3.3.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES)
