diff --git a/textproc/aspell/Portfile b/textproc/aspell/Portfile index 6b140a4cddc..1a2be653d2c 100644 --- a/textproc/aspell/Portfile +++ b/textproc/aspell/Portfile @@ -3,11 +3,11 @@ PortSystem 1.0 name aspell -version 0.60.8.1 +version 0.60.8.2 revision 0 -checksums rmd160 8bd3e99a91d94a0fd720d341ed22ccbce7af11de \ - sha256 d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b \ - size 3567205 +checksums rmd160 01f04348a9264417f19f9f18a572b9bf195e18c9 \ + sha256 57fe4863eae6048f72245a8575b44b718fb85ca14b9f8c0afc41b254dfd76919 \ + size 3582264 set branch [join [lrange [split ${version} .] 0 1] .] categories textproc @@ -29,8 +29,6 @@ depends_lib port:gettext-runtime \ port:ncurses \ port:texinfo -patchfiles-append vector_hash-t.hpp.patch - # Teach glibtool to pass -stdlib at link time. use_autoreconf yes autoreconf.args -fvi diff --git a/textproc/aspell/files/vector_hash-t.hpp.patch b/textproc/aspell/files/vector_hash-t.hpp.patch deleted file mode 100644 index 99336df8da5..00000000000 --- a/textproc/aspell/files/vector_hash-t.hpp.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix: - -In file included from modules/speller/default/readonly_ws.cpp:51: -modules/speller/default/vector_hash-t.hpp:186:43: error: no member named 'e' in 'VectorHashTable' - 186 | for (iterator i = begin(); i != this->e; ++i, ++this->_size); - | ~~~~ ^ -modules/speller/default/vector_hash-t.hpp:186:59: error: no member named '_size' in 'VectorHashTable'; did you mean 'size_'? - 186 | for (iterator i = begin(); i != this->e; ++i, ++this->_size); - | ^~~~~ - | size_ - -https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041 ---- modules/speller/default/vector_hash-t.hpp.orig -+++ modules/speller/default/vector_hash-t.hpp -@@ -183,7 +183,7 @@ namespace aspeller { - template - void VectorHashTable::recalc_size() { - size_ = 0; -- for (iterator i = begin(); i != this->e; ++i, ++this->_size); -+ for (iterator i = begin(), e = end(); i != e; ++i, ++size_); - } - - }