From a93ccb1a484034b39759ef775a9cbc9eb7d0c381 Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Jan 22 2008 13:21:49 +0000 Subject: - add gcc43 patch --- diff --git a/aspell-0.60.5-gcc43.patch b/aspell-0.60.5-gcc43.patch new file mode 100644 index 0000000..450a38c --- /dev/null +++ b/aspell-0.60.5-gcc43.patch @@ -0,0 +1,81 @@ +diff -up aspell-0.60.5/modules/speller/default/readonly_ws.cpp.pom aspell-0.60.5/modules/speller/default/readonly_ws.cpp +--- aspell-0.60.5/modules/speller/default/readonly_ws.cpp.pom 2006-11-18 10:17:19.000000000 +0100 ++++ aspell-0.60.5/modules/speller/default/readonly_ws.cpp 2008-01-22 13:11:19.000000000 +0100 +@@ -726,7 +726,7 @@ namespace { + struct WordLookupParms { + const char * block_begin; + WordLookupParms() {} +- typedef Vector Vector; ++ typedef acommon::Vector Vector; + typedef u32int Value; + typedef const char * Key; + static const bool is_multi = false; +diff -up aspell-0.60.5/modules/speller/default/affix.hpp.pom aspell-0.60.5/modules/speller/default/affix.hpp +--- aspell-0.60.5/modules/speller/default/affix.hpp.pom 2004-11-29 18:50:06.000000000 +0100 ++++ aspell-0.60.5/modules/speller/default/affix.hpp 2008-01-22 13:11:19.000000000 +0100 +@@ -109,7 +109,7 @@ namespace aspeller { + } + WordAff * expand_suffix(ParmString word, const unsigned char * new_aff, + ObjStack &, int limit = INT_MAX, +- unsigned char * new_aff = 0, WordAff * * * l = 0, ++ unsigned char * new_aff_2 = 0, WordAff * * * l = 0, + ParmString orig_word = 0) const; + + private: +diff -up aspell-0.60.5/modules/speller/default/affix.cpp.pom aspell-0.60.5/modules/speller/default/affix.cpp +--- aspell-0.60.5/modules/speller/default/affix.cpp.pom 2006-01-21 15:27:54.000000000 +0100 ++++ aspell-0.60.5/modules/speller/default/affix.cpp 2008-01-22 13:11:19.000000000 +0100 +@@ -193,7 +193,7 @@ struct CondsLookupParms { + typedef const Conds * Value; + typedef const char * Key; + static const bool is_multi = false; +- hash hfun; ++ ::hash hfun; + size_t hash(const char * s) {return hfun(s);} + bool equal(const char * x, const char * y) {return strcmp(x,y) == 0;} + const char * key(const Conds * c) {return c->str;} +diff -up aspell-0.60.5/prog/aspell.cpp.pom aspell-0.60.5/prog/aspell.cpp +--- aspell-0.60.5/prog/aspell.cpp.pom 2006-12-19 11:51:08.000000000 +0100 ++++ aspell-0.60.5/prog/aspell.cpp 2008-01-22 13:11:19.000000000 +0100 +@@ -1882,7 +1882,7 @@ struct SML_Parms { + typedef SML_WordEntry Value; + typedef const char * Key; + static const bool is_multi = false; +- hash hash; ++ ::hash hash; + bool equal(Key x, Key y) {return strcmp(x,y) == 0;} + Key key(const Value & v) {return v.word;} + }; +@@ -2033,7 +2033,7 @@ struct CML_Parms { + typedef CML_Entry Value; + typedef const char * Key; + static const bool is_multi = true; +- hash hash; ++ ::hash hash; + bool equal(Key x, Key y) {return strcmp(x,y) == 0;} + Key key(const Value & v) {return v.word;} + }; +diff -up aspell-0.60.5/common/string.hpp.pom aspell-0.60.5/common/string.hpp +--- aspell-0.60.5/common/string.hpp.pom 2004-11-29 18:50:05.000000000 +0100 ++++ aspell-0.60.5/common/string.hpp 2008-01-22 13:11:19.000000000 +0100 +@@ -492,7 +492,7 @@ namespace acommon { + + namespace std + { +- template<> static inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);} ++ template<> inline void swap(acommon::String & x, acommon::String & y) {return x.swap(y);} + } + + #endif +diff -up aspell-0.60.5/common/string_map.hpp.pom aspell-0.60.5/common/string_map.hpp +--- aspell-0.60.5/common/string_map.hpp.pom 2004-06-17 14:41:47.000000000 +0200 ++++ aspell-0.60.5/common/string_map.hpp 2008-01-22 14:00:24.000000000 +0100 +@@ -11,7 +11,7 @@ + #include "parm_string.hpp" + #include "posib_err.hpp" + #include "string_pair.hpp" +-#include "hash.hpp" ++#include "hash-t.hpp" + #include "objstack.hpp" + + diff --git a/aspell.spec b/aspell.spec index 76c6ee2..47e0476 100644 --- a/aspell.spec +++ b/aspell.spec @@ -1,7 +1,7 @@ Summary: A spelling checker Name: aspell Version: 0.60.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 12 License: LGPLv2 and MIT Group: Applications/Text @@ -11,6 +11,7 @@ Patch1: aspell-0.50.3-gcc33.patch Patch3: aspell-0.60.3-install_info.patch Patch5: aspell-0.60.5-fileconflict.patch Patch7: aspell-0.60.5-pspell_conf.patch +Patch8: aspell-0.60.5-gcc43.patch Requires: aspell-en BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext, ncurses-devel, pkgconfig @@ -52,6 +53,7 @@ static libraries and header files needed for Aspell development. %patch3 -p1 -b .iinfo %patch5 -p1 -b .fc %patch7 -p1 -b .mlib +%patch8 -p1 -b .gcc43 iconv -f windows-1252 -t utf-8 manual/aspell.info -o manual/aspell.info.aux mv manual/aspell.info.aux manual/aspell.info @@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/pspell-config.1* %changelog +* Tue Jan 22 2008 Ivana Varekova - 12:0.60.5-4 +- add gcc43 patch + * Thu Feb 8 2007 Ivana Varekova - 12:0.60.5-3 - incorporate package review feedback