haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

hunspell, bump version, cleanup (#4084)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-08-14 04:22:29 +02:00
committed by waddlesplash
parent c14ba2e0f7
commit e037660016
5 changed files with 44 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
app-text/hunspell/hunspell-1.5.4.recipe
View File

@@ -1,108 +0,0 @@
SUMMARY="Spellchecker, forked from myspell"
DESCRIPTION="Hunspell is a spell checker and morphological analyzer library \
and program designed for languages with rich morphology and complex word \
compounding or character encoding."
HOMEPAGE="https://hunspell.github.io/"
COPYRIGHT="2007-2016 Hunspell developers et al.
2002-2008 László Németh (Hunspell)
2001-2002 Kevin Hendricks (MySpell)"
LICENSE="GNU GPL v2
GNU LGPL v2.1
MPL v1.1"
REVISION="1"
SOURCE_URI="https://github.com/hunspell/hunspell/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59"
SOURCE_FILENAME="hunspell-$portVersion.tar.gz"
srcGitRev_2="f3a2e939f24bc4369f26c10019588db46a576c80"
SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/hunspell/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
CHECKSUM_SHA256_2="274a5632519986abd7824266dafa2e2073f3634df0a81efb72101b8cd9e8a94f"
SOURCE_FILENAME_2="hunspell-1.5.0-renameexes.patch"
PATCHES="hunspell-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
PROVIDES="
$portName = $portVersion
cmd:affixcompress$secondaryArchSuffix = $portVersion
cmd:hunspell$secondaryArchSuffix = $portVersion
cmd:hunspell_analyze$secondaryArchSuffix = $portVersion
cmd:hunspell_chmorph$secondaryArchSuffix = $portVersion
cmd:hunspell_munch$secondaryArchSuffix = $portVersion
cmd:hunspell_unmunch$secondaryArchSuffix = $portVersion
cmd:hunzip$secondaryArchSuffix = $portVersion
cmd:hzip$secondaryArchSuffix = $portVersion
cmd:ispellaff2myspell$secondaryArchSuffix = $portVersion
cmd:makealias$secondaryArchSuffix = $portVersion
cmd:wordforms$secondaryArchSuffix = $portVersion
cmd:wordlist2hunspell$secondaryArchSuffix = $portVersion
lib:libhunspell_${portVersion%.*}$secondaryArchSuffix = 0.0.0
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
hunspell${secondaryArchSuffix}_devel = $portVersion
devel:libhunspell_${portVersion%.*}$secondaryArchSuffix = 0.0.0
"
REQUIRES_devel="
hunspell$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
"
PATCH()
{
patch -p1 -i $sourceDir2/$SOURCE_FILENAME_2
}
BUILD()
{
libtoolize --force --copy --install
aclocal -I m4
autoconf
automake --add-missing
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
rm $libDir/charset.alias $libDir/*.la
# remove any existing (but empty) data/locale/*/LC_MESSAGES directory
rmdir $dataDir/locale/*/LC_MESSAGES $dataDir/locale/* || true
if [ -n "$secondaryArchSuffix" ]; then
rm -rf $dataDir $documentationDir
maybe_manDir_man3=
else
maybe_manDir_man3=$manDir/man3
fi
prepareInstalledDevelLibs libhunspell-${portVersion%.*}
fixPkgconfig
packageEntries devel \
$developDir \
$maybe_manDir_man3
}
TEST()
{
make check
}

7
app-text/hunspell/hunspell-1.6.2.recipe → app-text/hunspell/hunspell-1.7.0.recipe
View File

@@ -11,12 +11,9 @@ LICENSE="GNU GPL v2
MPL v1.1"
REVISION="1"
SOURCE_URI="https://github.com/hunspell/hunspell/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"
CHECKSUM_SHA256="bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a"
SOURCE_FILENAME="hunspell-$portVersion.tar.gz"
PATCHES="
hunspell-$portVersion.patchset
hunspell-$portVersion-renameexes.patch
"
PATCHES="hunspell-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"

30
app-text/hunspell/patches/hunspell-1.5.4.patchset
View File

@@ -1,30 +0,0 @@
From 0aa0f31df70d513ee575c8fbe852fff331d234f9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 21 Aug 2014 17:41:26 +0000
Subject: haiku gcc2
diff --git a/src/hunspell/hashmgr.cxx b/src/hunspell/hashmgr.cxx
index 0d5dbf5..7fd4e08 100644
--- a/src/hunspell/hashmgr.cxx
+++ b/src/hunspell/hashmgr.cxx
@@ -75,7 +75,6 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
-#include <limits>
#include <sstream>
#include "hashmgr.hxx"
@@ -506,7 +505,7 @@ int HashMgr::load_tables(const char* tpath, const char* key) {
int nExtra = 5 + USERWORD;
if (tablesize <= 0 ||
- (tablesize >= (std::numeric_limits<int>::max() - 1 - nExtra) /
+ (tablesize >= (INT_MAX - 1 - nExtra) /
int(sizeof(struct hentry*)))) {
HUNSPELL_WARNING(
stderr, "error: line 1: missing or bad word count in the dic file\n");
--
1.8.3.4

30
app-text/hunspell/patches/hunspell-1.6.2.patchset
View File

@@ -1,30 +0,0 @@
From 0aa0f31df70d513ee575c8fbe852fff331d234f9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 21 Aug 2014 17:41:26 +0000
Subject: haiku gcc2
diff --git a/src/hunspell/hashmgr.cxx b/src/hunspell/hashmgr.cxx
index 1de1690..7d5519d 100644
--- a/src/hunspell/hashmgr.cxx
+++ b/src/hunspell/hashmgr.cxx
@@ -75,7 +75,6 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
-#include <limits>
#include <sstream>
#include "hashmgr.hxx"
@@ -506,7 +505,7 @@ int HashMgr::load_tables(const char* tpath, const char* key) {
int nExtra = 5 + USERWORD;
if (tablesize <= 0 ||
- (tablesize >= (std::numeric_limits<int>::max() - 1 - nExtra) /
+ (tablesize >= (INT_MAX - 1 - nExtra) /
int(sizeof(struct hentry*)))) {
HUNSPELL_WARNING(
stderr, "error: line 1: missing or bad word count in the dic file\n");
--
1.8.3.4

85
app-text/hunspell/patches/hunspell-1.6.2-renameexes.patch → app-text/hunspell/patches/hunspell-1.7.0.patchset
View File

@@ -1,5 +1,11 @@
From dd70f0837ef1fbd287aa928683078f81d2c54d5d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 12 Aug 2019 07:48:24 +0200
Subject: Import previous patch to rename the binaries
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 176521e..bec62da 100644
index 1786e8e..190bffe 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,4 +1,4 @@
@@ -10,7 +16,7 @@ index 176521e..bec62da 100644
@@ -6,8 +6,8 @@ hzip_SOURCES=hzip.cxx
hunzip_SOURCES=hunzip.cxx
hunzip_LDADD = ../hunspell/libhunspell-1.6.la
hunzip_LDADD = ../hunspell/libhunspell-1.7.la
-munch_SOURCES=munch.cxx munch.h
-unmunch_SOURCES=unmunch.cxx unmunch.h
@@ -18,30 +24,25 @@ index 176521e..bec62da 100644
+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
example_SOURCES=example.cxx
example_LDADD = ../hunspell/libhunspell-1.6.la
@@ -16,15 +16,15 @@ hunspell_SOURCES=hunspell.cxx
example_LDADD = ../hunspell/libhunspell-1.7.la
@@ -17,11 +17,11 @@ nodist_hunspell_SOURCES= ../../config.h
hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
../hunspell/libhunspell-1.7.la @CURSESLIB@ @READLINELIB@
-analyze_SOURCES=analyze.cxx
-analyze_LDADD = ../hunspell/libhunspell-1.6.la
-analyze_LDADD = ../hunspell/libhunspell-1.7.la
+hunspell_analyze_SOURCES=analyze.cxx
+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
bulkcheck_SOURCES=bulkcheck.cxx
bulkcheck_LDADD = ../hunspell/libhunspell-1.6.la
+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.7.la
-chmorph_SOURCES=chmorph.cxx
-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
+hunspell_chmorph_SOURCES=chmorph.cxx
+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
-noinst_PROGRAMS=example bulkcheck
+noinst_PROGRAMS=example bulkcheck
noinst_PROGRAMS=example
dist_bin_SCRIPTS=makealias affixcompress wordforms ispellaff2myspell wordlist2hunspell
diff --git a/src/tools/chmorph.cxx b/src/tools/chmorph.cxx
index 0f42260..6573124 100644
index 6e5add6..037d403 100644
--- a/src/tools/chmorph.cxx
+++ b/src/tools/chmorph.cxx
@@ -55,11 +55,11 @@ int main(int, char** argv) {
@@ -50,17 +51,17 @@ index 0f42260..6573124 100644
stderr,
- "chmorph - change affixes by morphological analysis and generation\n"
- "correct syntax is:\nchmorph affix_file "
+ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
+ "correct syntax is:\nhunspell-chmorph affix_file "
+ "hunspell_chmorph - change affixes by morphological analysis and generation\n"
+ "correct syntax is:\nhunspell_chmorph affix_file "
"dictionary_file file_to_convert STRING1 STRING2\n"
"STRINGS may be arbitrary parts of the morphological descriptions\n"
- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+ "example: hunspell_chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
" (convert informal Hungarian second person texts to formal third "
"person texts)\n");
exit(1);
diff --git a/src/tools/example.cxx b/src/tools/example.cxx
index 42daea8..efb594f 100644
index 8213a5f..f386203 100644
--- a/src/tools/example.cxx
+++ b/src/tools/example.cxx
@@ -48,9 +48,9 @@ int main(int argc, char** argv) {
@@ -68,15 +69,15 @@ index 42daea8..efb594f 100644
if (argc < 4) {
- fprintf(stderr, "example (now it works with more dictionary files):\n");
+ fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
+ fprintf(stderr, "hunspell_example (now it works with more dictionary files):\n");
fprintf(stderr,
- "example affix_file dictionary_file(s) file_of_words_to_check\n");
+ "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+ "hunspell_example affix_file dictionary_file(s) file_of_words_to_check\n");
exit(1);
}
diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
index 5f51fc6..c8f8beb 100644
index 5f51fc6..bbfc024 100644
--- a/src/tools/munch.cxx
+++ b/src/tools/munch.cxx
@@ -78,14 +78,14 @@ int main(int argc, char** argv) {
@@ -84,7 +85,7 @@ index 5f51fc6..c8f8beb 100644
} else {
fprintf(stderr, "correct syntax is:\n");
- fprintf(stderr, "munch word_list_file affix_file\n");
+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+ fprintf(stderr, "hunspell_munch word_list_file affix_file\n");
exit(1);
}
if (argv[2]) {
@@ -92,12 +93,12 @@ index 5f51fc6..c8f8beb 100644
} else {
fprintf(stderr, "correct syntax is:\n");
- fprintf(stderr, "munch word_list_file affix_file\n");
+ fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+ fprintf(stderr, "hunspell_munch word_list_file affix_file\n");
exit(1);
}
diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx
index 82c2f9d..663e8ea 100644
index 82c2f9d..479c6e5 100644
--- a/src/tools/unmunch.cxx
+++ b/src/tools/unmunch.cxx
@@ -73,14 +73,14 @@ int main(int argc, char** argv) {
@@ -105,7 +106,7 @@ index 82c2f9d..663e8ea 100644
} else {
fprintf(stderr, "correct syntax is:\n");
- fprintf(stderr, "unmunch dic_file affix_file\n");
+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+ fprintf(stderr, "hunspell_unmunch dic_file affix_file\n");
exit(1);
}
if (argv[2]) {
@@ -113,29 +114,25 @@ index 82c2f9d..663e8ea 100644
} else {
fprintf(stderr, "correct syntax is:\n");
- fprintf(stderr, "unmunch dic_file affix_file\n");
+ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+ fprintf(stderr, "hunspell_unmunch dic_file affix_file\n");
exit(1);
}
diff --git a/tests/test.sh b/tests/test.sh
index 22e5087..4cd0924 100755
index 3fcf42c..7a9d7ef 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -74,7 +74,7 @@ fi
@@ -63,8 +63,8 @@ if [[ "$1" == "-i" && -n "$2" ]]; then
fi
shopt -s expand_aliases
alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
-alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
-[[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell
-[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/analyze
+[[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell_hunspell
+[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/hunspell_analyze
[[ "$LIBTOOL" = "" ]] && LIBTOOL="$(dirname $0)"/../libtool
alias hunspell='"$LIBTOOL" --mode=execute "$HUNSPELL"'
alias analyze='"$LIBTOOL" --mode=execute "$ANALYZE"'
--
2.21.0
if [ "$VALGRIND" != "" ]; then
rm -f $TEMPDIR/test.pid*
@@ -83,7 +83,7 @@ if [ "$VALGRIND" != "" ]; then
fi
alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
- alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
fi
# Tests good words