[pyosmium] 01/02: Add upstream patch to fix FTBFS with libosmium 2.11.0.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pyosmium.

commit 0dbcba12809d8d57f92033212d7c3801e6b6af1f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jan 14 14:35:51 2017 +0100

    Add upstream patch to fix FTBFS with libosmium 2.11.0.
---
 debian/changelog                                      |  6 ++++++
 ...solve-ambiguous-call-to-WayNodeList-operator.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index def1b26..b7a854a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pyosmium (2.10.2-3) UNRELEASED; urgency=medium
+
+  * Add upstream patch to fix FTBFS with libosmium 2.11.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 Jan 2017 13:41:16 +0100
+
 pyosmium (2.10.2-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff --git a/debian/patches/0001-resolve-ambiguous-call-to-WayNodeList-operator.patch b/debian/patches/0001-resolve-ambiguous-call-to-WayNodeList-operator.patch
new file mode 100644
index 0000000..2404bd3
--- /dev/null
+++ b/debian/patches/0001-resolve-ambiguous-call-to-WayNodeList-operator.patch
@@ -0,0 +1,19 @@
+Description: resolve ambiguous call to WayNodeList::operator[]
+ Newer libosmium overloads the [] operator, so we need to
+ specifiy which one to use.
+Author: Sarah Hoffmann <lonvia at denofr.de>
+Origin: https://github.com/osmcode/pyosmium/commit/a556231cac90f88046113aa28569f8dccfea066f
+Bug: https://github.com/osmcode/pyosmium/issues/24
+
+--- a/lib/osm.cc
++++ b/lib/osm.cc
+@@ -170,7 +170,8 @@ BOOST_PYTHON_MODULE(_osm)
+         "is normally not used directly, use one of its subclasses instead.",
+         no_init)
+         .def("__len__", &osmium::NodeRefList::size)
+-        .def("__getitem__", &osmium::NodeRefList::operator[], return_value_policy<reference_existing_object>())
++        .def("__getitem__",
++             make_function(static_cast<const osmium::NodeRef& (osmium::NodeRefList::*)(osmium::NodeRefList::size_type) const>(&osmium::NodeRefList::operator[]), return_value_policy<reference_existing_object>()))
+         .def("__iter__", iterator<osmium::NodeRefList,return_internal_reference<>>())
+         .def("is_closed", &osmium::NodeRefList::is_closed, args("self"),
+              "True if the start and end node are the same (synonym for "
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3dec584
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-resolve-ambiguous-call-to-WayNodeList-operator.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyosmium.git