[hunspell] 80/98: Imported Debian patch 1.2.14-4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit 4392b47b87033e58b9fc048ea9c6991200862410
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 10 11:50:31 2011 +0000
Imported Debian patch 1.2.14-4
---
debian/changelog | 7 +++++++
debian/patches/18_fix_mkallcap_calls.dpatch | 26 ++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 48f6987..7649288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hunspell (1.2.14-4) unstable; urgency=low
+
+ * debian/patches/18_fix_mkallcap_calls.dpatch: also add fix another
+ part calling mkallcap (closes: #612542)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 10 Feb 2011 11:50:31 +0000
+
hunspell (1.2.14-3) unstable; urgency=low
* debian/patches/18_fix_mkallcap_calls.dpatch: backport fix from 1.2.15
diff --git a/debian/patches/18_fix_mkallcap_calls.dpatch b/debian/patches/18_fix_mkallcap_calls.dpatch
index c08b69d..f9debd4 100644
--- a/debian/patches/18_fix_mkallcap_calls.dpatch
+++ b/debian/patches/18_fix_mkallcap_calls.dpatch
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hunspell-1.2.14~/src/hunspell/suggestmgr.cxx hunspell-1.2.14/src/hunspell/suggestmgr.cxx
---- hunspell-1.2.14~/src/hunspell/suggestmgr.cxx 2011-02-09 14:41:49.000000000 +0000
-+++ hunspell-1.2.14/src/hunspell/suggestmgr.cxx 2011-02-09 14:44:33.000000000 +0000
+--- hunspell-1.2.14~/src/hunspell/suggestmgr.cxx 2011-02-10 11:47:04.000000000 +0000
++++ hunspell-1.2.14/src/hunspell/suggestmgr.cxx 2011-02-10 11:50:16.000000000 +0000
@@ -1043,8 +1043,15 @@
char target[MAXSWUTF8L];
char candidate[MAXSWUTF8L];
@@ -26,3 +26,25 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
phonet(candidate, target, n, *ph);
}
+@@ -1067,11 +1074,18 @@
+ }
+
+ if (ph && (sc > 2) && (abs(n - (int) hp->clen) <= 3)) {
+- char target2[MAXSWUTF8L];
++ char target2[MAXSWUTF8L];
++ if (utf8) {
++ w_char _w[MAXSWL];
++ int _wl = u8_u16(_w, MAXSWL, HENTRY_WORD(hp));
++ mkallcap_utf(_w, _wl, langnum);
++ u16_u8(candidate, MAXSWUTF8L, _w, _wl);
++ } else {
+ strcpy(candidate, HENTRY_WORD(hp));
+ mkallcap(candidate, csconv);
+- phonet(candidate, target2, -1, *ph);
+- scphon = 2 * ngram(3, target, target2, NGRAM_LONGER_WORSE);
++ }
++ phonet(candidate, target2, -1, *ph);
++ scphon = 2 * ngram(3, target, target2, NGRAM_LONGER_WORSE);
+ }
+
+ if (sc > scores[lp]) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: