[libcitygml] 01/02: Add upstream patch to fix FTBFS with GCC 7.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository libcitygml.

commit 9f06c1fe0be724bfd3dff6f7ef42dffa0f027c32
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 24 09:48:03 2017 +0100

    Add upstream patch to fix FTBFS with GCC 7.
---
 debian/changelog                                   |  7 +++++
 ...nctional-header-in-address-parser-which-p.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6771633..4852f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcitygml (2.0.4-1~exp2) UNRELEASED; urgency=medium
+
+  * Add upstream patch to fix FTBFS with GCC 7.
+    (closes: #853487)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 24 Feb 2017 09:24:17 +0100
+
 libcitygml (2.0.4-1~exp1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0001-Included-functional-header-in-address-parser-which-p.patch b/debian/patches/0001-Included-functional-header-in-address-parser-which-p.patch
new file mode 100644
index 0000000..f784f8b
--- /dev/null
+++ b/debian/patches/0001-Included-functional-header-in-address-parser-which-p.patch
@@ -0,0 +1,36 @@
+Description: Included functional header in address parser which possibly caused a build error on some compilers.
+Author: Jan Klimke <jan.klimke at hpi.de>
+Origin: https://github.com/jklimke/libcitygml/commit/c644e9e462fca870fdc7d8f0d2cb3bc122233acc
+Bug: https://github.com/jklimke/libcitygml/issues/31
+Bug-Debian: https://bugs.debian.org/853487
+
+--- a/sources/include/parser/addressparser.h
++++ b/sources/include/parser/addressparser.h
+@@ -1,7 +1,10 @@
+ #pragma once
+ 
++#include <functional>
++
+ #include <parser/citygmlelementparser.h>
+ 
++
+ namespace citygml {
+ 
+     class Address;
+--- a/test/citygmltest.cpp
++++ b/test/citygmltest.cpp
+@@ -76,7 +76,13 @@ int main( int argc, char **argv )
+     file.open( argv[fargc], std::ifstream::in );
+      std::shared_ptr<const citygml::CityModel> city = citygml::load( file, params );
+ #else
+-    std::shared_ptr<const citygml::CityModel> city = citygml::load( argv[fargc], params );
++
++    std::shared_ptr<const citygml::CityModel> city;
++    try{
++        city = citygml::load( argv[fargc], params );
++    }catch(const std::runtime_error& e){
++        
++    }
+ #endif
+ 
+     time_t end;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..803021d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Included-functional-header-in-address-parser-which-p.patch

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