From 554d30967e779afa977c5c55af2cb33d240fca80 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Fri, 16 May 2008 13:59:29 +0000
Subject: [PATCH] Resolves: rhbz#446821 fix crash

---
 hunspell-1.2.2-xulrunner.pita.patch | 50 ++++++++++++++++++-----------
 hunspell.spec                       |  5 ++-
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/hunspell-1.2.2-xulrunner.pita.patch b/hunspell-1.2.2-xulrunner.pita.patch
index d1d0675..2bd6115 100644
--- a/hunspell-1.2.2-xulrunner.pita.patch
+++ b/hunspell-1.2.2-xulrunner.pita.patch
@@ -1,21 +1,5 @@
-diff -ru hunspell-1.2.2.orig/src/hunspell/hunspell.cxx hunspell-1.2.2/src/hunspell/hunspell.cxx
---- hunspell-1.2.2.orig/src/hunspell/hunspell.cxx	2008-05-14 20:49:20.000000000 +0100
-+++ hunspell-1.2.2/src/hunspell/hunspell.cxx	2008-05-14 20:53:44.000000000 +0100
-@@ -22,6 +22,11 @@
- #endif
- #endif
- 
-+Hunspell::Hunspell(const char * affpath, const char * dpath)
-+{
-+    Hunspell::Hunspell(affpath, dpath, NULL);
-+}
-+
- Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
- {
-     encoding = NULL;
-diff -ru hunspell-1.2.2.orig/src/hunspell/hunspell.hxx hunspell-1.2.2/src/hunspell/hunspell.hxx
---- hunspell-1.2.2.orig/src/hunspell/hunspell.hxx	2008-05-14 20:49:20.000000000 +0100
-+++ hunspell-1.2.2/src/hunspell/hunspell.hxx	2008-05-14 20:49:50.000000000 +0100
+--- hunspell-1.2.2.orig/src/hunspell/hunspell.hxx	2008-04-02 13:12:03.000000000 +0100
++++ hunspell-1.2.2/src/hunspell/hunspell.hxx	2008-05-16 14:49:12.000000000 +0100
 @@ -51,7 +51,8 @@
     * input: path of affix file and dictionary file
     */
@@ -26,3 +10,33 @@ diff -ru hunspell-1.2.2.orig/src/hunspell/hunspell.hxx hunspell-1.2.2/src/hunspe
    ~Hunspell();
  
    /* load extra dictionaries (only dic files) */
+@@ -170,7 +171,7 @@
+    int    insert_sug(char ***slst, char * word, int ns);
+    void   cat_result(char * result, char * st);
+    char * stem_description(const char * desc);
+-
++   void init(const char * affpath, const char * dpath, const char * key);
+ };
+ 
+ #endif
+--- hunspell-1.2.2.orig/src/hunspell/hunspell.cxx	2008-04-02 13:12:30.000000000 +0100
++++ hunspell-1.2.2/src/hunspell/hunspell.cxx	2008-05-16 14:49:50.000000000 +0100
+@@ -22,8 +22,18 @@
+ #endif
+ #endif
+ 
++Hunspell::Hunspell(const char * affpath, const char * dpath)
++{
++    init(affpath, dpath, NULL);
++}
++
+ Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key)
+ {
++    init(affpath, dpath, key);
++}
++
++void Hunspell::init(const char * affpath, const char * dpath, const char * key)
++{
+     encoding = NULL;
+     csconv = NULL;
+     utf8 = 0;
diff --git a/hunspell.spec b/hunspell.spec
index dca6b7f..7bf12a8 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
 Version:   1.2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Group:     System Environment/Libraries
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hunspell.pc
 
 %changelog
+* Fri May 16 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.2-3
+- Resolves: rhbz#446821 fix crash
+
 * Wed May 14 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.2-2
 - give xulrunner what it needs so we can get on with it