* [gentoo-commits] proj/gnome:master commit in: dev-util/itstool/, dev-util/itstool/files/
@ 2018-02-06 17:08 Sobhan Mohammadpour
0 siblings, 0 replies; 3+ messages in thread
From: Sobhan Mohammadpour @ 2018-02-06 17:08 UTC (permalink / raw
To: gentoo-commits
commit: df0ed79b1eb4fb3bfaaa1be33b384b68a109ea98
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 17:08:01 2018 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 17:08:01 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=df0ed79b
dev-util/itstool: fix
Package-Manager: Portage-2.3.23, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1
.../itstool/files/itstool-2.0.4-segfault.patch | 58 ++++++++++++++++++++++
...tstool-2.0.4.ebuild => itstool-2.0.4-r1.ebuild} | 4 +-
2 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/dev-util/itstool/files/itstool-2.0.4-segfault.patch b/dev-util/itstool/files/itstool-2.0.4-segfault.patch
new file mode 100644
index 00000000..840daccd
--- /dev/null
+++ b/dev-util/itstool/files/itstool-2.0.4-segfault.patch
@@ -0,0 +1,58 @@
+From 9b84c007a73e8275ca45762f1bfa3ab7c3a852e2 Mon Sep 17 00:00:00 2001
+From: Shaun McCance <shaunm@redhat.com>
+Date: Wed, 25 Oct 2017 12:10:03 -0400
+Subject: [PATCH] Be more careful about libxml2 memory management
+
+I think this fixes https://github.com/itstool/itstool/issues/17
+---
+ itstool.in | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/itstool.in b/itstool.in
+index c1d0585..a16eba9 100755
+--- a/itstool.in
++++ b/itstool.in
+@@ -477,6 +477,7 @@ class Document (object):
+ if load_dtd:
+ ctxt.loadSubset(1)
+ if keep_entities:
++ ctxt.loadSubset(1)
+ ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
+ ctxt.replaceEntities(0)
+ else:
+@@ -1043,6 +1044,7 @@ class Document (object):
+ if self._load_dtd:
+ ctxt.loadSubset(1)
+ if self._keep_entities:
++ ctxt.loadSubset(1)
+ ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
+ ctxt.replaceEntities(0)
+ else:
+@@ -1069,7 +1071,9 @@ class Document (object):
+ ph_node = msg.get_placeholder(child.name).node
+ if self.has_child_elements(ph_node):
+ self.merge_translations(translations, None, ph_node, strict=strict)
+- child.replaceNode(ph_node)
++ newnode = ph_node.copyNode(1)
++ newnode.setTreeDoc(self._doc)
++ child.replaceNode(newnode)
+ else:
+ repl = self.get_translated(ph_node, translations, strict=strict, lang=lang)
+ child.replaceNode(repl)
+@@ -1084,10 +1088,15 @@ class Document (object):
+ (lang + ' ') if lang is not None else '',
+ msgstr.encode('utf-8')))
+ self._xml_err = ''
++ ctxt.doc().freeDoc()
+ return node
+ retnode = node.copyNode(2)
++ retnode.setTreeDoc(self._doc)
+ for child in xml_child_iter(trnode):
+- retnode.addChild(child.copyNode(1))
++ newnode = child.copyNode(1)
++ newnode.setTreeDoc(self._doc)
++ retnode.addChild(newnode)
++
+ ctxt.doc().freeDoc()
+ return retnode
+
diff --git a/dev-util/itstool/itstool-2.0.4.ebuild b/dev-util/itstool/itstool-2.0.4-r1.ebuild
similarity index 89%
rename from dev-util/itstool/itstool-2.0.4.ebuild
rename to dev-util/itstool/itstool-2.0.4-r1.ebuild
index b0bb4cf4..ec4e3a9a 100644
--- a/dev-util/itstool/itstool-2.0.4.ebuild
+++ b/dev-util/itstool/itstool-2.0.4-r1.ebuild
@@ -20,10 +20,12 @@ IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/libxml2[${PYTHON_USEDEP}]"
+ dev-libs/libxml2[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
src_prepare() {
+ eapply "${FILESDIR}/${P}-segfault.patch"
+ python_fix_shebang .
eapply_user
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/itstool/, dev-util/itstool/files/
@ 2019-02-23 14:28 Dennis Lamm
0 siblings, 0 replies; 3+ messages in thread
From: Dennis Lamm @ 2019-02-23 14:28 UTC (permalink / raw
To: gentoo-commits
commit: 0f61e6ce7b50b0ba66ea2c6d4c291b352c32968d
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 14:27:59 2019 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 14:28:34 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0f61e6ce
dev-util/itstool: version bump to 2.0.5
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Manifest-Sign-Key: 0xD39C7B0122696620
.../{itstool-2.0.4-segfault.patch => itstool-segfault.patch} | 0
dev-util/itstool/itstool-2.0.4-r1.ebuild | 4 ++--
.../itstool/{itstool-2.0.4-r1.ebuild => itstool-2.0.5.ebuild} | 11 +++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dev-util/itstool/files/itstool-2.0.4-segfault.patch b/dev-util/itstool/files/itstool-segfault.patch
similarity index 100%
rename from dev-util/itstool/files/itstool-2.0.4-segfault.patch
rename to dev-util/itstool/files/itstool-segfault.patch
diff --git a/dev-util/itstool/itstool-2.0.4-r1.ebuild b/dev-util/itstool/itstool-2.0.4-r1.ebuild
index 49b85f5c..a04c0574 100644
--- a/dev-util/itstool/itstool-2.0.4-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}"
src_prepare() {
- eapply "${FILESDIR}/${P}-segfault.patch"
+ eapply "${FILESDIR}/${PN}-segfault.patch"
python_fix_shebang .
eapply_user
eautoreconf
diff --git a/dev-util/itstool/itstool-2.0.4-r1.ebuild b/dev-util/itstool/itstool-2.0.5.ebuild
similarity index 85%
copy from dev-util/itstool/itstool-2.0.4-r1.ebuild
copy to dev-util/itstool/itstool-2.0.5.ebuild
index 49b85f5c..95f43f8d 100644
--- a/dev-util/itstool/itstool-2.0.4-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6})
PYTHON_REQ_USE="xml"
inherit autotools python-single-r1
@@ -23,8 +23,11 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/libxml2[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-segfault.patch"
+)
+
src_prepare() {
- eapply "${FILESDIR}/${P}-segfault.patch"
python_fix_shebang .
eapply_user
eautoreconf
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: dev-util/itstool/, dev-util/itstool/files/
@ 2019-11-17 14:37 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2019-11-17 14:37 UTC (permalink / raw
To: gentoo-commits
commit: b761f8e6c681b9c652ebc48cfc370a614ec147c2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 14:36:59 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 14:37:03 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b761f8e6
dev-util/itstool: remove, 2.0.6 available in ::gentoo
Closes: https://bugs.gentoo.org/653154
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-util/itstool/files/itstool-segfault.patch | 58 ---------------------------
dev-util/itstool/itstool-2.0.4-r1.ebuild | 37 -----------------
dev-util/itstool/itstool-2.0.5.ebuild | 40 ------------------
dev-util/itstool/itstool-9999.ebuild | 53 ------------------------
dev-util/itstool/metadata.xml | 13 ------
5 files changed, 201 deletions(-)
diff --git a/dev-util/itstool/files/itstool-segfault.patch b/dev-util/itstool/files/itstool-segfault.patch
deleted file mode 100644
index 840daccd..00000000
--- a/dev-util/itstool/files/itstool-segfault.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9b84c007a73e8275ca45762f1bfa3ab7c3a852e2 Mon Sep 17 00:00:00 2001
-From: Shaun McCance <shaunm@redhat.com>
-Date: Wed, 25 Oct 2017 12:10:03 -0400
-Subject: [PATCH] Be more careful about libxml2 memory management
-
-I think this fixes https://github.com/itstool/itstool/issues/17
----
- itstool.in | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/itstool.in b/itstool.in
-index c1d0585..a16eba9 100755
---- a/itstool.in
-+++ b/itstool.in
-@@ -477,6 +477,7 @@ class Document (object):
- if load_dtd:
- ctxt.loadSubset(1)
- if keep_entities:
-+ ctxt.loadSubset(1)
- ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
- ctxt.replaceEntities(0)
- else:
-@@ -1043,6 +1044,7 @@ class Document (object):
- if self._load_dtd:
- ctxt.loadSubset(1)
- if self._keep_entities:
-+ ctxt.loadSubset(1)
- ctxt.ctxtUseOptions(libxml2.XML_PARSE_DTDLOAD)
- ctxt.replaceEntities(0)
- else:
-@@ -1069,7 +1071,9 @@ class Document (object):
- ph_node = msg.get_placeholder(child.name).node
- if self.has_child_elements(ph_node):
- self.merge_translations(translations, None, ph_node, strict=strict)
-- child.replaceNode(ph_node)
-+ newnode = ph_node.copyNode(1)
-+ newnode.setTreeDoc(self._doc)
-+ child.replaceNode(newnode)
- else:
- repl = self.get_translated(ph_node, translations, strict=strict, lang=lang)
- child.replaceNode(repl)
-@@ -1084,10 +1088,15 @@ class Document (object):
- (lang + ' ') if lang is not None else '',
- msgstr.encode('utf-8')))
- self._xml_err = ''
-+ ctxt.doc().freeDoc()
- return node
- retnode = node.copyNode(2)
-+ retnode.setTreeDoc(self._doc)
- for child in xml_child_iter(trnode):
-- retnode.addChild(child.copyNode(1))
-+ newnode = child.copyNode(1)
-+ newnode.setTreeDoc(self._doc)
-+ retnode.addChild(newnode)
-+
- ctxt.doc().freeDoc()
- return retnode
-
diff --git a/dev-util/itstool/itstool-2.0.4-r1.ebuild b/dev-util/itstool/itstool-2.0.4-r1.ebuild
deleted file mode 100644
index a04c0574..00000000
--- a/dev-util/itstool/itstool-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="https://github.com/itstool/itstool/archive/${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libxml2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- eapply "${FILESDIR}/${PN}-segfault.patch"
- python_fix_shebang .
- eapply_user
- eautoreconf
-}
-
-src_test() {
- suite="${S}"/tests/run_tests.py
- PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
- unset suite
-}
diff --git a/dev-util/itstool/itstool-2.0.5.ebuild b/dev-util/itstool/itstool-2.0.5.ebuild
deleted file mode 100644
index 95f43f8d..00000000
--- a/dev-util/itstool/itstool-2.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6})
-PYTHON_REQ_USE="xml"
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="https://github.com/itstool/itstool/archive/${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libxml2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-segfault.patch"
-)
-
-src_prepare() {
- python_fix_shebang .
- eapply_user
- eautoreconf
-}
-
-src_test() {
- suite="${S}"/tests/run_tests.py
- PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
- unset suite
-}
diff --git a/dev-util/itstool/itstool-9999.ebuild b/dev-util/itstool/itstool-9999.ebuild
deleted file mode 100644
index bd66841d..00000000
--- a/dev-util/itstool/itstool-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools python-single-r1
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
-fi
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://github.com/itstool/itstool.git"
-else
- SRC_URI="https://github.com/itstool/itstool/archive/${PV}.tar.gz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux"
-fi
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-segfault.patch"
-)
-
-src_prepare() {
- python_fix_shebang .
- eapply_user
- eautoreconf
-}
-
-src_test() {
- suite="${S}"/tests/run_tests.py
- PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
- unset suite
-}
diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
deleted file mode 100644
index 90e918d8..00000000
--- a/dev-util/itstool/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription lang="en">ITS Tool allows you to translate your XML documents
- with gettext PO files, using rules from the W3C Internationalization Tag Set
- (ITS) to determine what to translate and how to separate it into PO file
- messages.
-</longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-17 14:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-17 14:37 [gentoo-commits] proj/gnome:master commit in: dev-util/itstool/, dev-util/itstool/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2019-02-23 14:28 Dennis Lamm
2018-02-06 17:08 Sobhan Mohammadpour
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox