From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCF601382C5 for ; Mon, 3 May 2021 12:53:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03848E07B3; Mon, 3 May 2021 12:53:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DEC6E07B3 for ; Mon, 3 May 2021 12:53:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF5C9340AB5 for ; Mon, 3 May 2021 12:53:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33A3263D for ; Mon, 3 May 2021 12:53:52 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1620046294.b814af80a2efe47e32ca892ed039aeb8c1bcd553.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/files/, app-editors/xmlcopyeditor/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/xmlcopyeditor/Manifest app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild X-VCS-Directories: app-editors/xmlcopyeditor/files/ app-editors/xmlcopyeditor/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: b814af80a2efe47e32ca892ed039aeb8c1bcd553 X-VCS-Branch: master Date: Mon, 3 May 2021 12:53:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 84a05e39-25e8-4f90-98c7-f8ffd4876544 X-Archives-Hash: cb3e6ec85d687f6a6ebc1c8600a784b2 commit: b814af80a2efe47e32ca892ed039aeb8c1bcd553 Author: Sebastian Pipping gentoo org> AuthorDate: Mon May 3 12:51:34 2021 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon May 3 12:51:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b814af80 app-editors/xmlcopyeditor: 1.3.0.0 Closes: https://bugs.gentoo.org/733764 Closes: https://bugs.gentoo.org/769638 Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-3.0.18, Repoman-3.0.3 app-editors/xmlcopyeditor/Manifest | 1 + ...mlcopyeditor-1.3.0.0-no-automagic-enchant.patch | 21 ++++++++++ .../xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild | 48 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest index 56816307e4f..528164aaae8 100644 --- a/app-editors/xmlcopyeditor/Manifest +++ b/app-editors/xmlcopyeditor/Manifest @@ -1 +1,2 @@ DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d +DIST xmlcopyeditor-1.3.0.0.tar.gz 4981894 BLAKE2B decaf8d08bcf6392624160f512e02c0e1b8924df1147d2fb19b744357077f9b23a99781c0f47c5800feffa600aea7b1fadb65282b5da438521be079aeb917de4 SHA512 5feebc56124601c1a8b7a3079b8f766c6282c256e39a2e34cdf64156ba910195a1b64fecea41d0a4022f00dcd3cd4f46f433fff3766acb6239ca70d7675b14c0 diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch new file mode 100644 index 00000000000..e07b90c5eaf --- /dev/null +++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch @@ -0,0 +1,21 @@ +diff --git a/configure.ac b/configure.ac +index 30bdf60..034bb26 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -105,13 +105,9 @@ AC_LANG(C++) + 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) + + AC_MSG_CHECKING([the GTK version to use]) diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild new file mode 100644 index 00000000000..a4f5153d85c --- /dev/null +++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +WX_GTK_VER="3.0-gtk3" +inherit autotools wxwidgets xdg + +DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor" +HOMEPAGE="http://xml-copy-editor.sourceforge.net/" +SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 -ppc ~x86 ~amd64-linux ~x86-linux" # -ppc due SSE2 requirement +IUSE="aqua nls" + +RDEPEND=" + app-text/aspell + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/xerces-c[cpu_flags_x86_sse2,icu] + dev-libs/libpcre + x11-libs/wxGTK:${WX_GTK_VER}[X]" +DEPEND="${RDEPEND} + dev-libs/boost" +BDEPEND="dev-util/intltool + virtual/pkgconfig" + +S="${WORKDIR}"/${PN} + +PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch ) + +src_prepare() { + default + + # bug #440744 + sed -i -e 's/ -Wall -g -fexceptions//g' configure.ac || die + eautoreconf +} + +src_configure() { + setup-wxwidgets unicode + econf \ + --with-gtk=3.0 \ + --with-wx-config="${WX_CONFIG}" \ + $(use_enable nls) +}