* [gentoo-commits] repo/gentoo:master commit in: app-text/enchant/, app-text/enchant/files/
@ 2017-09-03 9:55 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-03 9:55 UTC (permalink / raw
To: gentoo-commits
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 <pacho@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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/enchant/, app-text/enchant/files/
@ 2018-03-24 15:17 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2018-03-24 15:17 UTC (permalink / raw
To: gentoo-commits
commit: c2f2346d2e643c00c90ddf75a3a4fc39b24cf1c3
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 15:10:36 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 15:10:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f2346d
app-text/enchant: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-text/enchant/Manifest | 1 -
app-text/enchant/enchant-1.6.0.ebuild | 62 ----------------------
.../files/enchant-1.6.0-hunspell140_fix.patch | 16 ------
3 files changed, 79 deletions(-)
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index a2f5158eb44..e9f343b8ca0 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,4 +1,3 @@
-DIST enchant-1.6.0.tar.gz 607018 BLAKE2B 623473ddc9fdddbfd7ce4861ec22ab8d4d4f790ee29b189056a809783fbd2a4f42c45ac3865a5533d9ea8be26a6825bc7ae957ee6e8a04db693791d1a9070a30 SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137
DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
diff --git a/app-text/enchant/enchant-1.6.0.ebuild b/app-text/enchant/enchant-1.6.0.ebuild
deleted file mode 100644
index 5a4e593dc79..00000000000
--- a/app-text/enchant/enchant-1.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils autotools
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="http://www.abisource.com/enchant/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${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 zemberek"
-REQUIRED_USE="|| ( hunspell aspell zemberek )"
-
-COMMON_DEPENDS="
- dev-libs/glib: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
-"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
- # http://bugzilla.abisource.com/show_bug.cgi?id=13772
- "${FILESDIR}/${P}-hunspell140_fix.patch"
- "${FILESDIR}/${P}-hunspell150_fix.patch"
-)
-
-src_prepare() {
- default
- sed -i \
- -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
- tests/Makefile.am || die
- mv configure.in configure.ac || die
- AT_M4DIR=ac-helpers eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable aspell) \
- $(use_enable hunspell myspell) \
- $(use_with hunspell system-myspell) \
- $(use_enable static-libs static) \
- $(use_enable zemberek) \
- --disable-ispell \
- --with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
- default
- prune_libtool_files --modules
-}
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
deleted file mode 100644
index 5d58ab7f540..00000000000
--- a/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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)
- {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-24 15:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-03 9:55 [gentoo-commits] repo/gentoo:master commit in: app-text/enchant/, app-text/enchant/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2018-03-24 15:17 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox