- Drop ABI breaking hunspell-1.2.2-xulrunner.pita.patch and fix the

hunspell include in xulrunner.
This commit is contained in:
Kristian Høgsberg 2008-07-22 19:06:42 +00:00
parent 8dfc92a0d9
commit 8f20aee693
2 changed files with 5 additions and 45 deletions

View File

@ -1,42 +0,0 @@
--- 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
*/
- Hunspell(const char * affpath, const char * dpath, const char * key = NULL);
+ Hunspell(const char * affpath, const char * dpath);
+ Hunspell(const char * affpath, const char * dpath, const char * key);
~Hunspell();
/* load extra dictionaries (only dic files) */
@@ -181,7 +181,7 @@
const char * get_xml_pos(const char * s, const char * attr);
int get_xml_list(char ***slst, char * list, char * tag);
int check_xml_par(char * q, char * attr, char * value);
-
+ 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;

View File

@ -1,7 +1,7 @@
Name: hunspell
Summary: Hunspell is a spell checker and morphological analyzer library
Version: 1.2.4.2
Release: 1%{?dist}
Release: 2%{?dist}
Source0: http://downloads.sourceforge.net/%{name}/hunspell-1.2.4-2.tar.gz
Source1: http://people.debian.org/~agmartin/misc/ispellaff2myspell
Group: System Environment/Libraries
@ -9,7 +9,6 @@ URL: http://hunspell.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: LGPLv2+ or GPLv2+ or MPLv1.1
BuildRequires: libtool, ncurses-devel
Patch0: hunspell-1.2.2-xulrunner.pita.patch
%description
Hunspell is a spell checker and morphological analyzer library and program
@ -27,7 +26,6 @@ Includes and definitions for developing with hunspell
%prep
%setup -q -n hunspell-1.2.4
%patch0 -p1 -b .pita.patch
# Filter unwanted Requires for the "use explicitely" string in ispellaff2myspell
cat << \EOF > %{name}-req
#!/bin/sh
@ -96,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/hunspell.3.gz
%changelog
* Tue Jul 22 2008 Kristian Høgsberg <krh@redhat.com> - 1.2.4.2-2
- Drop ABI breaking hunspell-1.2.2-xulrunner.pita.patch and fix the
hunspell include in xulrunner.
* Fri Jun 18 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.4.2-1
- latest version