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

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


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

    Add hurd.diff to fix FTBFS on hurd-i386.

diff --git a/debian/changelog b/debian/changelog
index 2eb2dd8..7bbd537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ libkml (1.3.0~r863-5) UNRELEASED; urgency=low
   * Update ld-as-needed.diff to fix FTBFS with --as-needed.
     Thanks Ilya Barygin for the patch.
     (closes: #692055)
+  * Add hurd.diff to fix FTBFS on hurd-i386.
+    Thanks Pino Toscano for the patch.
+    (closes: #671894)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 05 Oct 2013 21:15:09 +0200
 
diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff
new file mode 100644
index 0000000..933c8b1
--- /dev/null
+++ b/debian/patches/hurd.diff
@@ -0,0 +1,24 @@
+--- a/third_party/googletest-r108/src/gtest-filepath.cc
++++ b/third_party/googletest-r108/src/gtest-filepath.cc
+@@ -52,6 +52,10 @@
+ 
+ #include <gtest/internal/gtest-string.h>
+ 
++#ifndef PATH_MAX
++# define PATH_MAX 4096
++#endif
++
+ namespace testing {
+ namespace internal {
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@ dnl Which platform are we building on?
+ PLATFORM=
+ SHLIBSUFFIX=
+ case "`uname -s`" in
+-	Linux|GNU/kFreeBSD)	PLATFORM=linux
++	Linux|GNU/kFreeBSD|GNU)	PLATFORM=linux
+ 		SHLIBSUFFIX="so"
+ 	;;
+ 	Darwin)	PLATFORM=darwin
diff --git a/debian/patches/reautoconfiscated.diff b/debian/patches/reautoconfiscated.diff
index ae03793..0e74eb6 100644
--- a/debian/patches/reautoconfiscated.diff
+++ b/debian/patches/reautoconfiscated.diff
@@ -7,7 +7,7 @@ Index: git/configure
  SHLIBSUFFIX=
  case "`uname -s`" in
 -	Linux)	PLATFORM=linux
-+	Linux|GNU/kFreeBSD)	PLATFORM=linux
++	Linux|GNU/kFreeBSD|GNU)	PLATFORM=linux
  		SHLIBSUFFIX="so"
  	;;
  	Darwin)	PLATFORM=darwin
diff --git a/debian/patches/series b/debian/patches/series
index a2d4b95..f6451b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 kfreebsd.diff
+hurd.diff
 automake.diff
 reautoconfiscated.diff
 clone.diff

-- 
A library to manipulate KML 2.2 OGC standard files



More information about the Pkg-grass-devel mailing list