From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-text/aspell/Manifest | 8 + app-text/aspell/aspell-0.60.7_rc1.ebuild | 100 ++++++++ app-text/aspell/files/aspell-0.60.5-nls.patch | 13 + app-text/aspell/files/aspell-0.60.5-solaris.patch | 27 ++ .../files/aspell-0.60.6-darwin-bundles.patch | 35 +++ app-text/aspell/files/aspell-0.60.6.1-clang.patch | 47 ++++ .../aspell/files/aspell-0.60.6.1-unicode.patch | 276 +++++++++++++++++++++ app-text/aspell/metadata.xml | 4 + 8 files changed, 510 insertions(+) create mode 100644 app-text/aspell/Manifest create mode 100644 app-text/aspell/aspell-0.60.7_rc1.ebuild create mode 100644 app-text/aspell/files/aspell-0.60.5-nls.patch create mode 100644 app-text/aspell/files/aspell-0.60.5-solaris.patch create mode 100644 app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch create mode 100644 app-text/aspell/files/aspell-0.60.6.1-clang.patch create mode 100644 app-text/aspell/files/aspell-0.60.6.1-unicode.patch create mode 100644 app-text/aspell/metadata.xml (limited to 'app-text/aspell') diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest new file mode 100644 index 000000000000..b57c3ea7e4c2 --- /dev/null +++ b/app-text/aspell/Manifest @@ -0,0 +1,8 @@ +AUX aspell-0.60.5-nls.patch 443 BLAKE2B be4f32ceeded1b55e0c5d5384bbd1ea9adf9148ad2b44e70254eacfb4347b43e1335942c562629ac9849ae9bb9ab4f2279ad78e40a24e9589aa7937234553cfe SHA512 579de3e40e6036701b02e0936cbe7a0aebfe09f5fef35241827d9a64eea024148d530cb1cd435d5c9307358940c1704309511cd633e45307546e7f5d30d97120 +AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db3063597e6770bdbc8fb1490fc52a0f0415690ea81a65ee8ac95b76cbf9c343f2918531df51c6b8095e45e8455282 SHA512 0386e629e77335cc42529134104ed62980c7b1a7bedf1b1925f78a2bd014c0db5292520bdd75152233464806527956761aa4795e7201569a9dbe365386ea8418 +AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb +AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f +AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98 +DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1 +EBUILD aspell-0.60.7_rc1.ebuild 2690 BLAKE2B 950e49305ac09a4552c73031d7b280282e0c34f89a210e4f6d43d47a5b3ad362285e80089178b60aee2b8567c71735da26cd01b6ba7156fbddedd58c594b787a SHA512 2a7ee108fb975808dd9c4514c021a87cb40e5fc084f50653ea9acc7bdcdc28b95c38d73a3ce5f44b5a5f35ca77a28ac0c1edbe5abc5bfdc106d9dacffbf1eb07 +MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild new file mode 100644 index 000000000000..eecfee4dcba2 --- /dev/null +++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic libtool toolchain-funcs + +MY_P="${P/_/-}" + +DESCRIPTION="A spell checker replacement for ispell" +HOMEPAGE="http://aspell.net/" +if [[ "${PV}" = *_rc* ]] ; then + SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz" +else + SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz" +fi + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="nls unicode" + +PDEPEND="app-dicts/aspell-en" +LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr +hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" +for lang in ${LANGS}; do + IUSE+=" l10n_${lang}" + case ${lang} in + de-1901) dict="de-alt" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; + esac + PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )" +done +unset dict lang LANGS + +# English dictionary 0.5 is incompatible with aspell-0.6 +RDEPEND=" + sys-libs/ncurses:0=[unicode?] + nls? ( virtual/libintl ) + !=app-dicts/aspell-en-0.5* +" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/${MY_P}" + +HTML_DOCS=( manual/aspell{,-dev}.html ) +PATCHES=( + "${FILESDIR}/${PN}-0.60.5-nls.patch" + "${FILESDIR}/${PN}-0.60.5-solaris.patch" + "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" + "${FILESDIR}/${PN}-0.60.6.1-clang.patch" + # includes fix for bug #467602 + "${FILESDIR}/${PN}-0.60.6.1-unicode.patch" +) + +src_prepare() { + default + + rm m4/lt* m4/libtool.m4 || die + eautoreconf + elibtoolize --reverse-deps + + # Parallel install of libtool libraries doesn't always work. + # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html + # This has to be after automake has run so that we don't clobber + # the default target that automake creates for us. + echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die + + # unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set + # any more. Fix this. + [[ ${CHOST} == *-darwin* ]] && use unicode && \ + append-cppflags -DNCURSES_WIDECHAR=1 +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable unicode) \ + --disable-static \ + --sysconfdir="${EPREFIX}"/etc/aspell +} + +src_install() { + default + + docinto examples + dodoc "${S}"/examples/*.c + + # install ispell/aspell compatibility scripts + newbin scripts/ispell ispell-aspell + newbin scripts/spell spell-aspell + + # we explicitly pass '--disable-static' to econf, + # hence we can delete .la files unconditionally + find "${D}" -name '*.la' -delete || die +} diff --git a/app-text/aspell/files/aspell-0.60.5-nls.patch b/app-text/aspell/files/aspell-0.60.5-nls.patch new file mode 100644 index 000000000000..3ea7c7c3f4ec --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.5-nls.patch @@ -0,0 +1,13 @@ +Index: aspell-0.60.5/Makefile.am +=================================================================== +--- aspell-0.60.5/Makefile.am ++++ aspell-0.60.5/Makefile.am +@@ -129,7 +129,7 @@ word_list_compress_SOURCES = prog/compre + + aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp + +-aspell_LDADD = libaspell.la $(CURSES_LIB) ++aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL) + + prezip_bin_SOURCES = prog/prezip.c + diff --git a/app-text/aspell/files/aspell-0.60.5-solaris.patch b/app-text/aspell/files/aspell-0.60.5-solaris.patch new file mode 100644 index 000000000000..1cfc5f3e6caa --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.5-solaris.patch @@ -0,0 +1,27 @@ +* grobian@gentoo.org: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be + defined when including wchar.h with g++ + +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -18,10 +18,6 @@ + + #include "settings.h" + +-#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +-# define _XOPEN_SOURCE_EXTENDED 1 +-#endif +- + #ifdef CURSES_NON_POSIX + #define CURSES_ONLY 1 + #endif +@@ -35,6 +31,10 @@ + + #include "gettext.h" + ++#ifdef DEFINE_XOPEN_SOURCE_EXTENDED ++# define _XOPEN_SOURCE_EXTENDED 1 ++#endif ++ + using namespace acommon; + + StackPtr state; diff --git a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch new file mode 100644 index 000000000000..84e05833d9d8 --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch @@ -0,0 +1,35 @@ +grobian@gentoo.org: +Darwin: fix for finding bundles (libtool modules, no equivalent in ELF) +This patch is not really upstreamable, bundles can have any name, but +Apple suggests using .bundle. libtool on Gentoo generates .bundle files +for modules on Darwin, so we need aspell to actually look for .bundle, +not .so. + +--- a/lib/new_filter.cpp ++++ b/lib/new_filter.cpp +@@ -458,11 +458,23 @@ + module->file.assign(option_file.str(), slash + 1 - option_file.str()); + //module->file += "lib"; + module->file += filter_name; +- module->file += "-filter.so"; ++ module->file += "-filter." ++#ifdef __APPLE_CC__ ++ "bundle" ++#else ++ "so" ++#endif ++ ; + } else { + if (module->file[0] != '/') + module->file.insert(0, option_file.str(), slash + 1 - option_file.str()); +- module->file += ".so"; ++ module->file += "." ++#ifdef __APPLE_CC__ ++ "bundle" ++#else ++ "so" ++#endif ++ ; + } + + return module.release(); diff --git a/app-text/aspell/files/aspell-0.60.6.1-clang.patch b/app-text/aspell/files/aspell-0.60.6.1-clang.patch new file mode 100644 index 000000000000..8d3e62dcdf0b --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.6.1-clang.patch @@ -0,0 +1,47 @@ +From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565 +--- a/interfaces/cc/aspell.h ++++ b/interfaces/cc/aspell.h +@@ -237,6 +237,7 @@ + /******************************** errors ********************************/ + + ++#ifndef ASPELL_ERRORS__HPP + extern const struct AspellErrorInfo * const aerror_other; + extern const struct AspellErrorInfo * const aerror_operation_not_supported; + extern const struct AspellErrorInfo * const aerror_cant_copy; +@@ -322,6 +323,7 @@ + extern const struct AspellErrorInfo * const aerror_bad_magic; + extern const struct AspellErrorInfo * const aerror_expression; + extern const struct AspellErrorInfo * const aerror_invalid_expression; ++#endif + + + /******************************* speller *******************************/ +--- a/prog/aspell.cpp ++++ b/prog/aspell.cpp +@@ -25,6 +25,7 @@ + # include + #endif + ++#include "errors.hpp" + #include "aspell.h" + + #ifdef USE_FILE_INO +@@ -40,7 +41,6 @@ + #include "convert.hpp" + #include "document_checker.hpp" + #include "enumeration.hpp" +-#include "errors.hpp" + #include "file_util.hpp" + #include "fstream.hpp" + #include "info.hpp" +--- a/prog/checker_string.hpp ++++ b/prog/checker_string.hpp +@@ -6,6 +6,7 @@ + + #include + ++#include "errors.hpp" + #include "aspell.h" + + #include "vector.hpp" diff --git a/app-text/aspell/files/aspell-0.60.6.1-unicode.patch b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch new file mode 100644 index 000000000000..8e1957c727a9 --- /dev/null +++ b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch @@ -0,0 +1,276 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + AC_CONFIG_SRCDIR(prog/aspell.cpp) + AC_CANONICAL_SYSTEM + AM_INIT_AUTOMAKE +-AM_CONFIG_HEADER(gen/settings.h) ++AC_CONFIG_HEADERS([gen/settings.h]) + + AM_MAINTAINER_MODE + +@@ -52,14 +52,11 @@ + AC_ARG_ENABLE(win32-relocatable, + [ --enable-win32-relocatable]) + +-AC_ARG_ENABLE(curses, +- AS_HELP_STRING([--enable-curses=LIBFILE],[cursor control library])) ++AC_ARG_ENABLE([curses], ++ AS_HELP_STRING([--enable-curses],[cursor control library])) + +-AC_ARG_ENABLE(curses-include, +- [ --enable-curses-include=DIR]) +- +-AC_ARG_ENABLE(wide-curses, +- AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control])) ++AC_ARG_ENABLE([unicode], ++ AS_HELP_STRING([--enable-unicode],[enable Unicode support])) + + AC_ARG_ENABLE(regex, + [ --disable-regex]) +@@ -312,197 +309,18 @@ + [AC_MSG_RESULT(no)] + ) + +-AC_SUBST(CURSES_LIB) +-AC_SUBST(CURSES_INCLUDE) +- +-if test "$enable_curses" != "no" +-then +- use_curses=t +- case "$enable_curses" in +- yes | "" ) ;; +- /* | *lib* | *.a | -l* | -L* ) CURSES_LIB="$enable_curses" ;; +- * ) CURSES_LIB=-l$enable_curses ;; +- esac +- case "$enable_curses_include" in +- yes | no | "") ;; +- -I* ) CURSES_INCLUDE="$enable_curses_include" ;; +- * ) CURSES_INCLUDE=-I$enable_curses_include ;; +- esac +-fi +- +-if test "$use_curses" +-then +- +- ORIG_LIBS="$LIBS" +- ORIG_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="$CURSES_INCLUDE $ORIG_CPPFLAGS" +- +- if test -z "$CURSES_LIB" +- then +- +- AC_MSG_CHECKING(for working curses library) +- +- if test "$enable_wide_curses" != "no" -a -n "$have_mblen" +- then +- LIBS="-lncursesw $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncursesw +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])]) +- fi +- +- if test -z "$CURSES_LIB" +- then +- LIBS="-lncurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- [ +- LIBS="-lncurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- [ +- LIBS="-lcurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lcurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- [ +- LIBS="-lncurses $ORIG_LIBS" +- AC_TRY_LINK( +- [#include ], [initscr()], +- [CURSES_LIB=-lncurses +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file])], +- ) ]) ]) ]) +- fi +- +- if test -n "$CURSES_LIB" +- then +- AC_MSG_RESULT([found in $CURSES_LIB]) +- else +- AC_MSG_RESULT([not found]) +- fi +- +- else +- +- AC_DEFINE(CURSES_HEADER, , [Defined to curses header file]) +- AC_DEFINE(TERM_HEADER, , [Defined to term header file]) +- +- fi +- +- if test -n "$CURSES_LIB" +- then +- LIBS="$CURSES_LIB $ORIG_LIBS" +- +- if test "$enable_wide_curses" != "no" +- then +- +- AC_MSG_CHECKING(for wide character support in curses libraray) +- if test -n "$have_mblen" +- then +- AC_TRY_LINK( +- [#include +- #include CURSES_HEADER +- ], +- [wchar_t wch = 0; +- addnwstr(&wch, 1);], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_WIDE_CURSES, 1, [Defined if curses libraray includes wide character support])], +- [ +- +- AC_TRY_LINK( +- [#define _XOPEN_SOURCE_EXTENDED 1 +- #include +- #include CURSES_HEADER +- ], +- [wchar_t wch = 0; +- addnwstr(&wch, 1);], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_WIDE_CURSES, 1) +- AC_DEFINE(DEFINE_XOPEN_SOURCE_EXTENDED, 1, +- [Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. +- (Can't define globally as that will cause problems with some systems)]) +- ], +- [AC_MSG_RESULT(no) +- AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])])]) +- else +- AC_MSG_RESULT([no, because "mblen" is not supported]) +- AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.]) +- fi +- +- fi +- +- AC_MSG_CHECKING(if standard curses include sequence will work) +- AC_TRY_LINK( +- [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +- # define _XOPEN_SOURCE_EXTENDED 1 +- #endif +- #include +- #include +- #include CURSES_HEADER +- #include TERM_HEADER +- ], +- [tigetstr(const_cast("cup"));], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBCURSES, 1, +- [Defined if the curses library is available]) +- posix_termios=t +- AC_DEFINE(CURSES_INCLUDE_STANDARD, 1, +- [Defined if no special Workarounds are needed for Curses headers])], +- [AC_MSG_RESULT(no) +- +- dnl else if +- AC_MSG_CHECKING(if curses workaround I will work) +- AC_TRY_LINK( +- [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED +- # define _XOPEN_SOURCE_EXTENDED 1 +- #endif +- #include +- #include +- #include CURSES_HEADER +- extern "C" {char * tigetstr(char * capname);}], +- [tigetstr(const_cast("cup"));], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBCURSES, 1, []) +- posix_termios=t +- AC_DEFINE(CURSES_INCLUDE_WORKAROUND_1, 1, +- [Defined if special Wordaround I is need for Curses headers])], +- [AC_MSG_RESULT(no) +- +- dnl else if +- AC_MSG_CHECKING(if curses without Unix stuff will work) +- AC_TRY_LINK( +- [#include CURSES_HEADER +- ], +- [initscr();], +- [AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBCURSES, 1, []) +- AC_DEFINE(CURSES_ONLY, 1, +- [Defined if curses like POSIX Functions should be used]) +- curses_only=t], +- [AC_MSG_RESULT(no) +- +- dnl else +- use_curses=false +- CURSES_LIBS="" +- CURSES_INCLUDE="" +- +- ]) ]) ]) +- +- fi +- +- CPPFLAGS="$ORIG_CPPFLAGS" +- LIBS="$ORIG_LIBS" +- +-fi ++AS_IF([test "x$enable_curses" != "xno"],[ ++ AS_IF([test "x$enable_unicode" != "xno"], ++ [AC_DEFINE([HAVE_WIDE_CURSES], [1], [Defined if curses library includes wide character support]) ++ ncurses_library="ncursesw"], ++ [ncurses_library="ncurses"]) ++ ++ PKG_CHECK_MODULES([NCURSES], ["$ncurses_library"]) ++ ++ AC_DEFINE([HAVE_LIBCURSES], [1], [Defined if the curses library is available]) ++ AC_DEFINE([CURSES_INCLUDE_STANDARD], [1], [Defined if no special Workarounds are needed for Curses headers]) ++ posix_termios=t ++]) + + if test -z "$posix_termios" -a -z "$curses_only" + then +--- a/Makefile.am ++++ b/Makefile.am +@@ -121,7 +121,7 @@ + # Aspell Program + # + +-AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" ++AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" $(NCURSES_CFLAGS) + + bin_PROGRAMS = word-list-compress aspell prezip-bin + +@@ -129,7 +129,7 @@ + + aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp + +-aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL) ++aspell_LDADD = libaspell.la $(NCURSES_LIBS) $(LTLIBINTL) + + prezip_bin_SOURCES = prog/prezip.c + +--- a/prog/check_funs.cpp ++++ b/prog/check_funs.cpp +@@ -62,11 +62,11 @@ + + #if HAVE_LIBCURSES + +-#include CURSES_HEADER ++#include + + #if CURSES_INCLUDE_STANDARD + +-#include TERM_HEADER ++#include + + #elif CURSES_INCLUDE_WORKAROUND_1 + diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml new file mode 100644 index 000000000000..097975e3adc2 --- /dev/null +++ b/app-text/aspell/metadata.xml @@ -0,0 +1,4 @@ + + + + -- cgit v1.2.3