From 3237a77a9ca8b73d7b27ce9dc95f82565111ae93 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Fri, 13 Oct 2023 14:39:54 +0200
Subject: [PATCH] hunspell: autoreconf needs PATH
---
components/text/hunspell/manifests/sample-manifest.p5m | 12 ------------
components/text/hunspell/patches/03-dict-paths.patch | 12 ++++++------
components/text/hunspell/Makefile | 7 +++++--
3 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/components/text/hunspell/Makefile b/components/text/hunspell/Makefile
index 042920b..b7ca17e 100644
--- a/components/text/hunspell/Makefile
+++ b/components/text/hunspell/Makefile
@@ -20,7 +20,7 @@
COMPONENT_NAME= hunspell
COMPONENT_VERSION= 1.7.2
-COMPONENT_REVISION= 1
+COMPONENT_REVISION= 2
COMPONENT_SUMMARY= Hunspell is a free spell checker and morphological analyzer library and command-line tool
COMPONENT_PROJECT_URL= https://hunspell.github.io/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -39,7 +39,7 @@
CFLAGS += $(CPP_XPG6MODE)
-COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -vif )
+COMPONENT_PREP_ACTION = ( cd $(@D) && PATH="$(PATH)" autoreconf -vif )
# Missing files in build dir without this.
COMPONENT_PRE_CONFIGURE_ACTION = ( $(CLONEY) $(SOURCE_DIR) $(@D) )
@@ -51,6 +51,9 @@
CONFIGURE_OPTIONS += --with-ui
CONFIGURE_OPTIONS += --with-readline
+# Drop 32-bit binaries
+COMPONENT_POST_INSTALL_ACTION += $(RM) -r $(PROTOUSRBINDIR32) ;
+
unexport SHELLOPTS
# Auto-generated dependencies
diff --git a/components/text/hunspell/manifests/sample-manifest.p5m b/components/text/hunspell/manifests/sample-manifest.p5m
index 43dc224..e56ba3f 100644
--- a/components/text/hunspell/manifests/sample-manifest.p5m
+++ b/components/text/hunspell/manifests/sample-manifest.p5m
@@ -23,18 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file path=usr/bin/$(MACH32)/affixcompress
-file path=usr/bin/$(MACH32)/analyze
-file path=usr/bin/$(MACH32)/chmorph
-file path=usr/bin/$(MACH32)/hunspell
-file path=usr/bin/$(MACH32)/hunzip
-file path=usr/bin/$(MACH32)/hzip
-file path=usr/bin/$(MACH32)/ispellaff2myspell
-file path=usr/bin/$(MACH32)/makealias
-file path=usr/bin/$(MACH32)/munch
-file path=usr/bin/$(MACH32)/unmunch
-file path=usr/bin/$(MACH32)/wordforms
-file path=usr/bin/$(MACH32)/wordlist2hunspell
file path=usr/bin/affixcompress
file path=usr/bin/analyze
file path=usr/bin/chmorph
diff --git a/components/text/hunspell/patches/03-dict-paths.patch b/components/text/hunspell/patches/03-dict-paths.patch
index d048402..25eb4fd 100644
--- a/components/text/hunspell/patches/03-dict-paths.patch
+++ b/components/text/hunspell/patches/03-dict-paths.patch
@@ -1,7 +1,7 @@
---- hunspell-1.3.4/src/tools/hunspell.cxx.1 2016-02-18 14:49:57.536075973 +0300
-+++ hunspell-1.3.4/src/tools/hunspell.cxx 2016-02-18 14:51:16.157456452 +0300
-@@ -112,9 +112,8 @@
- #include "odfparser.hxx"
+--- hunspell-1.7.2/src/tools/hunspell.cxx.orig
++++ hunspell-1.7.2/src/tools/hunspell.cxx
+@@ -116,9 +116,8 @@
+ #include "../parsers/odfparser.hxx"
#define LIBDIR \
- "/usr/share/hunspell:" \
@@ -10,5 +10,5 @@
+ "/usr/share/spell/hunspell:" \
+ "/usr/share/spell/myspell:" \
"/Library/Spelling"
- #define USEROOODIR \
- ".openoffice.org/3/user/wordbook:" \
+ #define USEROOODIR { \
+ ".openoffice.org/3/user/wordbook", \
--
Gitblit v1.9.3