* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidxml/files/, dev-libs/rapidxml/
@ 2021-05-25 11:55 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-05-25 11:55 UTC (permalink / raw
To: gentoo-commits
commit: 69fcf64318084290fc01b7f2601c8bcb97df080d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 25 11:41:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 25 11:54:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fcf643
dev-libs/rapidxml: add Debian patch to fix build
Closes: https://bugs.gentoo.org/791328
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../rapidxml/files/rapidxml-1.13-iterators.patch | 48 ++++++++++++++++++++++
dev-libs/rapidxml/rapidxml-1.13-r1.ebuild | 1 +
2 files changed, 49 insertions(+)
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
new file mode 100644
index 00000000000..06854524138
--- /dev/null
+++ b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
@@ -0,0 +1,48 @@
+https://sources.debian.org/data/main/r/rapidxml/1.13-3/debian/patches/fix-iterators.patch
+https://bugs.gentoo.org/791328
+--- a/rapidxml_iterators.hpp
++++ b/rapidxml_iterators.hpp
+@@ -18,9 +18,9 @@
+
+ public:
+
+- typedef typename xml_node<Ch> value_type;
+- typedef typename xml_node<Ch> &reference;
+- typedef typename xml_node<Ch> *pointer;
++ typedef typename rapidxml::xml_node<Ch> value_type;
++ typedef typename rapidxml::xml_node<Ch> &reference;
++ typedef typename rapidxml::xml_node<Ch> *pointer;
+ typedef std::ptrdiff_t difference_type;
+ typedef std::bidirectional_iterator_tag iterator_category;
+
+@@ -56,7 +56,7 @@
+ node_iterator operator++(int)
+ {
+ node_iterator tmp = *this;
+- ++this;
++ ++(*this);
+ return tmp;
+ }
+
+@@ -70,7 +70,7 @@
+ node_iterator operator--(int)
+ {
+ node_iterator tmp = *this;
+- ++this;
++ ++(*this);
+ return tmp;
+ }
+
+@@ -97,9 +97,9 @@
+
+ public:
+
+- typedef typename xml_attribute<Ch> value_type;
+- typedef typename xml_attribute<Ch> &reference;
+- typedef typename xml_attribute<Ch> *pointer;
++ typedef typename rapidxml::xml_attribute<Ch> value_type;
++ typedef typename rapidxml::xml_attribute<Ch> &reference;
++ typedef typename rapidxml::xml_attribute<Ch> *pointer;
+ typedef std::ptrdiff_t difference_type;
+ typedef std::bidirectional_iterator_tag iterator_category;
+
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
index 80a5284c808..d072ba673bc 100644
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
BDEPEND="app-arch/unzip"
PATCHES=(
+ "${FILESDIR}"/${P}-iterators.patch
"${FILESDIR}"/${P}-clang.patch
)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidxml/files/, dev-libs/rapidxml/
@ 2021-10-31 12:40 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2021-10-31 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 8cb190827ef65b5711693a08333f5cf3729a0826
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 12:38:45 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 12:38:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb19082
dev-libs/rapidxml: treeclean
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/rapidxml/Manifest | 1 -
dev-libs/rapidxml/files/rapidxml-1.13-clang.patch | 23 -----------
.../rapidxml/files/rapidxml-1.13-iterators.patch | 48 ----------------------
dev-libs/rapidxml/metadata.xml | 11 -----
dev-libs/rapidxml/rapidxml-1.13-r1.ebuild | 26 ------------
5 files changed, 109 deletions(-)
diff --git a/dev-libs/rapidxml/Manifest b/dev-libs/rapidxml/Manifest
deleted file mode 100644
index 845a370f233..00000000000
--- a/dev-libs/rapidxml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rapidxml-1.13.zip 44163 BLAKE2B 9db90dfca1943c47e95541a323e1210368447c054cf072d6768031488070e375fe2aa78a4e41f61f252d4c487e94cf1e24e4d3756e3f8774b0c2c52ef86959e7 SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
deleted file mode 100644
index 7609984f5a2..00000000000
--- a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/rapidxml_print.hpp
-+++ b/rapidxml_print.hpp
-@@ -102,6 +102,20 @@
- ///////////////////////////////////////////////////////////////////////////
- // Internal printing operations
-
-+ // =====================================
-+ // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/
-+
-+ template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+ template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+
-+ // =====================================
-+
- // Print node
- template<class OutIt, class Ch>
- inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
deleted file mode 100644
index 06854524138..00000000000
--- a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://sources.debian.org/data/main/r/rapidxml/1.13-3/debian/patches/fix-iterators.patch
-https://bugs.gentoo.org/791328
---- a/rapidxml_iterators.hpp
-+++ b/rapidxml_iterators.hpp
-@@ -18,9 +18,9 @@
-
- public:
-
-- typedef typename xml_node<Ch> value_type;
-- typedef typename xml_node<Ch> &reference;
-- typedef typename xml_node<Ch> *pointer;
-+ typedef typename rapidxml::xml_node<Ch> value_type;
-+ typedef typename rapidxml::xml_node<Ch> &reference;
-+ typedef typename rapidxml::xml_node<Ch> *pointer;
- typedef std::ptrdiff_t difference_type;
- typedef std::bidirectional_iterator_tag iterator_category;
-
-@@ -56,7 +56,7 @@
- node_iterator operator++(int)
- {
- node_iterator tmp = *this;
-- ++this;
-+ ++(*this);
- return tmp;
- }
-
-@@ -70,7 +70,7 @@
- node_iterator operator--(int)
- {
- node_iterator tmp = *this;
-- ++this;
-+ ++(*this);
- return tmp;
- }
-
-@@ -97,9 +97,9 @@
-
- public:
-
-- typedef typename xml_attribute<Ch> value_type;
-- typedef typename xml_attribute<Ch> &reference;
-- typedef typename xml_attribute<Ch> *pointer;
-+ typedef typename rapidxml::xml_attribute<Ch> value_type;
-+ typedef typename rapidxml::xml_attribute<Ch> &reference;
-+ typedef typename rapidxml::xml_attribute<Ch> *pointer;
- typedef std::ptrdiff_t difference_type;
- typedef std::bidirectional_iterator_tag iterator_category;
-
diff --git a/dev-libs/rapidxml/metadata.xml b/dev-libs/rapidxml/metadata.xml
deleted file mode 100644
index cb1847380d2..00000000000
--- a/dev-libs/rapidxml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">rapidxml</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
deleted file mode 100644
index d072ba673bc..00000000000
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast XML parser"
-HOMEPAGE="http://rapidxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
-
-LICENSE="Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}"/${P}-iterators.patch
- "${FILESDIR}"/${P}-clang.patch
-)
-
-src_install() {
- insinto /usr/include/rapidxml
- doins *.hpp
- docinto html
- dodoc manual.html
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-31 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-31 12:40 [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidxml/files/, dev-libs/rapidxml/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-05-25 11:55 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox