tags 710609 + patch tags 710609 + pending thanks Dear maintainer,
I've prepared an NMU for spring (versioned as 88.0+dfsg1-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Johnny Cash: Danny Boy
diff -Nru spring-88.0+dfsg1/debian/changelog spring-88.0+dfsg1/debian/changelog
--- spring-88.0+dfsg1/debian/changelog 2012-05-10 20:42:46.000000000 +0200
+++ spring-88.0+dfsg1/debian/changelog 2013-10-30 21:46:06.000000000 +0100
@@ -1,3 +1,18 @@
+spring (88.0+dfsg1-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add both patches from the Ubuntu package:
+ - 0100-fix-glShaderSource-stub.patch:
+ Fix glShaderSource stub signature to match that in <GL/glext.h>.
+ (Colin Watson)
+ Closes: a not yet reported FTBFS bug
+ - time-utc.patch:
+ Use updated boost::TIME_UTC_ symbol that doesn't clash with C11.
+ (Dmitrijs Ledkovs)
+ Closes: #710609
+
+ -- gregor herrmann <gre...@debian.org> Wed, 30 Oct 2013 21:43:52 +0100
+
spring (88.0+dfsg1-1.1) unstable; urgency=low
* Non maintainer upload
diff -Nru spring-88.0+dfsg1/debian/patches/0100-fix-glShaderSource-stub.patch spring-88.0+dfsg1/debian/patches/0100-fix-glShaderSource-stub.patch
--- spring-88.0+dfsg1/debian/patches/0100-fix-glShaderSource-stub.patch 1970-01-01 01:00:00.000000000 +0100
+++ spring-88.0+dfsg1/debian/patches/0100-fix-glShaderSource-stub.patch 2013-10-30 20:43:45.000000000 +0100
@@ -0,0 +1,18 @@
+Description: Fix glShaderSource stub signature to match that in <GL/glext.h>
+Author: Colin Watson <cjwat...@ubuntu.com>
+Forwarded: no
+Last-Update: 2012-09-09
+
+Index: b/rts/lib/headlessStubs/glstub.c
+===================================================================
+--- a/rts/lib/headlessStubs/glstub.c
++++ b/rts/lib/headlessStubs/glstub.c
+@@ -113,7 +113,7 @@
+ GLAPI void APIENTRY glCompileShader(GLuint shader) {}
+ GLAPI void APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint *params) {}
+ GLAPI void APIENTRY glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog) {}
+-GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length) {}
++GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length) {}
+
+ GLAPI void APIENTRY glUniform1fARB(GLint location, GLfloat v0) {}
+ GLAPI void APIENTRY glUniform2fARB(GLint location, GLfloat v0, GLfloat v1) {}
diff -Nru spring-88.0+dfsg1/debian/patches/series spring-88.0+dfsg1/debian/patches/series
--- spring-88.0+dfsg1/debian/patches/series 2012-03-31 13:07:41.000000000 +0200
+++ spring-88.0+dfsg1/debian/patches/series 2013-10-30 20:46:56.000000000 +0100
@@ -2,3 +2,5 @@
0003-fix-cmake-2_8-java-build.patch
0005-fix-sdl-build.patch
0006-fix-boost.1.48-compilation.patch
+0100-fix-glShaderSource-stub.patch
+time-utc.patch
diff -Nru spring-88.0+dfsg1/debian/patches/time-utc.patch spring-88.0+dfsg1/debian/patches/time-utc.patch
--- spring-88.0+dfsg1/debian/patches/time-utc.patch 1970-01-01 01:00:00.000000000 +0100
+++ spring-88.0+dfsg1/debian/patches/time-utc.patch 2013-10-30 20:43:45.000000000 +0100
@@ -0,0 +1,34 @@
+Description: use non C11 claching TIME_UTC
+Author: Dmitrijs Ledkovs <x...@debian.org>
+
+--- a/rts/lib/headlessStubs/sdlstub_cppbit.cpp
++++ b/rts/lib/headlessStubs/sdlstub_cppbit.cpp
+@@ -15,7 +15,7 @@
+ int stub_sdl_getSystemMilliSeconds() {
+
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);
+ return milliSeconds;
+ }
+@@ -23,7 +23,7 @@
+ void stub_sdl_sleepMilliSeconds(int milliSeconds) {
+
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ t.nsec += 1000000 * milliSeconds;
+ boost::thread::sleep(t);
+ }
+--- a/AI/Skirmish/E323AI/CScopedTimer.h
++++ b/AI/Skirmish/E323AI/CScopedTimer.h
+@@ -36,7 +36,7 @@
+
+ static unsigned int GetEngineRuntimeMSec() {
+ boost::xtime t;
+- boost::xtime_get(&t, boost::TIME_UTC);
++ boost::xtime_get(&t, boost::TIME_UTC_);
+ const unsigned int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);
+ return milliSeconds;
+ }
signature.asc
Description: Digital signature
