Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/enchant/files/, app-text/enchant/
Date: Wed, 27 Jul 2016 06:45:21
Message-Id: 1469601911.362ac174a1ebbfe4514ddc06a0c733a2f2580558.polynomial-c@gentoo
1 commit: 362ac174a1ebbfe4514ddc06a0c733a2f2580558
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 27 06:44:39 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 06:45:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362ac174
7
8 app-text/enchant: Fixed compilation with hunspell-1.4 (bug #583486).
9
10 Bumped to EAPI-6.
11
12 Package-Manager: portage-2.3.0
13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
14
15 app-text/enchant/enchant-1.6.0.ebuild | 9 +++++++--
16 .../enchant/files/enchant-1.6.0-hunspell140_fix.patch | 16 ++++++++++++++++
17 2 files changed, 23 insertions(+), 2 deletions(-)
18
19 diff --git a/app-text/enchant/enchant-1.6.0.ebuild b/app-text/enchant/enchant-1.6.0.ebuild
20 index 1e8800f..958d6b0 100644
21 --- a/app-text/enchant/enchant-1.6.0.ebuild
22 +++ b/app-text/enchant/enchant-1.6.0.ebuild
23 @@ -1,8 +1,8 @@
24 -# Copyright 1999-2012 Gentoo Foundation
25 +# Copyright 1999-2016 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 # $Id$
28
29 -EAPI=4
30 +EAPI=6
31
32 inherit eutils autotools
33
34 @@ -30,7 +30,12 @@ REQUIRED_USE="|| ( hunspell aspell zemberek )"
35
36 DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
37
38 +PATCHES=(
39 + "${FILESDIR}/${P}-hunspell140_fix.patch"
40 +)
41 +
42 src_prepare() {
43 + default
44 sed -i \
45 -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
46 tests/Makefile.am || die
47
48 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
49 new file mode 100644
50 index 0000000..5d58ab7
51 --- /dev/null
52 +++ b/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
53 @@ -0,0 +1,16 @@
54 +https://bugs.gentoo.org/583486
55 +http://bugzilla.abisource.com/show_bug.cgi?id=13772
56 +
57 +--- enchant-1.6.0/src/myspell/myspell_checker.cpp
58 ++++ enchant-1.6.0/src/myspell/myspell_checker.cpp
59 +@@ -148,6 +148,10 @@
60 + g_iconv_close(m_translate_out);
61 + }
62 +
63 ++#ifndef MAXWORDLEN
64 ++# define MAXWORDLEN 100
65 ++#endif
66 ++
67 + bool
68 + MySpellChecker::checkWord(const char *utf8Word, size_t len)
69 + {