[hunspell] 78/98: Imported Debian patch 1.2.14-3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit 3ed1b3302b7073ad5cf62c7e42368e4655aa7357
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 9 14:38:49 2011 +0000
Imported Debian patch 1.2.14-3
---
debian/changelog | 7 +++++++
debian/patches/00list | 1 +
debian/patches/18_fix_mkallcap_calls.dpatch | 28 ++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 216d143..48f6987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hunspell (1.2.14-3) unstable; urgency=low
+
+ * debian/patches/18_fix_mkallcap_calls.dpatch: backport fix from 1.2.15
+ fixing mkallcap calls for utf(non-utf (closes: #612542)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 09 Feb 2011 14:38:49 +0000
+
hunspell (1.2.14-2) unstable; urgency=low
* upload to unstable
diff --git a/debian/patches/00list b/debian/patches/00list
index 6d7ea0e..05ed923 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
14_aspell_conv
16_1.2.4-2
+18_fix_mkallcap_calls
#99_build_stuff
diff --git a/debian/patches/18_fix_mkallcap_calls.dpatch b/debian/patches/18_fix_mkallcap_calls.dpatch
new file mode 100644
index 0000000..c08b69d
--- /dev/null
+++ b/debian/patches/18_fix_mkallcap_calls.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_fix_mkallcap_calls.dpatch by <rene@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@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
+@@ -1043,8 +1043,15 @@
+ char target[MAXSWUTF8L];
+ char candidate[MAXSWUTF8L];
+ if (ph) {
+- strcpy(candidate, word);
+- mkallcap(candidate, csconv);
++ if (utf8) {
++ w_char _w[MAXSWL];
++ int _wl = u8_u16(_w, MAXSWL, word);
++ mkallcap_utf(_w, _wl, langnum);
++ u16_u8(candidate, MAXSWUTF8L, _w, _wl);
++ } else {
++ strcpy(candidate, word);
++ mkallcap(candidate, csconv);
++ }
+ phonet(candidate, target, n, *ph);
+ }
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: