From aff5f25d86a142084ca9b354c0a5e9b991885ae5 Mon Sep 17 00:00:00 2001
From: cannero <serunmal@gmail.com>
Date: Sat, 20 Apr 2024 14:31:08 +0200
Subject: [PATCH] Add hunspell (#4)

* add hunspell to include files, set extensions if zip exists

* line ending

* keep share/hunspell

* share exclusion for packaging
---
 .github/workflows/build_full.yml | 2 +-
 emacs-build.sh                   | 8 ++++++--
 scripts/hunspell.sh              | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_full.yml b/.github/workflows/build_full.yml
index e71bb6b..8b04c17 100644
--- a/.github/workflows/build_full.yml
+++ b/.github/workflows/build_full.yml
@@ -78,7 +78,7 @@ jobs:
 
       - name: Package Emacs
         if: runner.os == 'Windows'
-        run: .\emacs-build.cmd --nativecomp --slim --with-rsvg --hunspell --add-additional-files --pack-all
+        run: .\emacs-build.cmd --nativecomp --slim --debug-dependencies --with-rsvg --hunspell --add-additional-files --pack-all
       - name: Build and pack Emacs
         if: runner.os != 'Windows'
         run: |
diff --git a/emacs-build.sh b/emacs-build.sh
index 77bcc38..f8b14fe 100644
--- a/emacs-build.sh
+++ b/emacs-build.sh
@@ -257,6 +257,8 @@ function action3_package_deps ()
 
 function action3_add_additional_files ()
 {
+    # Copy the files from the additional_files directory to the install directory
+    #
     if [ ! -d "$emacs_build_root" ]; then
         echo "$emacs_install_dir does not exist, action must be run after install step"
         return -1
@@ -386,6 +388,7 @@ msvcrt
 pthread
 shell32
 user32
+hunspell-
 "
 
 exe_inclusions="
@@ -400,6 +403,7 @@ etags
 ld
 objdump
 gzip
+hunspell
 "
 
 dependency_slim_exclusions="
@@ -411,7 +415,7 @@ $build_type
 etc
 lib/((?!emacs)(?!gcc)(?![^/]*\.(a|o)$))
 lib/.*\.exe
-.*share/((?!licenses))
+.*share/((?!licenses)(?!hunspell))
 usr/lib/cmake
 usr/lib/gettext
 usr/lib/pkgconfig
@@ -424,7 +428,7 @@ var
 "
 
 packing_slim_exclusion="
-.*share/((?!emacs)(?!icons)(?!info)(?!licenses))
+.*share/((?!emacs)(?!icons)(?!info)(?!licenses)(?!hunspell))
 .*share/emacs/.*/lisp/leim
 "
 
diff --git a/scripts/hunspell.sh b/scripts/hunspell.sh
index 45df0ec..02abf9e 100644
--- a/scripts/hunspell.sh
+++ b/scripts/hunspell.sh
@@ -3,6 +3,8 @@ function action3_hunspell ()
     local hunspell_zip_file="$emacs_build_zip_dir/hunspell-${architecture}.zip"
     if test -f "$hunspell_zip_file"; then
         echo File $hunspell_zip_file already exists.
+        emacs_extensions="$hunspell_zip_file $emacs_extensions" \
+        && return 0
     else
         local packages="${mingw_prefix}-hunspell ${mingw_prefix}-hunspell-en"
         ensure_packages "$packages" \