yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-05-08 23:52:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

aspell: Backport a fix to build with gcc-15/clang-19

Browse Source 
(From OE-Core rev: d6cb53c0773d28f57b5699125ef825936d4725d1)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2024-08-30 00:13:38 -07:00 committed by Richard Purdie
parent 8f9eaecb3e
commit 68853a63af
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch Normal file
View File

@ -0,0 +1,42 @@
From d45bf96b0a3556acb2c83069a78eaaac973d31b4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 21 Jul 2024 22:01:50 +0100
Subject: [PATCH] modules/speller/default/vector_hash-t.hpp: fix gcc-15 build
Uncoming `gcc-15` added extra checks for template instantiation that is
guaranteed to fail in
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=313afcfdabeab3e6705ac0bd1273627075be0023
As a result `aspell` build now fails as:
In file included from modules/speller/default/readonly_ws.cpp:51:
modules/speller/default/vector_hash-t.hpp: In member function 'void aspeller::VectorHashTable<Parms>::recalc_size()':
modules/speller/default/vector_hash-t.hpp:186:43: error: 'class aspeller::VectorHashTable<Parms>' has no member named 'e'
186 | for (iterator i = begin(); i != this->e; ++i, ++this->_size);
| ^
modules/speller/default/vector_hash-t.hpp:186:59: error: 'class aspeller::VectorHashTable<Parms>' has no member named '_size'; did you mean 'size'?
186 | for (iterator i = begin(); i != this->e; ++i, ++this->_size);
| ^~~~~
| size
It looks like `_size` is `size_` mis-spelling and `e` was not introduced
here.
Upstream-Status: Backport [https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
modules/speller/default/vector_hash-t.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/speller/default/vector_hash-t.hpp b/modules/speller/default/vector_hash-t.hpp
index 969a80c..e4420b4 100644
--- a/modules/speller/default/vector_hash-t.hpp
+++ b/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(), e = end(); i != e; ++i, ++size_);
}
}

3
meta/recipes-support/aspell/aspell_0.60.8.1.bb
View File

@ -13,7 +13,8 @@ HOMEPAGE = "http://aspell.net/"
LICENSE = "LGPL-2.0-only | LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz"
SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz \
file://0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch"
SRC_URI[sha256sum] = "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b"
PACKAGECONFIG ??= ""