diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-13 12:17:16 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-14 10:39:11 +0200 |
| commit | 27b76a44593c654800cf0f90d82ccc8d5a6f1c48 (patch) | |
| tree | 37093313f0ba969cfcbef21b5d4a6397416ca79e /hunspell | |
| parent | 9960899e378711cd254d94b1bb6db908fb3e9664 (diff) | |
Some C++11 related fixes
Change-Id: Ia7f325e3658618fe627a0bc00dec4e98e41e5716
Diffstat (limited to 'hunspell')
| -rw-r--r-- | hunspell/hunspell-1.3.2-literal.patch | 11 | ||||
| -rw-r--r-- | hunspell/hunspell-1.3.2-nullptr.patch | 20 | ||||
| -rw-r--r-- | hunspell/makefile.mk | 4 |
3 files changed, 34 insertions, 1 deletions
diff --git a/hunspell/hunspell-1.3.2-literal.patch b/hunspell/hunspell-1.3.2-literal.patch new file mode 100644 index 000000000000..4cbf377c1442 --- /dev/null +++ b/hunspell/hunspell-1.3.2-literal.patch @@ -0,0 +1,11 @@ +--- misc/hunspell-1.3.2/src/tools/hunspell.cxx 2012-08-13 12:09:06.107017665 +0200 ++++ misc/build/hunspell-1.3.2/src/tools/hunspell.cxx 2012-08-13 12:14:12.233500532 +0200 +@@ -20,7 +20,7 @@ + #define HUNSPELL_VERSION VERSION + #define INPUTLEN 50 + +-#define HUNSPELL_PIPE_HEADING "@(#) International Ispell Version 3.2.06 (but really Hunspell "VERSION")\n" ++#define HUNSPELL_PIPE_HEADING "@(#) International Ispell Version 3.2.06 (but really Hunspell " VERSION ")\n" + #define HUNSPELL_HEADING "Hunspell " + + //for debugging only diff --git a/hunspell/hunspell-1.3.2-nullptr.patch b/hunspell/hunspell-1.3.2-nullptr.patch new file mode 100644 index 000000000000..624e6ce6e6c5 --- /dev/null +++ b/hunspell/hunspell-1.3.2-nullptr.patch @@ -0,0 +1,20 @@ +--- misc/hunspell-1.3.2/src/hunspell/affentry.hxx 2010-04-15 13:22:08.000000000 +0200 ++++ misc/build/hunspell-1.3.2/src/hunspell/affentry.hxx 2012-08-13 12:08:48.568996730 +0200 +@@ -27,7 +27,7 @@ + struct hentry * checkword(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); + +- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); + + char * check_morph(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); +@@ -90,7 +90,7 @@ + // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); + const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); + +- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); + + char * check_twosfx_morph(const char * word, int len, int optflags, + PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 65ca45b70be8..920a703d813f 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -46,7 +46,9 @@ PATCH_FILES=\ hunspell-wntconfig.patch \ hunspell-solaris.patch \ hunspell-1.3.2-overflow.patch \ - hunspell-android.patch + hunspell-android.patch \ + hunspell-1.3.2-nullptr.patch \ + hunspell-1.3.2-literal.patch .IF "$(GUI)"=="UNX" |