CVS commit: pkgsrc/textproc/aspell

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 15 12:31:31 UTC 2025

Modified Files:
        pkgsrc/textproc/aspell: distinfo
Added Files:
        pkgsrc/textproc/aspell/patches:
            patch-modules_speller_default_vector__hash-t.hpp

Log Message:
aspell: fix compile error with GCC 15


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/textproc/aspell/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/aspell/patches/patch-modules_speller_default_vector__hash-t.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/aspell/distinfo
diff -u pkgsrc/textproc/aspell/distinfo:1.35 pkgsrc/textproc/aspell/distinfo:1.36
--- pkgsrc/textproc/aspell/distinfo:1.35        Sun Dec 31 21:20:57 2023
+++ pkgsrc/textproc/aspell/distinfo     Tue Apr 15 12:31:30 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2023/12/31 21:20:57 wiz Exp $
+$NetBSD: distinfo,v 1.36 2025/04/15 12:31:30 tnn Exp $
 
 BLAKE2s (aspell-0.60.8.1.tar.gz) = f1adcb82ff9069159ba4347a385d550875e63cce02fcb4ab32be8477f1501a1c
 SHA512 (aspell-0.60.8.1.tar.gz) = 80fa9d7f5f4b8bf66388825ae28403713a2e3eda81fc31f2f452c3e2fe8349cd0fa8f0e4d0d3f8cffe215817229af25aa7be2dba358cb9cdc97e9d2834ba5ca7
@@ -13,5 +13,6 @@ SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f
 SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5
 SHA1 (patch-interfaces_cc_aspell.h) = f824d0bb1e3c55faaf6ecae10b44169d91b41517
 SHA1 (patch-modules_filter_modes_perl.amf) = b41aec9fcd8f9d4aef3e69622425c243279687eb
+SHA1 (patch-modules_speller_default_vector__hash-t.hpp) = ce1c3829b683a38ba912ee5fde489790fa51aac4
 SHA1 (patch-prog_aspell.cpp) = 9bc6537cd0b9040fef56be202f0c5f6ab64fdf85
 SHA1 (patch-prog_checker__string.hpp) = b070e776a0998f17e4ff30cd004179585f70f3df

Added files:

Index: pkgsrc/textproc/aspell/patches/patch-modules_speller_default_vector__hash-t.hpp
diff -u /dev/null pkgsrc/textproc/aspell/patches/patch-modules_speller_default_vector__hash-t.hpp:1.1
--- /dev/null   Tue Apr 15 12:31:31 2025
+++ pkgsrc/textproc/aspell/patches/patch-modules_speller_default_vector__hash-t.hpp     Tue Apr 15 12:31:31 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-modules_speller_default_vector__hash-t.hpp,v 1.1 2025/04/15 12:31:31 tnn Exp $
+
+Fix compile error with GCC 15:
+modules/speller/default/vector_hash-t.hpp:186:43: error: 'class aspeller::VectorHashTable<Parms>' has no member named 'e' [-Wtemplate-body]
+modules/speller/default/vector_hash-t.hpp:186:59: error: 'class aspeller::VectorHashTable<Parms>' has no member named '_size'
+
+--- modules/speller/default/vector_hash-t.hpp.orig     2025-04-15 12:26:52.594455930 +0000
++++ modules/speller/default/vector_hash-t.hpp
+@@ -183,7 +183,7 @@ namespace aspeller {
+   template<class Parms>
+   void VectorHashTable<Parms>::recalc_size() {
+     size_ = 0;
+-    for (iterator i = begin(); i != this->e; ++i, ++this->_size);
++    for (iterator i = begin(); i != end(); ++i, ++size_);
+   }
+ 
+ }