diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
| commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
| tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /app-editors/xmlcopyeditor | |
| parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) | |
gentoo resync : 22.10.2018
Diffstat (limited to 'app-editors/xmlcopyeditor')
| -rw-r--r-- | app-editors/xmlcopyeditor/Manifest | 3 | ||||
| -rw-r--r-- | app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch | 19 | ||||
| -rw-r--r-- | app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild (renamed from app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild) | 15 |
3 files changed, 30 insertions, 7 deletions
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest index a9d5d6b395b5..500e3d91072b 100644 --- a/app-editors/xmlcopyeditor/Manifest +++ b/app-editors/xmlcopyeditor/Manifest @@ -1,3 +1,4 @@ +AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d -EBUILD xmlcopyeditor-1.2.1.3.ebuild 921 BLAKE2B 1011f90af104285a39642c5d8d04f8dcef32d7523f4fcd07f8c39b887aed86bd5547173aed2a700b528089df8b97e3bdc0f42f62d7ee00dfd927dfebc9418e76 SHA512 c226e815d601d6551bc97a85d731379fb627d64a49f0e8a6e3993b4667968604fa3882b7a94b75713f0ff4f417038f71ddd92a3f34e0c0abc824aa242cc0e3c2 +EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 946 BLAKE2B f14b5b0458bd945036024ba1e60e6cdd93657e89c2f8c6f9c9dfc1121b83ac84acec69a9313223942571258cc9b8376641dcd40cd67f1709ea6ddca2aa280130 SHA512 7ce718160893430a6bc75e5a052798013964f28b15409f08e4d499068b58199c208292e6b6c9fe042dcadb9a17ca1cad62edcaa488ae0e3438243ced97be60a8 MISC metadata.xml 299 BLAKE2B d4eb8befeca3801e2b1c8762bc4fca6556be50259e1147ceb1f69ea9d952415e608c5c8bd117947cf1a67420ffa9a86dde85c1d1d3b388f59634764702b909e4 SHA512 8dd8d77282bf225c1d1f040808c10b766a361ac70d0c27a643d1c7a8654e2737570bd3f58238c907047decfa88ccb904ba2399d700fbbe04409c2269b89d9ef9 diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch new file mode 100644 index 000000000000..435b777b43d7 --- /dev/null +++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch @@ -0,0 +1,19 @@ +--- xmlcopyeditor-1.2.1.3.orig/configure.ac ++++ xmlcopyeditor-1.2.1.3/configure.ac +@@ -139,13 +139,9 @@ + AC_CHECK_HEADER(expat.h, , + AC_MSG_ERROR([Expat headers not found])) + +-# Check enchant is available +-PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"], +- # otherwise Check ASPELL is available +- [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"], +- AC_MSG_ERROR([Aspell headers not found]))] +-) +- ++# Check Aspell is available ++AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"], ++ AC_MSG_ERROR([Aspell headers not found])) + AC_SUBST(ASPELL_LIBS) + + # Check gtk diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild index f8f58ca6770f..d56c500752b8 100644 --- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild +++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - +EAPI=6 WX_GTK_VER="3.0" inherit autotools wxwidgets @@ -23,14 +22,18 @@ RDEPEND=" dev-libs/xerces-c[icu] dev-libs/libpcre !aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )" + aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] ) +" DEPEND="${RDEPEND} dev-libs/boost - dev-util/intltool" + dev-util/intltool +" -DOCS=( AUTHORS ChangeLog README NEWS ) +PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch ) src_prepare() { + default + # bug #440744 sed -i -e 's/ -Wall -g -fexceptions//g' configure.ac || die eautoreconf |