From 63305bf297ebe50612d44ed06d3b1fbaa6af2e0a Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 8 Aug 2017 15:08:37 +0300 Subject: [PATCH] hunspell: host patch from gitweb.gentoo.org --- app-text/hunspell/hunspell-1.6.0.recipe | 18 +-- .../patches/hunspell-1.6.0-renameexes.patch | 124 ++++++++++++++++++ 2 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 app-text/hunspell/patches/hunspell-1.6.0-renameexes.patch diff --git a/app-text/hunspell/hunspell-1.6.0.recipe b/app-text/hunspell/hunspell-1.6.0.recipe index 4422c9a3a..3cab05b45 100644 --- a/app-text/hunspell/hunspell-1.6.0.recipe +++ b/app-text/hunspell/hunspell-1.6.0.recipe @@ -9,17 +9,14 @@ COPYRIGHT="2007-2016 Hunspell developers et al. LICENSE="GNU GPL v2 GNU LGPL v2.1 MPL v1.1" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/hunspell/hunspell/archive/v$portVersion.tar.gz" SOURCE_FILENAME="hunspell-$portVersion.tar.gz" CHECKSUM_SHA256="512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2" -PATCHES="hunspell-$portVersion.patchset" - -SOURCE_FILENAME_2="hunspell-1.6.0-renameexes.patch" -srcGitRev_2="5a4a9178064530f81ab0872bf262e16b0d60cb57" -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="ce11943935aac39c5e038fabfff01d2f30450b73c3cb62005675f209cce66036" - +PATCHES=" + hunspell-$portVersion.patchset + hunspell-$portVersion-renameexes.patch + " ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -68,11 +65,6 @@ BUILD_PREREQUIRES=" cmd:make " -PATCH() -{ - patch -p1 -i $sourceDir2/$SOURCE_FILENAME_2 -} - BUILD() { autoreconf -fi diff --git a/app-text/hunspell/patches/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/patches/hunspell-1.6.0-renameexes.patch new file mode 100644 index 000000000..6a75ce3fb --- /dev/null +++ b/app-text/hunspell/patches/hunspell-1.6.0-renameexes.patch @@ -0,0 +1,124 @@ +--- hunspell-1.6.0/src/tools/chmorph.cxx ++++ hunspell-1.6.0/src/tools/chmorph.cxx +@@ -58,11 +58,11 @@ + if (!argv[i]) { + fprintf( + 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 " + "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 " + " (convert informal Hungarian second person texts to formal third " + "person texts)\n"); + exit(1); +--- hunspell-1.6.0/src/tools/example.cxx ++++ hunspell-1.6.0/src/tools/example.cxx +@@ -53,9 +53,9 @@ + /* first parse the command line options */ + + 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, +- "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); + } + +--- hunspell-1.6.0/src/tools/Makefile.am ++++ hunspell-1.6.0/src/tools/Makefile.am +@@ -1,4 +1,4 @@ +-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip ++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip + + INCLUDES=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers + +@@ -6,8 +6,8 @@ + hunzip_SOURCES=hunzip.cxx + hunzip_LDADD = ../hunspell/libhunspell-1.6.la + +-munch_SOURCES=munch.cxx munch.h +-unmunch_SOURCES=unmunch.cxx unmunch.h ++hunspell_munch_SOURCES=munch.cxx munch.h ++hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h + + example_SOURCES=example.cxx + example_LDADD = ../hunspell/libhunspell-1.6.la +@@ -16,11 +16,11 @@ + hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \ + ../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@ + +-analyze_SOURCES=analyze.cxx +-analyze_LDADD = ../hunspell/libhunspell-1.6.la ++hunspell_analyze_SOURCES=analyze.cxx ++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la + +-chmorph_SOURCES=chmorph.cxx +-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la ++hunspell_chmorph_SOURCES=chmorph.cxx ++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la + + noinst_PROGRAMS=example + +--- hunspell-1.6.0/src/tools/munch.cxx ++++ hunspell-1.6.0/src/tools/munch.cxx +@@ -81,14 +81,14 @@ + wf = mystrdup(argv[1]); + } 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"); + exit(1); + } + if (argv[2]) { + af = mystrdup(argv[2]); + } 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"); + exit(1); + } + +--- hunspell-1.6.0/src/tools/unmunch.cxx ++++ hunspell-1.6.0/src/tools/unmunch.cxx +@@ -76,14 +76,14 @@ + wf = mystrdup(argv[1]); + } else { + fprintf(stderr, "correct syntax is:\n"); +- fprintf(stderr, "unmunch dic_file affix_file\n"); ++ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n"); + exit(1); + } + if (argv[2]) { + af = mystrdup(argv[2]); + } else { + fprintf(stderr, "correct syntax is:\n"); +- fprintf(stderr, "unmunch dic_file affix_file\n"); ++ fprintf(stderr, "hunspell-unmunch dic_file affix_file\n"); + exit(1); + } + +--- hunspell-1.6.0/tests/test.sh ++++ hunspell-1.6.0/tests/test.sh +@@ -74,7 +74,7 @@ + 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' + + if [ "$VALGRIND" != "" ]; then + rm -f $TEMPDIR/test.pid* +@@ -83,7 +83,7 @@ + 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