[ooo-build-commit] Branch 'ooo/master' - hunspell/hunspell-consts-1.2.8.patch hunspell/makefile.mk

[Jan Holesovsky]

 hunspell/hunspell-consts-1.2.8.patch |   22 ++++++++++++++++++++++
 hunspell/makefile.mk                 |    4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 77e1375915058021ad903915e3a2172139dc6b45
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Jun 4 15:47:31 2009 +0000

    CWS-TOOLING: integrate CWS cmcfixes59
    2009-05-18 10:10:11 +0200 cmc  r272001 : #i102012# remove extensions warnings, and set as warnings-free
    2009-05-16 17:29:59 +0200 cmc  r271981 : #i101990# silence warning, logic is unchanged
    2009-05-16 17:13:59 +0200 cmc  r271980 : #i100412 remove warning, logic is unchanged
    2009-05-16 17:08:57 +0200 cmc  r271979 : #i100412 remove warning, logic is unchanged, matches comments for intent
    2009-05-16 17:01:08 +0200 cmc  r271978 : #i86576# remove uncallable code
    2009-05-16 15:41:46 +0200 cmc  r271977 : #i101988# fix up consts for warning-free

diff --git a/hunspell/hunspell-consts-1.2.8.patch b/hunspell/hunspell-consts-1.2.8.patch
new file mode 100644
index 0000000..8f8c727
--- /dev/null
+++ b/hunspell/hunspell-consts-1.2.8.patch
@@ -0,0 +1,22 @@
+--- misc/hunspell-1.2.8/src/hunspell/affixmgr.cxx       2009-05-16 14:33:27.000000000 +0100
++++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.cxx    2009-05-16 14:35:52.000000000 +0100
+@@ -3238,7 +3238,7 @@
+ }
+ 
+ // return the value of suffix
+-const int AffixMgr::have_contclass()
++int AffixMgr::have_contclass() const
+ {
+   return havecontclass;
+ }
+--- misc/hunspell-1.2.8.orig/src/hunspell/affixmgr.hxx	2009-05-16 14:33:27.000000000 +0100
++++ misc/build/hunspell-1.2.8/src/hunspell/affixmgr.hxx	2009-05-16 14:35:38.000000000 +0100
+@@ -189,7 +189,7 @@
+   const char *        get_suffix();
+   const char *        get_derived();
+   const char *        get_version();
+-  const int           have_contclass();
++  int                 have_contclass() const;
+   int                 get_utf8();
+   int                 get_complexprefixes();
+   char *              get_suffixed(char );
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index c8d8d5c..db667cc 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -45,7 +45,9 @@ TARFILE_ROOTDIR=hunspell-1.2.8
 
 #ADDITIONAL_FILES += src/hunspell/makefile.mk
 
-PATCH_FILES=hunspell-1.2.8.patch
+PATCH_FILES=\
+    hunspell-1.2.8.patch \
+    hunspell-consts-1.2.8.patch # hunspell#2064983
 
 .IF "$(GUI)"=="UNX"
 #CONFIGURE_DIR=$(BUILD_DIR)