From 8561d7c2c0136f62173db901762a2d818ec4d1b3 Mon Sep 17 00:00:00 2001
From: Khem Raj <khem.raj@oss.qualcomm.com>
Date: Sun, 27 Sep 2026 13:48:30 -0700
Subject: [PATCH] hunspell: upgrade 1.7.3 -> 1.7.4

- C++14 is now required (was optional C++11).
- test.sh gained a trace check driven by new tests/*.trace files; install
  them with the ptest data so it runs.
- Only pull in glibc-gconv-iso8859-* for glibc. They do not exist on
  musl, whose iconv has the ISO-8859 conversions built in, so the ptest
  package could not be installed there.

Changelog: https://github.com/hunspell/hunspell/compare/v1.7.3...v1.7.4

Tested with meta-oe-image-ptest-hunspell on qemux86-64 with
yoe-musl-systemd-wayland: 170 PASS, 0 FAIL. hunspell-native builds.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../{hunspell_1.7.3.bb => hunspell_1.7.4.bb}        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/hunspell/{hunspell_1.7.3.bb => hunspell_1.7.4.bb} (88%)

diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.3.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.4.bb
similarity index 88%
rename from meta-oe/recipes-support/hunspell/hunspell_1.7.3.bb
rename to meta-oe/recipes-support/hunspell/hunspell_1.7.4.bb
index 7d0921c25f..bdfe1bd4b1 100644
--- a/meta-oe/recipes-support/hunspell/hunspell_1.7.3.bb
+++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.4.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LESSER;md5=c96ca6c1de8adc025adfada81d06fba5 \
 "
 
-SRCREV = "c5f98152a274e25b5107101104bef632b83a0cc9"
+SRCREV = "92aa34b3f378ec115562fb06bd1728d566a339ec"
 SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https;tag=v${PV} \
            file://run-ptest \
 "
@@ -21,12 +21,12 @@ RDEPENDS:${PN}-ispell = "perl"
 do_install_ptest() {
     install -d ${D}${PTEST_PATH}/tests
     install -m 0755 ${S}/tests/test.sh ${D}${PTEST_PATH}/tests/
-    
+
     # Install test data files
-    for ext in dic aff good wrong sug morph root; do
+    for ext in dic aff good wrong sug morph root trace; do
         find ${S}/tests -maxdepth 1 -name "*.$ext" -exec cp {} ${D}${PTEST_PATH}/tests/ \;
     done
-    
+
     # Patch test.sh to use installed binaries
     sed -i 's|HUNSPELL="$(dirname $0)"/../src/tools/hunspell|HUNSPELL="${bindir}/hunspell"|' ${D}${PTEST_PATH}/tests/test.sh
     sed -i 's|ANALYZE="$(dirname $0)"/../src/tools/analyze|ANALYZE="${bindir}/analyze"|' ${D}${PTEST_PATH}/tests/test.sh
@@ -34,8 +34,9 @@ do_install_ptest() {
     sed -i 's|alias analyze=.*ANALYZE.*|alias analyze="$ANALYZE"|' ${D}${PTEST_PATH}/tests/test.sh
 }
 
-RDEPENDS:${PN}-ptest += " \
-    bash \
+RDEPENDS:${PN}-ptest += "bash"
+
+RDEPENDS:${PN}-ptest:append:libc-glibc = " \
     glibc-gconv-iso8859-1 \
     glibc-gconv-iso8859-2 \
     glibc-gconv-iso8859-15 \