commit: dedbd515e939ce8eda6cdd283986c776ffcb5092 Author: Bjorn Pagen <bjornpagen <AT> gmail <DOT> com> AuthorDate: Tue Oct 31 22:25:06 2017 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Thu Nov 2 01:19:50 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dedbd515
add app-text/enchant app-text/enchant/Manifest | 5 ++ app-text/enchant/enchant-1.6.1.ebuild | 62 ++++++++++++++++++++++ .../files/enchant-1.6.0-hunspell150_fix.patch | 12 +++++ .../musl-compile-fix-add-cc-tag-libtool.patch | 15 ++++++ app-text/enchant/metadata.xml | 13 +++++ .../musl-compile-fix-add-cc-tag-libtool.patch | 15 ++++++ 6 files changed, 122 insertions(+) diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest new file mode 100644 index 0000000..bbb0305 --- /dev/null +++ b/app-text/enchant/Manifest @@ -0,0 +1,5 @@ +AUX enchant-1.6.0-hunspell150_fix.patch 577 SHA256 113918ae07c492736a7fa359c86fe6f1e3c9582cd1b4a3f6fd0a0848a6a8c6f8 SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f WHIRLPOOL ab11f48c15b2444f4329cd10a428428fc43ec63233ea4f9333dbcb0d284bfc68b00feab79253d598f0a0455a3942fbc0243184036cdb2e810a42bb81647d0f55 +AUX musl-compile-fix-add-cc-tag-libtool.patch 313 SHA256 635608c3e1eb629f37fbcfee71715ee98090047e87913373fb88b78c0f911b3a SHA512 c88d17039f89e3ffd5323f78c2b57e7ada7ad094564ea26aa605aeab1da64e1778c757aa41b7486a617dfea4d5482372e80b08bd51c1561ff182c66e61ecdd6b WHIRLPOOL 479820c17d95a5e797094940dcf19aaa013a90cd8ae8a8051ebc49eecd979a6e25c452b1c73b21a84aa2e615066f4b60198328c404f33689fc1bfd06a5392d78 +DIST enchant-1.6.1.tar.gz 642124 SHA256 bef0d9c0fef2e4e8746956b68e4d6c6641f6b85bd2908d91731efb68eba9e3f5 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036 WHIRLPOOL daffe1ee16e731d3d6ba56362f882c8f8bd7462a264fcf9caf05ed8093c0ca275977fb9c83c391d9e3287e6e98516b52e468c9bf9cc86532cf0b3eeba8f02fbd +EBUILD enchant-1.6.1.ebuild 1690 SHA256 3c7c38f0db002502f5e276bf32dbde669a6936cd15c7e3a8e07ef753021beeb9 SHA512 6ab66eafe87ee8c946c0794603934f13d5d4f11e2814ad4f5188e0e892d47096e76b7fd6ee6ed476f476a8cc4a75de4a1df8c63eb05383afd1e0070193488c3d WHIRLPOOL a38a1ab8d38498ee34a2b1b420bef136099f6f5185aced14fc53b5c318687a2ea50c5c7835c36eb8a6eb55b1130d5ae61585c62f7d451ac9e5e6d05d2953dc1d +MISC musl-compile-fix-add-cc-tag-libtool.patch 313 SHA256 635608c3e1eb629f37fbcfee71715ee98090047e87913373fb88b78c0f911b3a SHA512 c88d17039f89e3ffd5323f78c2b57e7ada7ad094564ea26aa605aeab1da64e1778c757aa41b7486a617dfea4d5482372e80b08bd51c1561ff182c66e61ecdd6b WHIRLPOOL 479820c17d95a5e797094940dcf19aaa013a90cd8ae8a8051ebc49eecd979a6e25c452b1c73b21a84aa2e615066f4b60198328c404f33689fc1bfd06a5392d78 diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild new file mode 100644 index 0000000..0a937a8 --- /dev/null +++ b/app-text/enchant/enchant-1.6.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit versionator + +MY_PV="$(replace_all_version_separators '-')" +DESCRIPTION="Spellchecker wrapping library" +HOMEPAGE="https://abiword.github.io/enchant/"; +SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_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++ ) + +DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch +) + +src_prepare() { + default + eapply "${FILESDIR}/musl-compile-fix-add-cc-tag-libtool.patch" + sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die +} + +src_configure() { + econf \ + $(use_enable aspell) \ + $(use_enable hunspell myspell) \ + $(use_enable static-libs static) \ + $(use_enable zemberek) \ + --disable-hspell \ + --disable-ispell \ + --disable-uspell \ + --disable-voikko \ + --with-myspell-dir="${EPREFIX}"/usr/share/myspell/ +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch new file mode 100644 index 0000000..bd40c81 --- /dev/null +++ b/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch @@ -0,0 +1,12 @@ +diff -upr enchant-1.6.0.orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp +--- enchant-1.6.0.orig/src/myspell/myspell_checker.cpp 2016-11-26 16:04:05.689051339 +0200 ++++ enchant-1.6.0/src/myspell/myspell_checker.cpp 2016-11-26 16:05:11.380014568 +0200 +@@ -431,7 +431,7 @@ MySpellChecker::requestDictionary(const + if(myspell == NULL){ + return false; + } +- char *enc = myspell->get_dic_encoding(); ++ const char *enc = myspell->get_dic_encoding(); + + m_translate_in = g_iconv_open(enc, "UTF-8"); + m_translate_out = g_iconv_open("UTF-8", enc); diff --git a/app-text/enchant/files/musl-compile-fix-add-cc-tag-libtool.patch b/app-text/enchant/files/musl-compile-fix-add-cc-tag-libtool.patch new file mode 100644 index 0000000..e13a769 --- /dev/null +++ b/app-text/enchant/files/musl-compile-fix-add-cc-tag-libtool.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure.new +old mode 100755 +new mode 100755 +index 7d641bf..307d433 +--- a/configure ++++ b/configure +@@ -11038,7 +11038,7 @@ esac + LIBTOOL_DEPS=$ltmain + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CC' + + + diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml new file mode 100644 index 0000000..8a391be --- /dev/null +++ b/app-text/enchant/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag> + <flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag> + <flag name="zemberek">Adds support for <pkg>app-text/zemberek-server</pkg> spell checker server</flag> + </use> +</pkgmetadata> diff --git a/app-text/enchant/musl-compile-fix-add-cc-tag-libtool.patch b/app-text/enchant/musl-compile-fix-add-cc-tag-libtool.patch new file mode 100644 index 0000000..e13a769 --- /dev/null +++ b/app-text/enchant/musl-compile-fix-add-cc-tag-libtool.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure.new +old mode 100755 +new mode 100755 +index 7d641bf..307d433 +--- a/configure ++++ b/configure +@@ -11038,7 +11038,7 @@ esac + LIBTOOL_DEPS=$ltmain + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) $(top_builddir)/libtool --tag=CC' + + +
