[hunspell] 57/98: Imported Debian patch 1.2.4-2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hunspell.
commit a40e05902f7c4ebb9b2d36e93ef5e371cff0d72a
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jun 19 02:46:39 2008 +0200
Imported Debian patch 1.2.4-2
---
debian/changelog | 6 ++++
debian/patches/00list | 1 +
debian/patches/16_2.4.1-2.dpatch | 69 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2f3cd68..e093fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hunspell (1.2.4-2) unstable; urgency=low
+
+ * add gcc compiler fixes from upstreams 2.4.1-2 release.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 19 Jun 2008 02:46:39 +0200
+
hunspell (1.2.4-1) unstable; urgency=medium
* New upstream release
diff --git a/debian/patches/00list b/debian/patches/00list
index 4354860..162f1f5 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
02_usr_share_myspell_dicts
14_aspell_conv
+16_2.4.1-2
99_build_stuff
diff --git a/debian/patches/16_2.4.1-2.dpatch b/debian/patches/16_2.4.1-2.dpatch
new file mode 100644
index 0000000..7ea4c42
--- /dev/null
+++ b/debian/patches/16_2.4.1-2.dpatch
@@ -0,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_2.4.1-2.dpatch by <rene@frodo>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad hunspell-1.2.4~/ChangeLog hunspell-1.2.4/ChangeLog
+--- hunspell-1.2.4~/ChangeLog 2008-06-19 02:49:14.000000000 +0200
++++ hunspell-1.2.4/ChangeLog 2008-06-19 02:49:33.000000000 +0200
+@@ -1,5 +1,10 @@
++2008-06-18 Németh László <nemeth at OOo>:
++ * src/hunspell/affixmgr.cxx: fix GCC compiler warnings
++ (comparisons with string literal results in unspecified behaviour).
++ The problem reported by Ladislav Michnovič.
++
+ 2008-06-17 Németh László <nemeth at OOo>:
+- * src/{hunspell.cxx,hunspell.h}: add free_list() to the C and
++ * src/hunspell/{hunspell.cxx,hunspell.h}: add free_list() to the C and
+ C++ interface to deallocate suggestion lists. The problem
+ reported by Laurie Mercer and Christophe Paris.
+ * csutil.cxx: fix freelist() to deallocate non-NULL list, when n = 0.
+diff -urNad hunspell-1.2.4~/NEWS hunspell-1.2.4/NEWS
+--- hunspell-1.2.4~/NEWS 2008-06-19 02:49:14.000000000 +0200
++++ hunspell-1.2.4/NEWS 2008-06-19 02:49:33.000000000 +0200
+@@ -1,3 +1,6 @@
++2008-06-18: Hunspell 1.2.4-2 release:
++ - fix GCC compiler warnings
++
+ 2008-06-17: Hunspell 1.2.4 release:
+ - add free_list() for C, C++ interfaces to deallocate suggestion lists
+
+diff -urNad hunspell-1.2.4~/src/hunspell/affixmgr.cxx hunspell-1.2.4/src/hunspell/affixmgr.cxx
+--- hunspell-1.2.4~/src/hunspell/affixmgr.cxx 2008-06-19 02:49:14.000000000 +0200
++++ hunspell-1.2.4/src/hunspell/affixmgr.cxx 2008-06-19 02:49:33.000000000 +0200
+@@ -148,11 +148,11 @@
+ sStart[j] = NULL;
+ }
+
+- if (keystring && keystring != SPELL_KEYSTRING) free(keystring);
++ if (keystring) free(keystring);
+ keystring=NULL;
+ if (trystring) free(trystring);
+ trystring=NULL;
+- if (encoding && encoding != SPELL_ENCODING) free(encoding);
++ if (encoding) free(encoding);
+ encoding=NULL;
+ if (maptable) {
+ for (int j=0; j < nummap; j++) {
+@@ -2972,9 +2972,7 @@
+ // return text encoding of dictionary
+ char * AffixMgr::get_encoding()
+ {
+- if (! encoding ) {
+- encoding = SPELL_ENCODING;
+- }
++ if (! encoding ) encoding = mystrdup(SPELL_ENCODING);
+ return mystrdup(encoding);
+ }
+
+@@ -3023,7 +3021,7 @@
+ // return the keyboard string for suggestions
+ char * AffixMgr::get_key_string()
+ {
+- if (! keystring ) keystring = SPELL_KEYSTRING;
++ if (! keystring ) keystring = mystrdup(SPELL_KEYSTRING);
+ return mystrdup(keystring);
+ }
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
Reply to: