| 1 |
commit: 69fcf64318084290fc01b7f2601c8bcb97df080d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 25 11:41:26 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 25 11:54:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fcf643 |
| 7 |
|
| 8 |
dev-libs/rapidxml: add Debian patch to fix build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/791328 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../rapidxml/files/rapidxml-1.13-iterators.patch | 48 ++++++++++++++++++++++ |
| 14 |
dev-libs/rapidxml/rapidxml-1.13-r1.ebuild | 1 + |
| 15 |
2 files changed, 49 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..06854524138 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch |
| 22 |
@@ -0,0 +1,48 @@ |
| 23 |
+https://sources.debian.org/data/main/r/rapidxml/1.13-3/debian/patches/fix-iterators.patch |
| 24 |
+https://bugs.gentoo.org/791328 |
| 25 |
+--- a/rapidxml_iterators.hpp |
| 26 |
++++ b/rapidxml_iterators.hpp |
| 27 |
+@@ -18,9 +18,9 @@ |
| 28 |
+ |
| 29 |
+ public: |
| 30 |
+ |
| 31 |
+- typedef typename xml_node<Ch> value_type; |
| 32 |
+- typedef typename xml_node<Ch> &reference; |
| 33 |
+- typedef typename xml_node<Ch> *pointer; |
| 34 |
++ typedef typename rapidxml::xml_node<Ch> value_type; |
| 35 |
++ typedef typename rapidxml::xml_node<Ch> &reference; |
| 36 |
++ typedef typename rapidxml::xml_node<Ch> *pointer; |
| 37 |
+ typedef std::ptrdiff_t difference_type; |
| 38 |
+ typedef std::bidirectional_iterator_tag iterator_category; |
| 39 |
+ |
| 40 |
+@@ -56,7 +56,7 @@ |
| 41 |
+ node_iterator operator++(int) |
| 42 |
+ { |
| 43 |
+ node_iterator tmp = *this; |
| 44 |
+- ++this; |
| 45 |
++ ++(*this); |
| 46 |
+ return tmp; |
| 47 |
+ } |
| 48 |
+ |
| 49 |
+@@ -70,7 +70,7 @@ |
| 50 |
+ node_iterator operator--(int) |
| 51 |
+ { |
| 52 |
+ node_iterator tmp = *this; |
| 53 |
+- ++this; |
| 54 |
++ ++(*this); |
| 55 |
+ return tmp; |
| 56 |
+ } |
| 57 |
+ |
| 58 |
+@@ -97,9 +97,9 @@ |
| 59 |
+ |
| 60 |
+ public: |
| 61 |
+ |
| 62 |
+- typedef typename xml_attribute<Ch> value_type; |
| 63 |
+- typedef typename xml_attribute<Ch> &reference; |
| 64 |
+- typedef typename xml_attribute<Ch> *pointer; |
| 65 |
++ typedef typename rapidxml::xml_attribute<Ch> value_type; |
| 66 |
++ typedef typename rapidxml::xml_attribute<Ch> &reference; |
| 67 |
++ typedef typename rapidxml::xml_attribute<Ch> *pointer; |
| 68 |
+ typedef std::ptrdiff_t difference_type; |
| 69 |
+ typedef std::bidirectional_iterator_tag iterator_category; |
| 70 |
+ |
| 71 |
|
| 72 |
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild |
| 73 |
index 80a5284c808..d072ba673bc 100644 |
| 74 |
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild |
| 75 |
+++ b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild |
| 76 |
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86" |
| 77 |
BDEPEND="app-arch/unzip" |
| 78 |
|
| 79 |
PATCHES=( |
| 80 |
+ "${FILESDIR}"/${P}-iterators.patch |
| 81 |
"${FILESDIR}"/${P}-clang.patch |
| 82 |
) |
Archives