From c1111ad6dafcbb40ade74628b350b9a1fff01634 Mon Sep 17 00:00:00 2001 From: rillig Date: Thu, 27 Oct 2005 00:18:51 +0000 Subject: Added four patches that are required for the SunPro compiler. The package still does not build on Solaris, but at least it's making progress. --- textproc/aspell/distinfo | 6 +++- textproc/aspell/patches/patch-ah | 15 ++++++++++ textproc/aspell/patches/patch-ai | 64 ++++++++++++++++++++++++++++++++++++++++ textproc/aspell/patches/patch-aj | 15 ++++++++++ textproc/aspell/patches/patch-ak | 19 ++++++++++++ 5 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 textproc/aspell/patches/patch-ah create mode 100644 textproc/aspell/patches/patch-ai create mode 100644 textproc/aspell/patches/patch-aj create mode 100644 textproc/aspell/patches/patch-ak (limited to 'textproc/aspell') diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index 628f4aba314..1763eb5c6c5 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,7 +1,11 @@ -$NetBSD: distinfo,v 1.15 2005/06/28 14:17:49 wiz Exp $ +$NetBSD: distinfo,v 1.16 2005/10/27 00:18:51 rillig Exp $ SHA1 (aspell-0.60.3.tar.gz) = 90f9414947550b92f2a113b131d8c628cb7e7887 RMD160 (aspell-0.60.3.tar.gz) = 92e0dd8e271a48f73407e23c2d0246f2827e1789 Size (aspell-0.60.3.tar.gz) = 1635824 bytes SHA1 (patch-ac) = 4d20eebd29932f1ba970a9d85793fb8611d76ba8 SHA1 (patch-ag) = 04b34f2b780a632a5045120ae408ceea591a66de +SHA1 (patch-ah) = b38fa850bb3ff3c62c020fb45ce388888f145286 +SHA1 (patch-ai) = f5192b728bb9de6b5b0beeeaa8cc771bc3321aae +SHA1 (patch-aj) = 1bb74cbd4c6aaade00c0289e9f1ae5c992d2ea26 +SHA1 (patch-ak) = c4e228b8712c1e36bbeb8d268f83893cfeb4e620 diff --git a/textproc/aspell/patches/patch-ah b/textproc/aspell/patches/patch-ah new file mode 100644 index 00000000000..b3a787d62a7 --- /dev/null +++ b/textproc/aspell/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1 2005/10/27 00:18:51 rillig Exp $ + +The SunPro compiler does not like static inline template<>s. + +--- common/string.hpp.orig Mon Nov 29 18:50:05 2004 ++++ common/string.hpp Tue Oct 25 03:45:20 2005 +@@ -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 --git a/textproc/aspell/patches/patch-ai b/textproc/aspell/patches/patch-ai new file mode 100644 index 00000000000..9f1e7dd794a --- /dev/null +++ b/textproc/aspell/patches/patch-ai @@ -0,0 +1,64 @@ +$NetBSD: patch-ai,v 1.1 2005/10/27 00:18:51 rillig Exp $ + +The SunPro compiler does not like static inline template<>s. + +--- common/lsort.hpp.orig 2005-10-27 01:57:11.515745500 +0200 ++++ common/lsort.hpp 2005-10-27 01:57:40.246031300 +0200 +@@ -44,7 +44,7 @@ struct Less { + + + template +-static inline N * merge(N * x, N * y, const LT & lt, const NX & nx) ++inline N * merge(N * x, N * y, const LT & lt, const NX & nx) + { + if (lt(y,x)) swap(x,y); + N * first = x; +@@ -67,7 +67,7 @@ static inline N * merge(N * x, N * y, co + // THIS is SLOWER!!! + // and even slower when condational move is used!!!! + template +-static inline N * merge1(N * x, N * y, const LT & lt, const NX & nx) ++inline N * merge1(N * x, N * y, const LT & lt, const NX & nx) + { + N * * cur = lt(x,y) ? &x : &y; + N * first = *cur; +@@ -85,13 +85,13 @@ static inline N * merge1(N * x, N * y, c + } + + template +-static inline N * merge(N * x, N * y, const LT & lt) ++inline N * merge(N * x, N * y, const LT & lt) + { + return sort(x, y, lt, Next()); + } + + template +-static inline N * merge(N * x, N * y) ++inline N * merge(N * x, N * y) + { + return sort(x, y, Less(), Next()); + } +@@ -133,20 +133,20 @@ N * sort(N * first, const LT & lt, const + } + + template +-static inline N * sort(N * first, const LT & lt) ++inline N * sort(N * first, const LT & lt) + { + return sort(first, lt, Next()); + } + + template +-static inline N * sort(N * first) ++inline N * sort(N * first) + { + return sort(first, Less(), Next()); + } + + + template +-static inline N * fix_links(N * cur) ++inline N * fix_links(N * cur) + { + N * prev = 0; + while (cur) { diff --git a/textproc/aspell/patches/patch-aj b/textproc/aspell/patches/patch-aj new file mode 100644 index 00000000000..fceb7df67a6 --- /dev/null +++ b/textproc/aspell/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1 2005/10/27 00:18:51 rillig Exp $ + +To understand recursion, you first have to understand recursion. + +--- modules/speller/default/readonly_ws.cpp.orig 2005-06-26 02:43:33.000000000 +0200 ++++ modules/speller/default/readonly_ws.cpp 2005-10-27 01:59:36.217186900 +0200 +@@ -721,7 +721,7 @@ namespace { + struct WordLookupParms { + const char * block_begin; + WordLookupParms() {} +- typedef Vector Vector; ++ typedef aspeller::Vector Vector; + typedef u32int Value; + typedef const char * Key; + static const bool is_multi = false; diff --git a/textproc/aspell/patches/patch-ak b/textproc/aspell/patches/patch-ak new file mode 100644 index 00000000000..60269dfdfa3 --- /dev/null +++ b/textproc/aspell/patches/patch-ak @@ -0,0 +1,19 @@ +$NetBSD: patch-ak,v 1.1 2005/10/27 00:18:51 rillig Exp $ + +What happens if you call two parameters by the same name? It's a +compile-time error. What a surprise. + +--- modules/speller/default/affix.hpp.orig 2004-11-29 18:50:06.000000000 +0100 ++++ modules/speller/default/affix.hpp 2005-10-27 02:11:29.724080400 +0200 +@@ -107,9 +107,9 @@ 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 *, + ObjStack &, int limit = INT_MAX, +- unsigned char * new_aff = 0, WordAff * * * l = 0, ++ unsigned char * = 0, WordAff * * * l = 0, + ParmString orig_word = 0) const; + + private: -- cgit v1.2.3