This commit is contained in:
parent
84dfb53ff5
commit
a3ac486480
80
aspell-gcc4_3.patch
Normal file
80
aspell-gcc4_3.patch
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
--- common/string.hpp
|
||||||
|
+++ common/string.hpp
|
||||||
|
@@ -492,7 +492,7 @@
|
||||||
|
|
||||||
|
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
|
||||||
|
--- common/string_map.cpp
|
||||||
|
+++ common/string_map.cpp
|
||||||
|
@@ -37,7 +37,12 @@
|
||||||
|
i->second = buffer_.dup(i->second);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
+ // this requires hash-t.hpp
|
||||||
|
+ PosibErr<bool> StringMap::remove(ParmStr key)
|
||||||
|
+ {
|
||||||
|
+ return lookup_.erase(key);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
class StringMapEnumeration : public StringPairEnumeration {
|
||||||
|
StringMap::CIter_ i;
|
||||||
|
--- common/string_map.hpp
|
||||||
|
+++ common/string_map.hpp
|
||||||
|
@@ -96,7 +96,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
// removes an element. Returns true if the element existed.
|
||||||
|
- PosibErr<bool> remove(ParmStr key) {return lookup_.erase(key);}
|
||||||
|
+ PosibErr<bool> remove(ParmStr key);
|
||||||
|
|
||||||
|
// looks up an element. Returns null if the element did not exist.
|
||||||
|
// returns an empty string if the element exists but has a null value
|
||||||
|
--- modules/speller/default/affix.cpp
|
||||||
|
+++ modules/speller/default/affix.cpp
|
||||||
|
@@ -193,7 +193,7 @@
|
||||||
|
typedef const Conds * Value;
|
||||||
|
typedef const char * Key;
|
||||||
|
static const bool is_multi = false;
|
||||||
|
- hash<const char *> hfun;
|
||||||
|
+ acommon::hash<const char *> 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;}
|
||||||
|
--- modules/speller/default/readonly_ws.cpp
|
||||||
|
+++ modules/speller/default/readonly_ws.cpp
|
||||||
|
@@ -726,7 +726,7 @@
|
||||||
|
struct WordLookupParms {
|
||||||
|
const char * block_begin;
|
||||||
|
WordLookupParms() {}
|
||||||
|
- typedef Vector<u32int> Vector;
|
||||||
|
+ typedef acommon::Vector<u32int> Vector;
|
||||||
|
typedef u32int Value;
|
||||||
|
typedef const char * Key;
|
||||||
|
static const bool is_multi = false;
|
||||||
|
--- prog/aspell.cpp
|
||||||
|
+++ prog/aspell.cpp
|
||||||
|
@@ -1882,7 +1882,7 @@
|
||||||
|
typedef SML_WordEntry Value;
|
||||||
|
typedef const char * Key;
|
||||||
|
static const bool is_multi = false;
|
||||||
|
- hash<const char *> hash;
|
||||||
|
+ acommon::hash<const char *> hash;
|
||||||
|
bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
|
||||||
|
Key key(const Value & v) {return v.word;}
|
||||||
|
};
|
||||||
|
@@ -2033,7 +2033,7 @@
|
||||||
|
typedef CML_Entry Value;
|
||||||
|
typedef const char * Key;
|
||||||
|
static const bool is_multi = true;
|
||||||
|
- hash<const char *> hash;
|
||||||
|
+ acommon::hash<const char *> hash;
|
||||||
|
bool equal(Key x, Key y) {return strcmp(x,y) == 0;}
|
||||||
|
Key key(const Value & v) {return v.word;}
|
||||||
|
};
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 26 18:55:18 CEST 2007 - nadvornik@suse.cz
|
||||||
|
|
||||||
|
- fixed to compile with gcc 4.3 (gcc4_3.patch)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 22 15:29:31 CEST 2007 - lmichnovic@suse.cz
|
Wed Aug 22 15:29:31 CEST 2007 - lmichnovic@suse.cz
|
||||||
|
|
||||||
|
13
aspell.spec
13
aspell.spec
@ -12,22 +12,23 @@
|
|||||||
|
|
||||||
Name: aspell
|
Name: aspell
|
||||||
BuildRequires: gcc-c++ ncurses-devel
|
BuildRequires: gcc-c++ ncurses-devel
|
||||||
License: LGPL v2 or later
|
License: LGPL v2.1 or later
|
||||||
Group: Productivity/Text/Spell
|
Group: Productivity/Text/Spell
|
||||||
Provides: spell pspell
|
Provides: spell pspell
|
||||||
Recommends: aspell-en
|
Recommends: aspell-en
|
||||||
Obsoletes: pspell
|
Obsoletes: pspell
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
Autoreqprov: on
|
AutoReqProv: on
|
||||||
Version: 0.60.5
|
Version: 0.60.5
|
||||||
Release: 39
|
Release: 48
|
||||||
Summary: A Free and Open Source Spell Checker
|
Summary: A Free and Open Source Spell Checker
|
||||||
URL: http://aspell.net/
|
Url: http://aspell.net/
|
||||||
Source: aspell-%{version}.tar.bz2
|
Source: aspell-%{version}.tar.bz2
|
||||||
Patch1: aspell-strict-aliasing.patch
|
Patch1: aspell-strict-aliasing.patch
|
||||||
Patch2: aspell-duplicate_name.patch
|
Patch2: aspell-duplicate_name.patch
|
||||||
Patch3: aspell-quotes.patch
|
Patch3: aspell-quotes.patch
|
||||||
Patch4: aspell-epmty_file.patch
|
Patch4: aspell-epmty_file.patch
|
||||||
|
Patch5: aspell-gcc4_3.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -63,6 +64,7 @@ to develop applications that require these.
|
|||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
%patch4
|
%patch4
|
||||||
|
%patch5
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{suse_update_config}
|
%{suse_update_config}
|
||||||
@ -138,8 +140,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/lib*.la
|
%{_libdir}/lib*.la
|
||||||
%{_libdir}/libaspell.so
|
%{_libdir}/libaspell.so
|
||||||
%{_libdir}/libpspell.so
|
%{_libdir}/libpspell.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 26 2007 - nadvornik@suse.cz
|
||||||
|
- fixed to compile with gcc 4.3 (gcc4_3.patch)
|
||||||
* Wed Aug 22 2007 - lmichnovic@suse.cz
|
* Wed Aug 22 2007 - lmichnovic@suse.cz
|
||||||
- defining ncurses_wide library for configure to enable wide
|
- defining ncurses_wide library for configure to enable wide
|
||||||
UTF-8 characters [#266153]
|
UTF-8 characters [#266153]
|
||||||
|
Loading…
Reference in New Issue
Block a user