pool/aspell
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aspell?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2008-07-25 14:47:10 +00:00 committed by Git OBS Bridge
parent c4296117ab
commit 53aa2419e8
6 changed files with 26 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aspell-0.60.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be46c7b2b5e97d7f8fa55aaec08c53b844a7bd146fb07bddcdd0b2e18881e737
size 1139037

3
aspell-0.60.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a2629ad31dfb7944e8df46ef7c99edfded815838a42df6206eca23e61b8505de
size 1194066

13
aspell-duplicate_name.patch
View File

@ -1,13 +0,0 @@
Index: aspell-0.60.4/modules/speller/default/affix.hpp
===================================================================
--- modules/speller/default/affix.hpp.orig
+++ modules/speller/default/affix.hpp
@@ -107,7 +107,7 @@ namespace aspeller {
{
return expand(word,aff,buf,0);
}
- WordAff * expand_suffix(ParmString word, const unsigned char * new_aff,
+ WordAff * expand_suffix(ParmString word, const unsigned char * aff,
ObjStack &, int limit = INT_MAX,
unsigned char * new_aff = 0, WordAff * * * l = 0,
ParmString orig_word = 0) const;

80
aspell-gcc4_3.patch
View File

@ -1,80 +0,0 @@
--- 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;}
};

7
aspell.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jul 25 10:37:20 CEST 2008 - lmichnovic@suse.cz
- update to version 0.60.6
* bugfix release
- obsoletes *duplicate_name.patch, *gcc4_3.patch
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de

26
aspell.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package aspell (Version 0.60.5)
# spec file for package aspell (Version 0.60.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -20,16 +20,16 @@ Recommends: aspell-en
Obsoletes: pspell
PreReq: %install_info_prereq
AutoReqProv: on
Version: 0.60.5
Release: 76
Version: 0.60.6
Release: 1
Summary: A Free and Open Source Spell Checker
Url: http://aspell.net/
Source: aspell-%{version}.tar.bz2
Patch1: aspell-strict-aliasing.patch
Patch2: aspell-duplicate_name.patch
#Patch2: aspell-duplicate_name.patch
Patch3: aspell-quotes.patch
Patch4: aspell-epmty_file.patch
Patch5: aspell-gcc4_3.patch
#Patch5: aspell-gcc4_3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -63,17 +63,16 @@ to develop applications that require these.
%prep
%setup -q
%patch1
%patch2
%patch3
%patch4
%patch5
%build
%{suse_update_config}
rm aclocal.m4
rm -f missing # Get newest from automake
#%{suse_update_config}
#rm aclocal.m4
#rm -f missing # Get newest from automake
gettextize -f
autoreconf -fi
libtoolize -f
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
@ -85,6 +84,9 @@ CXXFLAGS="$RPM_OPT_FLAGS" \
# dictionary files depend on endian, needs fix, then posible
# --enable-pkgdatadir=%{_prefix}/share/aspell-0.60 \
# --enable-dict-dir=%{_prefix}/share/aspell-0.60 \
#
# hack for non expanded $echo
sed -i 's/\$echo/echo/g' libtool
make %{?jobs:-j%jobs}
%install
@ -144,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libpspell.so
%changelog
* Fri Jul 25 2008 lmichnovic@suse.cz
- update to version 0.60.6
* bugfix release
- obsoletes *duplicate_name.patch, *gcc4_3.patch
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support