[SCM] libkml branch, master, updated. upstream/1.3.0_r863-45-g4a2fc89

Bas Couwenberg sebastic at xs4all.nl
Tue Oct 8 22:34:32 UTC 2013


The following commit has been merged in the master branch:
commit c5a4e1a738d72566f5ae4463b3c99d626481fbdd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 5 21:11:43 2013 +0200

    Import changes from 1.3.0~r863-4.1.

diff --git a/debian/changelog b/debian/changelog
index 14b88f7..9d772e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libkml (1.3.0~r863-4.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 17 Apr 2012 07:59:06 +0200
+
 libkml (1.3.0~r863-4) unstable; urgency=low
 
   * Added liburiparser-dev to libkml-dev.
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff
new file mode 100644
index 0000000..481c806
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc4.7.diff
@@ -0,0 +1,12 @@
+Index: libkml-1.3.0~r863/src/kml/base/file_posix.cc
+===================================================================
+--- libkml-1.3.0~r863.orig/src/kml/base/file_posix.cc	2011-03-16 12:06:27.000000000 +0000
++++ libkml-1.3.0~r863/src/kml/base/file_posix.cc	2012-04-17 06:00:11.011953461 +0000
+@@ -29,6 +29,7 @@
+ #include "kml/base/file.h"
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 350042a..a2d4b95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ ld-as-needed.diff
 feature_view_test.diff
 geometry_test.diff
 swig.diff
+fix-ftbfs-gcc4.7.diff

-- 
A library to manipulate KML 2.2 OGC standard files



More information about the Pkg-grass-devel mailing list