public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/files/, app-editors/xmlcopyeditor/
@ 2018-10-20 11:39 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-10-20 11:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a8a2042810aa136c71da1e8a75133bc7936588eb
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 10:54:20 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 11:38:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a20428

app-editors/xmlcopyeditor: Don't depend automagically in enchant

Thanks-to: Juergen Rose
Thanks-to: Chris Mayo
Closes: https://bugs.gentoo.org/629814
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch  | 19 +++++++++++++++++++
 ...1.2.1.3.ebuild => xmlcopyeditor-1.2.1.3-r1.ebuild} | 15 +++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

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 00000000000..435b777b43d
--- /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
similarity index 80%
rename from app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3.ebuild
rename to app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
index f8f58ca6770..d56c500752b 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/files/, app-editors/xmlcopyeditor/
@ 2021-05-03 12:53 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2021-05-03 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     b814af80a2efe47e32ca892ed039aeb8c1bcd553
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 12:51:34 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> 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 <sping <AT> 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)
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/files/, app-editors/xmlcopyeditor/
@ 2023-12-21 10:23 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2023-12-21 10:23 UTC (permalink / raw
  To: gentoo-commits

commit:     cf5bdf8409b0b3a57ecae750b40b2a4105395448
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 10:21:58 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 10:22:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5bdf84

app-editors/xmlcopyeditor: drop 1.2.1.3-r1, 1.3.0.0

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 app-editors/xmlcopyeditor/Manifest                 |  2 -
 ...mlcopyeditor-1.2.1.3-no-automagic-enchant.patch | 19 ---------
 ...mlcopyeditor-1.3.0.0-no-automagic-enchant.patch | 21 ----------
 .../xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild  | 44 --------------------
 .../xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild     | 48 ----------------------
 5 files changed, 134 deletions(-)

diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 9aedfd3e6569..b9fdce0a81de 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,3 +1 @@
-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
 DIST xmlcopyeditor-1.3.1.0.tar.gz 5273837 BLAKE2B e3174587defb1941f4d40d91eec101e7de3996b5faf81061f66cdc6b7d092637a273a9b4ed5a83e72c5b0fcfd5d12e80420cb6890d71a667f0440ab818098df8 SHA512 ea262e1ac6536b71e3328e695ae5825a9aff7db7a8024eedc1b3f568a75deda06f0aaff838438f91ba44de5280d6288dc8dc2d85f74f1eb638ecc01e60481be7

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
deleted file mode 100644
index 435b777b43d7..000000000000
--- a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch
deleted file mode 100644
index e07b90c5eafe..000000000000
--- a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
deleted file mode 100644
index e158bb4c8529..000000000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-inherit autotools wxwidgets xdg
-
-DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
-HOMEPAGE="https://xml-copy-editor.sourceforge.io"
-SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="aqua nls"
-
-RDEPEND="
-	app-text/aspell
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/xerces-c[icu]
-	dev-libs/libpcre
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	dev-libs/boost"
-BDEPEND="dev-util/intltool"
-
-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-wx-config="${WX_CONFIG}" \
-		$(use_enable nls)
-}

diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild
deleted file mode 100644
index fe9ec972b50a..000000000000
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 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="https://xml-copy-editor.sourceforge.io"
-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)
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-12-21 10:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-03 12:53 [gentoo-commits] repo/gentoo:master commit in: app-editors/xmlcopyeditor/files/, app-editors/xmlcopyeditor/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2023-12-21 10:23 Pacho Ramos
2018-10-20 11:39 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox