[gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/, app-editors/xmlcopyeditor/files/

[gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/, app-editors/xmlcopyeditor/files/

[Pacho Ramos]

commit:     f96057292f896ee2119256dee5126f0178908473
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 18:48:11 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue May 24 19:12:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9605729

app-editors/xmlcopyeditor: Drop old version relying on obsolete wxGTK

Package-Manager: portage-2.3.0_rc1

 app-editors/xmlcopyeditor/Manifest                 |  2 -
 .../files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch      | 13 -----
 .../xmlcopyeditor/xmlcopyeditor-1.2.0.12.ebuild    | 56 ----------------------
 3 files changed, 71 deletions(-)

diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index c2ecc1f..2364b08 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,3 +1 @@
-DIST GuideXML-templates.tar.gz 884 SHA256 3ede041b74a64a3f262455728486a616ffb496fa0d6f3c50610387d9de0d742e SHA512 1a303c8f0664d950b89430f940fc27b8cc4f3b76d076437e62edbc736c50bce5794a7178a2c99712a29db4de7e9e8b03c0f598ab702e4289cb77625d5a63ab30 WHIRLPOOL 6094faa76f1b731537e5d254cdd33a98830c22ad4fb99817fd8332b59a03451bf9e3c14ef2fc71c32ed2c74bf1c1ca132210aaf3b2bdeb4342f2a0fc24505f6f
-DIST xmlcopyeditor-1.2.0.12.tar.gz 4052354 SHA256 7f33795ca8c6c25207970a4933ff41651314dbd9fd73e94ae68dfde100baa415 SHA512 501ad0302d0dfd3a695adc430ca4b2a720092c04797ee9d2da597971be3c10a51984ab3d444b044f058ba6b1b7a384f71c16aac9fa30e7eb32d509d56972e349 WHIRLPOOL 7b731890a61a2c6742c3c97de9e661fe625a72d289711f9d04cd376e16b3f37dfde8b2d595fdd7ab35d1de8b2e992fdd0e2c824f9b915744f2e52fd2830a9f86
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 SHA256 9b684b5042b4af85d3626fd55108bd1d63c0007b5c794ef7cc4b026012b29d2f SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d WHIRLPOOL c536382a6669f54f7abb84f31de57fc1cc11c85ddc20a90828c39e5edb2d112a741b9d1d7e5a0011b4c4ae337bf12f31ec556b9fd4a54da2219b754e48434df5

diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch
deleted file mode 100644
index 4367cee..0000000
--- a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.6-gcc-4.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/xmlcopyeditor-1.2.0.9/src/housestyle.h	2012-10-07 09:19:52.000000000 -0400
-+++ b/xmlcopyeditor-1.2.0.9/src/housestyle.h	2013-04-03 10:27:46.784455182 -0400
-@@ -68,8 +68,9 @@
- 		           filterDirectory,
- 		           filterFile,
- 		           pathSeparator,
--		           error,
-+		           error
- #ifdef __WXMSW__
-+                   ,
-                    aspellDataPath,
-                    aspellDictPath
- #endif

diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.12.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.12.ebuild
deleted file mode 100644
index 0facaeb..0000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-WX_GTK_VER="2.8"
-
-inherit autotools wxwidgets
-
-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
-	guidexml? ( mirror://gentoo/GuideXML-templates.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua guidexml"
-
-RDEPEND=">=dev-libs/libxml2-2.7.3-r1
-	dev-libs/libxslt
-	dev-libs/xerces-c[icu]
-	dev-libs/libpcre
-	app-text/aspell
-	!aqua? ( x11-libs/wxGTK:2.8[X] )
-	aqua? ( x11-libs/wxGTK:2.8[aqua] )"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-
-DOCS=( AUTHORS ChangeLog README NEWS )
-
-src_prepare() {
-	# fix desktop file
-	sed -i  -e '/Categories/s/Application;//' \
-		-e '/Icon/s/.png//' \
-		-e 's/\r//g' \
-		"src/${PN}.desktop" || die "sed on src/${PN}.desktop failed"
-	# bug #440744
-	sed -i  -e 's/ -Wall -g -fexceptions//g' \
-		-e '/CXXFLAGS/s/CPPFLAGS/CXXFLAGS/' \
-		configure.ac || die 'sed on configure.ac failed'
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use guidexml; then
-		insinto /usr/share/xmlcopyeditor/templates/
-		for TEMPLATE in "${WORKDIR}"/GuideXML-templates/*.xml; do
-			newins "${TEMPLATE}" "${TEMPLATE##*/}"
-		done
-	fi
-
-}

[gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/, app-editors/xmlcopyeditor/files/

[Joonas Niilola]

commit:     e41b2bfc76e943bf53df3e23abdf3257df00a674
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Thu May  9 18:50:20 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 13 06:49:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b2bfc

app-editors/xmlcopyeditor: fix dependencies

Closes: https://bugs.gentoo.org/923446
Signed-off-by: Chris Mayo <aklhfex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35918
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch | 20 +++++++++
 .../xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild  | 50 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch
new file mode 100644
index 000000000000..c3036584524c
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.1.0-libxml2-2.12.patch
@@ -0,0 +1,20 @@
+--- a/src/wraplibxml.cpp
++++ b/src/wraplibxml.cpp
+@@ -706,7 +706,7 @@
+ 
+ wxString WrapLibxml::getLastError()
+ {
+-	xmlErrorPtr err = xmlGetLastError();
++	const xmlError *err = xmlGetLastError();
+ 
+ 	if ( !err )
+ 		return nonParserError;
+@@ -722,7 +722,7 @@
+ 
+ std::pair<int, int> WrapLibxml::getErrorPosition()
+ {
+-	xmlErrorPtr err = xmlGetLastError();
++	const xmlError *err = xmlGetLastError();
+ 	if ( !err )
+ 		return std::make_pair ( 1, 1 );
+ 

diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild
new file mode 100644
index 000000000000..7c171ac605c7
--- /dev/null
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
+HOMEPAGE="https://xml-copy-editor.sourceforge.io"
+SRC_URI="https://downloads.sourceforge.net/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/enchant:2
+	>=dev-libs/libxml2-2.12.5
+	dev-libs/libxslt
+	dev-libs/xerces-c[cpu_flags_x86_sse2,icu]
+	dev-libs/libpcre2
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-libxml2-2.12.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)
+}