Control: tags 836927 + patch Control: tags 836927 + pending Dear maintainer,
I've prepared an NMU for assaultcube (versioned as 1.1.0.4+dfsg2-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru assaultcube-1.1.0.4+dfsg2/debian/changelog assaultcube-1.1.0.4+dfsg2/debian/changelog --- assaultcube-1.1.0.4+dfsg2/debian/changelog 2014-10-29 12:32:05.000000000 +0100 +++ assaultcube-1.1.0.4+dfsg2/debian/changelog 2016-09-24 19:42:32.000000000 +0200 @@ -1,3 +1,10 @@ +assaultcube (1.1.0.4+dfsg2-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix building with GCC 6. (Closes: #836927) + + -- Johannes Brandstätter <jbran...@2ds.eu> Sat, 24 Sep 2016 19:42:32 +0200 + assaultcube (1.1.0.4+dfsg2-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru assaultcube-1.1.0.4+dfsg2/debian/patches/gcc6.patch assaultcube-1.1.0.4+dfsg2/debian/patches/gcc6.patch --- assaultcube-1.1.0.4+dfsg2/debian/patches/gcc6.patch 1970-01-01 01:00:00.000000000 +0100 +++ assaultcube-1.1.0.4+dfsg2/debian/patches/gcc6.patch 2016-09-24 19:40:05.000000000 +0200 @@ -0,0 +1,27 @@ +Description: Fix building with GCC 6. +Author: Johannes Brandstätter <jbran...@2ds.eu> +Bug-Debian: https://bugs.debian.org/836927 +Last-Update: <2016-09-24> + +--- assaultcube-1.1.0.4+dfsg2.orig/source/src/rendertext.cpp ++++ assaultcube-1.1.0.4+dfsg2/source/src/rendertext.cpp +@@ -319,7 +319,7 @@ static void text_color(char c, char *sta + if(c=='r') c = stack[(sp > 0) ? --sp : sp]; // restore color + else if(c == 'b') stack[sp] *= -1; + else stack[sp] = c; +- switch(abs(stack[sp])) ++ switch(static_cast<int>(abs(stack[sp]))) + { + case '0': color = bvec( 2, 255, 128 ); break; // green: player talk + case '1': color = bvec( 96, 160, 255 ); break; // blue: team chat +--- assaultcube-1.1.0.4+dfsg2.orig/source/src/tools.h ++++ assaultcube-1.1.0.4+dfsg2/source/src/tools.h +@@ -55,8 +55,6 @@ static inline T min(T a, T b) + return a < b ? a : b; + } + +-static inline float round(float x) { return floor(x + 0.5f); } +- + #define clamp(a,b,c) (max(b, min(a, c))) + #define rnd(max) (rand()%(max)) + #define rnd_2x(max) (rand()%(max)+rand()%(max)) diff -Nru assaultcube-1.1.0.4+dfsg2/debian/patches/series assaultcube-1.1.0.4+dfsg2/debian/patches/series --- assaultcube-1.1.0.4+dfsg2/debian/patches/series 2011-10-30 01:22:54.000000000 +0200 +++ assaultcube-1.1.0.4+dfsg2/debian/patches/series 2016-09-24 19:39:04.000000000 +0200 @@ -2,3 +2,4 @@ 20-fix-clean-target.patch 30-build-with-debug-symbols.patch 40-build-with-lX11.patch +gcc6.patch
signature.asc
Description: PGP signature
