app-text/enchant: Fixed compilation with hunspell-1.4 (bug #583486).

Bumped to EAPI-6. Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler <[email protected]>
johu · Jul 27, 2016 · 362ac17 · 362ac17
1 parent faac97b
commit 362ac17
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/app-text/enchant/enchant-1.6.0.ebuild b/app-text/enchant/enchant-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 inherit eutils autotools
 
@@ -30,7 +30,12 @@ REQUIRED_USE="|| ( hunspell aspell zemberek )"
 
 DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 
+PATCHES=(
+	"${FILESDIR}/${P}-hunspell140_fix.patch"
+)
+
 src_prepare() {
+	default
 	sed -i \
 		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
 		tests/Makefile.am || die

diff --git a/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch b/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/583486
+http://bugzilla.abisource.com/show_bug.cgi?id=13772
+
+--- enchant-1.6.0/src/myspell/myspell_checker.cpp
++++ enchant-1.6.0/src/myspell/myspell_checker.cpp
+@@ -148,6 +148,10 @@
+ 		g_iconv_close(m_translate_out);
+ }
+
++#ifndef MAXWORDLEN
++#   define MAXWORDLEN 100
++#endif
++
+ bool
+ MySpellChecker::checkWord(const char *utf8Word, size_t len)
+ {