Date: Wed, 7 Aug 2024 19:13:37 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 24ae74c0e204 - main - textproc/aspell: fix build with clang 19 Message-ID: <202408071913.477JDbQ6096863@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=24ae74c0e2045c689b20b4e336e9ca9912fdb270 commit 24ae74c0e2045c689b20b4e336e9ca9912fdb270 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-08-07 18:19:32 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-08-07 19:07:16 +0000 textproc/aspell: fix build with clang 19 With clang 19 and gcc 15, textproc/aspell fails to compile, with errors similar to: 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<Parms>' 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<Parms>'; did you mean 'size_'? 186 | for (iterator i = begin(); i != this->e; ++i, ++this->_size); | ^~~~~ | size_ modules/speller/default/vector_hash.hpp:182:17: note: 'size_' declared here 182 | size_type size_; | ^ Upstream commit <https://github.com/GNUAspell/aspell/commit/ee6cbb1>; fixes this this, so add it as a PATCHFILES entry in the Makefile, until the next version of aspell is released. PR: 280675 Approved by: fluffy (maintainer) MFH: 2024Q3 --- textproc/aspell/Makefile | 3 +++ textproc/aspell/distinfo | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 107b7f6c6429..82cc849f8a08 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -5,6 +5,9 @@ PORTEPOCH= 1 CATEGORIES= textproc MASTER_SITES= GNU/aspell +PATCH_SITES= https://github.com/GNUAspell/${PORTNAME}/commit/ +PATCHFILES+= ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch:-p1 + MAINTAINER= office@FreeBSD.org COMMENT= Spelling checker with better suggestion logic than ispell WWW= http://aspell.net/ diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index b6d91c3e664d..023ad5a8640a 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1703061940 +TIMESTAMP = 1723053929 SHA256 (aspell-0.60.8.1.tar.gz) = d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b SIZE (aspell-0.60.8.1.tar.gz) = 3567205 +SHA256 (ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch) = 3dce45d8071bd4afd7b6c1319c090147b2b526322be45996598c64b07758a87c +SIZE (ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch) = 1976
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408071913.477JDbQ6096863>