From: Wang Mingyu <[email protected]> 0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch removed since it's included in 0.60.8.2
Signed-off-by: Wang Mingyu <[email protected]> --- ...default-vector_hash-t.hpp-fix-gcc-15.patch | 42 ------------------- ...{aspell_0.60.8.1.bb => aspell_0.60.8.2.bb} | 5 +-- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch rename meta/recipes-support/aspell/{aspell_0.60.8.1.bb => aspell_0.60.8.2.bb} (84%) diff --git a/meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch b/meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch deleted file mode 100644 index 4045e8e412..0000000000 --- a/meta/recipes-support/aspell/aspell/0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d45bf96b0a3556acb2c83069a78eaaac973d31b4 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -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 <[email protected]> ---- - 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_); - } - - } diff --git a/meta/recipes-support/aspell/aspell_0.60.8.1.bb b/meta/recipes-support/aspell/aspell_0.60.8.2.bb similarity index 84% rename from meta/recipes-support/aspell/aspell_0.60.8.1.bb rename to meta/recipes-support/aspell/aspell_0.60.8.2.bb index 43940b1e1b..5b4fab7c35 100644 --- a/meta/recipes-support/aspell/aspell_0.60.8.1.bb +++ b/meta/recipes-support/aspell/aspell_0.60.8.2.bb @@ -13,9 +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 \ - file://0001-modules-speller-default-vector_hash-t.hpp-fix-gcc-15.patch" -SRC_URI[sha256sum] = "d6da12b34d42d457fa604e435ad484a74b2effcd120ff40acd6bb3fb2887d21b" +SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz" +SRC_URI[sha256sum] = "57fe4863eae6048f72245a8575b44b718fb85ca14b9f8c0afc41b254dfd76919" PACKAGECONFIG ??= "" PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230712): https://lists.openembedded.org/g/openembedded-core/message/230712 Mute This Topic: https://lists.openembedded.org/mt/117716436/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
