commit: 811e0de86c3424efc4ea5c5eef2f66c4290bdf0e Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Sep 3 09:46:48 2017 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Sep 3 09:55:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811e0de8
app-text/enchant: version 1.6.1 → 2.1.0, bug #570030 Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-text/enchant/Manifest | 1 + app-text/enchant/enchant-2.1.0.ebuild | 54 ++++++++++++++++++++++ .../files/enchant-2.1.0-hunspell150_fix.patch | 25 ++++++++++ 3 files changed, 80 insertions(+) diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest index f9cb48bc021..75b1a3fd923 100644 --- a/app-text/enchant/Manifest +++ b/app-text/enchant/Manifest @@ -1,2 +1,3 @@ DIST enchant-1.6.0.tar.gz 607018 SHA256 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137 WHIRLPOOL f6677a11f1d05e210cbd6a7b13f3987ea93b3f1e73537b048093c14686b0310e75a89fdb8798ad0ed386a7e1cd793f60820006df8c1f7919c46c7245ee6a74c9 DIST enchant-1.6.1.tar.gz 642124 SHA256 bef0d9c0fef2e4e8746956b68e4d6c6641f6b85bd2908d91731efb68eba9e3f5 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036 WHIRLPOOL daffe1ee16e731d3d6ba56362f882c8f8bd7462a264fcf9caf05ed8093c0ca275977fb9c83c391d9e3287e6e98516b52e468c9bf9cc86532cf0b3eeba8f02fbd +DIST enchant-2.1.0.tar.gz 962857 SHA256 2cdda2d9edb62ad895c34be35c598d56ac5b9b9298f3dfdaa2b40a1914d1db7e SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27 WHIRLPOOL 4bb340288fffae6f8c6bc7bf21127ea812b79698d8be0f275e638fe47d1cd1c2b6b96b15fb0a0cec983d8b3db6c3e973e9521d86247c1e1df31f3db4ee80cb8f diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild new file mode 100644 index 00000000000..e3768516143 --- /dev/null +++ b/app-text/enchant/enchant-2.1.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Spellchecker wrapping library" +HOMEPAGE="https://abiword.github.io/enchant/"; +SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + +IUSE="aspell +hunspell static-libs test zemberek" +REQUIRED_USE="|| ( hunspell aspell zemberek )" + +# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742 +COMMON_DEPENDS=" + >=dev-libs/glib-2.6:2 + aspell? ( app-text/aspell ) + hunspell? ( >=app-text/hunspell-1.2.1:0= ) + zemberek? ( dev-libs/dbus-glib ) +" +RDEPEND="${COMMON_DEPENDS} + zemberek? ( app-text/zemberek-server ) +" +DEPEND="${COMMON_DEPENDS} + virtual/pkgconfig +" +# test? ( dev-libs/unittest++ ) + +PATCHES=( + # Fix build with hunspell 1.5 + # https://bugs.gentoo.org/show_bug.cgi?id=600952 + "${FILESDIR}"/${PN}-2.1.0-hunspell150_fix.patch +) + +RESTRICT="test" + +src_configure() { + econf \ + $(use_with aspell) \ + $(use_with hunspell) \ + $(use_enable static-libs static) \ + $(use_with zemberek) \ + --without-hspell \ + --without-voikko \ + --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/ +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch new file mode 100644 index 00000000000..1dac6c11ec5 --- /dev/null +++ b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch @@ -0,0 +1,25 @@ +From 87b36fd87d8ecc894850d82eed33f48d6c429cad Mon Sep 17 00:00:00 2001 +From: Pacho Ramos <pa...@gentoo.org> +Date: Sun, 3 Sep 2017 11:05:42 +0200 +Subject: [PATCH] Fix hunspell 1.5 support + +--- + providers/enchant_hunspell.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/providers/enchant_hunspell.cpp b/providers/enchant_hunspell.cpp +index 609f856..0bc360f 100644 +--- a/providers/enchant_hunspell.cpp ++++ b/providers/enchant_hunspell.cpp +@@ -312,7 +312,7 @@ HunspellChecker::requestDictionary(const char *szLang) + if(hunspell == NULL){ + return false; + } +- char *enc = hunspell->get_dic_encoding(); ++ const char *enc = hunspell->get_dic_encoding(); + + m_translate_in = g_iconv_open(enc, "UTF-8"); + m_translate_out = g_iconv_open("UTF-8", enc); +-- +2.14.1 +
