[libcitygml] 01/05: Add patch by Matthias Klose to fix FTBFS with xerces-3.2. (closes: #881924)

[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 4f7d3ecfaa822e458d9df4d1d156028eeba0bb0a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Nov 16 16:49:00 2017 +0100

    Add patch by Matthias Klose to fix FTBFS with xerces-3.2. (closes: #881924)
---
 debian/changelog                |  2 ++
 debian/patches/series           |  1 +
 debian/patches/xerces-3.2.patch | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6648170..13c437b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libcitygml (2.0.4-2) UNRELEASED; urgency=medium
   * Team upload.
   * Bump Standards-Version to 4.1.0, no changes.
   * Strip trailing whitespace from changelog.
+  * Add patch by Matthias Klose to fix FTBFS with xerces-3.2.
+    (closes: #881924)
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 22 Sep 2017 23:01:42 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 3d8c606..eaac07d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Included-functional-header-in-address-parser-which-p.patch
 spelling-errors.patch
+xerces-3.2.patch
diff --git a/debian/patches/xerces-3.2.patch b/debian/patches/xerces-3.2.patch
new file mode 100644
index 0000000..4e2d163
--- /dev/null
+++ b/debian/patches/xerces-3.2.patch
@@ -0,0 +1,24 @@
+Description: Fix build with xerces3.2.
+Author: Matthias Klose <doko at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/881924
+Forwarded: https://github.com/jklimke/libcitygml/pull/41
+
+--- a/CMakeModules/FindXerces.cmake
++++ b/CMakeModules/FindXerces.cmake
+@@ -29,14 +29,14 @@ ${XERCESC_INCLUDE_DIR}
+ )
+ 
+ IF (XERCESC_STATIC)
+-FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.1 xerces-c
++FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c
+  PATHS
+  $ENV{XERCESC_LIBRARY_DIR}
+  ${XERCESC_LIBRARY_DIR}
+  /usr/lib
+  /usr/local/lib
+ )
+-FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.1D
++FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D
+  PATHS
+  $ENV{XERCESC_LIBRARY_DIR}
+  ${XERCESC_LIBRARY_DIR}

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