The following commit has been merged in the master branch: commit 889caa29045cec773080999b40648a3ee14205e6 Author: Stephen M. Webb <stephen.w...@bregmasoft.ca> Date: Tue May 8 14:09:48 2012 -0700
0012-fix-osdir-headers: adds required headers for POSIX. diff --git a/debian/changelog b/debian/changelog index 521f329..ebc3ef2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,9 @@ ember (0.6.2-1) unstable; urgency=low * 0009-spelling-bach.patch: fix spelling mistake * 0010-fix-ember-script-args.patch: fix argument handling in script * 0011-qualify-template-function.patch: fixes FTBFS using GCC 4.7 + * 0012-fix-osdir-headers: adds required headers for POSIX. - -- Stephen M. Webb <stephen.w...@bregmasoft.ca> Tue, 08 May 2012 12:20:46 -0700 + -- Stephen M. Webb <stephen.w...@bregmasoft.ca> Tue, 08 May 2012 13:56:12 -0700 ember (0.5.7-1.1) unstable; urgency=high diff --git a/debian/patches/0011-qualify-template-functions.patch b/debian/patches/0011-qualify-template-functions.patch index d09c2d2..055318e 100644 --- a/debian/patches/0011-qualify-template-functions.patch +++ b/debian/patches/0011-qualify-template-functions.patch @@ -1,3 +1,6 @@ +Description: Fixes a C++ FTBFS under GCC 4.7 +Author: Stephen M. Webb <stephen.w...@bregmasoft.ca> + --- a/src/components/lua/Connectors_impl.h +++ b/src/components/lua/Connectors_impl.h @@ -120,7 +120,7 @@ diff --git a/debian/patches/0012-fix-osdir-headers.patch b/debian/patches/0012-fix-osdir-headers.patch new file mode 100644 index 0000000..d9dc3a8 --- /dev/null +++ b/debian/patches/0012-fix-osdir-headers.patch @@ -0,0 +1,23 @@ +Description: Add required headers to pick up POSIX definitions. +Author: Stephen M. Webb <stephen.w...@bregmasoft.ca> + +--- a/src/framework/osdir.h ++++ b/src/framework/osdir.h +@@ -34,6 +34,7 @@ + #include <sys/types.h> + #include <dirent.h> + #include <sys/stat.h> ++#include <unistd.h> + + namespace oslink + { +--- a/src/main/Ember.cpp ++++ b/src/main/Ember.cpp +@@ -34,6 +34,7 @@ + #include <ostream> + #else + #include <dirent.h> ++#include <unistd.h> + #endif + + #include <stdlib.h> diff --git a/debian/patches/series b/debian/patches/series index 68e4b9d..88907a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0009-spelling-bach.patch 0010-fix-ember-script-args.patch 0011-qualify-template-functions.patch +0012-fix-osdir-headers.patch -- WorldForge 3D client _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits