Control: tags 811785 + patch Control: tags 811785 + pending Dear maintainer,
I've prepared an NMU for libtuxcap (versioned as 1.4.0.dfsg2-2.3) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -u libtuxcap-1.4.0.dfsg2/debian/changelog libtuxcap-1.4.0.dfsg2/debian/changelog --- libtuxcap-1.4.0.dfsg2/debian/changelog +++ libtuxcap-1.4.0.dfsg2/debian/changelog @@ -1,3 +1,10 @@ +libtuxcap (1.4.0.dfsg2-2.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix building with GCC 6. (Closes: #811785) + + -- Johannes Brandstätter <jbran...@2ds.eu> Sun, 25 Sep 2016 13:36:46 +0200 + libtuxcap (1.4.0.dfsg2-2.2) unstable; urgency=medium * Non-maintainer upload. diff -u libtuxcap-1.4.0.dfsg2/debian/patches/series libtuxcap-1.4.0.dfsg2/debian/patches/series --- libtuxcap-1.4.0.dfsg2/debian/patches/series +++ libtuxcap-1.4.0.dfsg2/debian/patches/series @@ -7,0 +8 @@ +gcc6.patch only in patch2: unchanged: --- libtuxcap-1.4.0.dfsg2.orig/debian/patches/gcc6.patch +++ libtuxcap-1.4.0.dfsg2/debian/patches/gcc6.patch @@ -0,0 +1,50 @@ +Description: Fix building with GCC 6. +Author: Johannes Brandstätter <jbran...@2ds.eu> +Bug-Debian: https://bugs.debian.org/811785 +Last-Update: <2016-09-25> + +--- a/tuxcap/lib/MemoryImage.cpp ++++ b/tuxcap/lib/MemoryImage.cpp +@@ -17,6 +17,7 @@ + #include <math.h> + #include <assert.h> + #include <string.h> ++#include <climits> + #include "SDL.h" + + using namespace Sexy; +@@ -1780,10 +1781,10 @@ + + SWHelper::XYZStruct aVerts[4] = + { +- { -w2, -h2, u0, v0, 0xFFFFFFFF }, +- { w2, -h2, u1, v0, 0xFFFFFFFF }, +- { -w2, h2, u0, v1, 0xFFFFFFFF }, +- { w2, h2, u1, v1, 0xFFFFFFFF } ++ { -w2, -h2, u0, v0, -1 }, ++ { w2, -h2, u1, v0, -1 }, ++ { -w2, h2, u0, v1, -1 }, ++ { w2, h2, u1, v1, -1 } + }; + + for (int i=0; i<4; i++) +--- libtuxcap-1.4.0.dfsg2.orig/tuxcap/lib/Physics.cpp ++++ libtuxcap-1.4.0.dfsg2/tuxcap/lib/Physics.cpp +@@ -128,7 +128,7 @@ + cpSpaceStep(space, delta); + listener->AfterPhysicsStep(); + +- std::pair<PhysicsListener*, std::vector<PhysicsObject*>* > p = std::make_pair<PhysicsListener*, std::vector<PhysicsObject*>* >(listener, &objects); ++ std::pair<PhysicsListener*, std::vector<PhysicsObject*>* > p = std::make_pair(listener, &objects); + + cpArrayEach(space->arbiters, &AllCollisions, &p); + } +@@ -453,7 +453,7 @@ + } + ++vit; + } +- v->push_back(std::make_pair<SexyVector2, SexyVector2>(start,end)); ++ v->push_back(std::make_pair(start,end)); + } + + bool Physics::IsJoined(const PhysicsObject* obj1, const PhysicsObject* obj2) const {
signature.asc
Description: PGP signature
