[gentoo-commits] repo/gentoo:master commit in: app-text/aspell/, app-text/aspell/files/
commit: d2ea6016b8050d2c9886517eb02660aba915a485
Author: Christopher Fore posteo net>
AuthorDate: Mon Jul 22 16:31:14 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 22 18:50:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ea6016
app-text/aspell: Fix compilation on GCC 15
- Add patch from upstream that addresses the error below
```
In member function 'void aspeller::VectorHashTable::recalc_size()':
error: 'class aspeller::VectorHashTable' has no member named 'e'
186 | for (iterator i = begin(); i != this->e; ++i, ++this->_size);
```
Closes: https://bugs.gentoo.org/936494
Signed-off-by: Christopher Fore posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/37673
Signed-off-by: Sam James gentoo.org>
app-text/aspell/aspell-0.60.8.1-r1.ebuild | 113 +
.../aspell/files/aspell-0.60.8.1-gcc-15-fix.patch | 39 +++
2 files changed, 152 insertions(+)
diff --git a/app-text/aspell/aspell-0.60.8.1-r1.ebuild
b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
new file mode 100644
index ..9a89d92f72db
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.8.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic libtool
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Free and Open Source spell checker designed to replace Ispell"
+HOMEPAGE="http://aspell.net/";
+SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="nls unicode"
+
+# All available language app-dicts/aspell-* packages.
+LANGUAGES=( af am ar ast az be bg bn br ca cs csb cy da de de-1901 el en eo es
et fa
+ fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it
kn ku
+ ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn no ny or pa pl pt-PT
pt-BR
+ qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu
+)
+
+for LANG in ${LANGUAGES[@]}; do
+ IUSE+=" l10n_${LANG}"
+
+ case ${LANG} in
+ de-1901)
+ DICT="de-alt"
+ ;;
+ pt-BR)
+ DICT="pt-br"
+ ;;
+ pt-PT)
+ DICT="pt"
+ ;;
+ *)
+ DICT="${LANG}"
+ ;;
+ esac
+
+ PDEPEND+=" l10n_${LANG}? ( app-dicts/aspell-${DICT} )"
+done
+unset DICT LANG LANGUAGES
+
+RDEPEND="
+ sys-libs/ncurses:=[unicode(+)?]
+ nls? ( virtual/libintl )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+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"
+ "${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+ "${FILESDIR}/${PN}-0.60.8.1-gcc-15-fix.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/msg3.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
+
+ # The unicode patch breaks on Darwin as NCURSES_WIDECHAR won't get set
any more.
+ [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode
&& append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ $(use_enable nls)
+ $(use_enable unicode)
+ --sysconfdir="${EPREFIX}"/etc/aspell
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ docinto examples
+ dodoc "${S}"/examples/*.c
+
+ # Install Aspell/Ispell compatibility scripts.
+ newbin scripts/ispell ispell-aspell
+ newbin scripts/spell spell-aspell
+
+ # As static build has been disabled,
+ # all .la files can be deleted unconditionally.
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
b/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
new file mode 100644
index ..e16b196b599f
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.8.1-gcc-15-fix.patch
@@ -0,0 +1,39 @@
+https://git.savannah.gnu.org/cgit/aspell.git/commit/?id=ee6cbb12ff36a1e6618d7388a78dd4e0a2b44
[gentoo-commits] repo/gentoo:master commit in: app-text/aspell/, app-text/aspell/files/
commit: 354f36b625a86e74d9d42e86cca496e2476c0e3a
Author: Michał Kępień kempniu pl>
AuthorDate: Wed Sep 7 09:36:12 2016 +
Commit: David Seifert gentoo org>
CommitDate: Fri Sep 9 21:01:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354f36b6
app-text/aspell: Fix building with Unicode support
* EAPI=6
* Use dep on sys-libs/ncurses using newly introduced IUSE="unicode"
* Made PATCHES -p1 compliant
* Fixed unicode handling by pulling in ncurses/ncursesw
using PKG_CHECK_MODULES instead of automagic discovery
in configure.ac
* Add missing '|| die' statements
Closes: https://github.com/gentoo/gentoo/pull/2269
Signed-off-by: David Seifert gentoo.org>
app-text/aspell/aspell-0.60.6.1-r4.ebuild | 90 +++
app-text/aspell/files/aspell-0.60.5-solaris.patch | 4 +-
.../files/aspell-0.60.6-darwin-bundles.patch | 4 +-
app-text/aspell/files/aspell-0.60.6.1-clang.patch | 12 +-
.../aspell/files/aspell-0.60.6.1-unicode.patch | 276 +
5 files changed, 376 insertions(+), 10 deletions(-)
diff --git a/app-text/aspell/aspell-0.60.6.1-r4.ebuild
b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
new file mode 100644
index ..b040ac6
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/";
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~sparc-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}"
+ # Need to keep linguas_* for now, since aspell uses gettext
+ IUSE+=" linguas_${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 )
+"
+
+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/msg3.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
+}
+
+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-solaris.patch
b/app-text/aspell/files/aspell-0.60.5-solaris.patch
index fc1920a..1cfc5f3 100644
--- a/app-text/aspell/files/aspell-0.60.5-solaris.patch
+++ b/app-text/aspell/files/aspell-0.60.5-solaris.patch
@@ -1,8 +1,8 @@
* grob...@gentoo.org: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be
defined when including wchar.h with g++
prog/check_funs.cpp
-+++ prog/check_funs.cpp
+--- a/prog/check_funs.cpp
b/prog/check_funs.cpp
@@ -18,10 +18,6 @@
#include "settings.h"
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
index 3917858..84e0583 100644
--- a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
+++ b/app-text/aspell/fil
[gentoo-commits] repo/gentoo:master commit in: app-text/aspell/, app-text/aspell/files/
commit: bf9a47c780ae3dd3d9b409198f1d9679e447507c
Author: Julian Ospald gentoo org>
AuthorDate: Tue Aug 18 13:06:11 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Tue Aug 18 13:06:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9a47c7
app-text/aspell: fix compilation with clang
Gentoo-Bug: 526804
Reported-by: Markus Ullmann
app-text/aspell/aspell-0.60.6.1-r2.ebuild | 3 +-
app-text/aspell/files/aspell-0.60.6.1-clang.patch | 47 +++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/app-text/aspell/aspell-0.60.6.1-r2.ebuild
b/app-text/aspell/aspell-0.60.6.1-r2.ebuild
index fb5fd3e..d24a04c 100644
--- a/app-text/aspell/aspell-0.60.6.1-r2.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1-r2.ebuild
@@ -57,7 +57,8 @@ src_prepare() {
epatch \
"${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-darwin-bundles.patch" \
+ "${FILESDIR}/${PN}-0.60.6.1-clang.patch"
rm m4/lt* m4/libtool.m4
eautoreconf
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 000..76cfaa8
--- /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
+--- interfaces/cc/aspell.h.orig2011-07-02 17:53:27.0 -0400
interfaces/cc/aspell.h 2015-07-29 11:23:32.0 -0400
+@@ -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 ***/
+--- prog/aspell.cpp.orig 2011-07-04 05:13:58.0 -0400
prog/aspell.cpp2015-07-29 11:22:57.0 -0400
+@@ -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"
+--- prog/checker_string.hpp.orig 2011-07-02 17:09:09.0 -0400
prog/checker_string.hpp2015-07-29 11:24:50.0 -0400
+@@ -6,6 +6,7 @@
+
+ #include
+
++#include "errors.hpp"
+ #include "aspell.h"
+
+ #include "vector.hpp"
