r13641 - in packages/trunk/btanks/debian: . patches
Dmitrijs Ledkovs
xnox at alioth.debian.org
Thu May 31 01:59:18 UTC 2012
Author: xnox
Date: 2012-05-31 01:59:17 +0000 (Thu, 31 May 2012)
New Revision: 13641
Modified:
packages/trunk/btanks/debian/changelog
packages/trunk/btanks/debian/patches/gcc-4.7.patch
Log:
Import:
* Non maintainer upload.
* Fix build failure with GCC 4.7. Closes: #667123.
Modified: packages/trunk/btanks/debian/changelog
===================================================================
--- packages/trunk/btanks/debian/changelog 2012-05-28 21:49:35 UTC (rev 13640)
+++ packages/trunk/btanks/debian/changelog 2012-05-31 01:59:17 UTC (rev 13641)
@@ -1,4 +1,4 @@
-btanks (0.9.8083-4) UNRELEASED; urgency=low
+btanks (0.9.8083-4) unstable; urgency=low
* Team upload.
@@ -7,13 +7,18 @@
[ Vincent Legout ]
* Build-Depends on zlib1g-dev, fix FTBFS (Closes: #669518)
- * Fix FTBFS with gcc-4.7 (Closes: #667123)
- - New patch gcc-4.7.patch
* Fix Vcs-Browser field
* debian/patches/remove_default_optimizations.patch: Add DEP-3 header
- -- Vincent Legout <vlegout at debian.org> Fri, 18 May 2012 09:18:53 +0200
+ -- Dmitrijs Ledkovs <xnox at debian.org> Thu, 31 May 2012 02:47:36 +0100
+btanks (0.9.8083-3.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #667123.
+
+ -- Matthias Klose <doko at debian.org> Wed, 30 May 2012 04:35:06 +0000
+
btanks (0.9.8083-3) unstable; urgency=low
* Fix FTBFS with gcc-4.6. (Closes: #624916)
Modified: packages/trunk/btanks/debian/patches/gcc-4.7.patch
===================================================================
--- packages/trunk/btanks/debian/patches/gcc-4.7.patch 2012-05-28 21:49:35 UTC (rev 13640)
+++ packages/trunk/btanks/debian/patches/gcc-4.7.patch 2012-05-31 01:59:17 UTC (rev 13641)
@@ -1,11 +1,183 @@
-From: Vincent Legout <vlegout at debian.org>
+From: Vincent Legout <vlegout at debian.org>, Matthias Klose <doko at debian.org>
Bug-Debian: http://bugs.debian.org/667123
Subject: Fix FTBFS with gcc-4.7
+Index: btanks-0.9.8083/engine/sl08/sl08.h
+===================================================================
+--- btanks-0.9.8083.orig/engine/sl08/sl08.h 2012-05-30 06:48:55.924037180 +0200
++++ btanks-0.9.8083/engine/sl08/sl08.h 2012-05-30 06:58:12.832049763 +0200
+@@ -92,11 +92,11 @@
+ typedef base_signal0 <return_type> signal_type;
+ typedef return_type (object_type::*func_t) ();
+
+- inline slot0 () : object(NULL), func(NULL) {}
+- inline slot0(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slot0 () : object(0), func(0) {}
++ inline slot0(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() () const {
+ return (object->*func) () ;
+@@ -114,10 +114,10 @@
+ typedef base_signal0 <void> signal_type;
+ typedef void (object_type::*func_t) () ;
+
+- inline slot0 () : object(NULL), func(NULL) {}
++ inline slot0 () : object(0), func(0) {}
+ inline slot0 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() () const {
+ (object->*func) ();
+@@ -267,11 +267,11 @@
+ typedef base_signal1 <return_type, arg1_type> signal_type;
+ typedef return_type (object_type::*func_t) (arg1_type a1);
+
+- inline slot1 () : object(NULL), func(NULL) {}
+- inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slot1 () : object(0), func(0) {}
++ inline slot1(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1) const {
+ return (object->*func) (a1) ;
+@@ -289,10 +289,10 @@
+ typedef base_signal1 <void, arg1_type> signal_type;
+ typedef void (object_type::*func_t) (arg1_type a1) ;
+
+- inline slot1 () : object(NULL), func(NULL) {}
++ inline slot1 () : object(0), func(0) {}
+ inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1) const {
+ (object->*func) (a1);
+@@ -442,11 +442,11 @@
+ typedef base_signal2 <return_type, arg1_type, arg2_type> signal_type;
+ typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2);
+
+- inline slot2 () : object(NULL), func(NULL) {}
+- inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slot2 () : object(0), func(0) {}
++ inline slot2(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2) const {
+ return (object->*func) (a1, a2) ;
+@@ -464,10 +464,10 @@
+ typedef base_signal2 <void, arg1_type, arg2_type> signal_type;
+ typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2) ;
+
+- inline slot2 () : object(NULL), func(NULL) {}
++ inline slot2 () : object(0), func(0) {}
+ inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2) const {
+ (object->*func) (a1, a2);
+@@ -617,11 +617,11 @@
+ typedef base_signal3 <return_type, arg1_type, arg2_type, arg3_type> signal_type;
+ typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3);
+
+- inline slot3 () : object(NULL), func(NULL) {}
+- inline slot3(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slot3 () : object(0), func(0) {}
++ inline slot3(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3) const {
+ return (object->*func) (a1, a2, a3) ;
+@@ -639,10 +639,10 @@
+ typedef base_signal3 <void, arg1_type, arg2_type, arg3_type> signal_type;
+ typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3) ;
+
+- inline slot3 () : object(NULL), func(NULL) {}
++ inline slot3 () : object(0), func(0) {}
+ inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const {
+ (object->*func) (a1, a2, a3);
+@@ -792,11 +792,11 @@
+ typedef base_signal4 <return_type, arg1_type, arg2_type, arg3_type, arg4_type> signal_type;
+ typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4);
+
+- inline slot4 () : object(NULL), func(NULL) {}
+- inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slot4 () : object(0), func(0) {}
++ inline slot4(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
+ return (object->*func) (a1, a2, a3, a4) ;
+@@ -814,10 +814,10 @@
+ typedef base_signal4 <void, arg1_type, arg2_type, arg3_type, arg4_type> signal_type;
+ typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) ;
+
+- inline slot4 () : object(NULL), func(NULL) {}
++ inline slot4 () : object(0), func(0) {}
+ inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const {
+ (object->*func) (a1, a2, a3, a4);
+@@ -967,11 +967,11 @@
+ typedef base_signal5 <return_type, arg1_type, arg2_type, arg3_type, arg4_type, arg5_type> signal_type;
+ typedef return_type (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5);
+
+- inline slot5 () : object(NULL), func(NULL) {}
+- inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
++ inline slot5 () : object(0), func(0) {}
++ inline slot5(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
+
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+
+ inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const {
+ return (object->*func) (a1, a2, a3, a4, a5) ;
+@@ -989,10 +989,10 @@
+ typedef base_signal5 <void, arg1_type, arg2_type, arg3_type, arg4_type, arg5_type> signal_type;
+ typedef void (object_type::*func_t) (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) ;
+
+- inline slot5 () : object(NULL), func(NULL) {}
++ inline slot5 () : object(0), func(0) {}
+ inline slot5 (object_type *object, func_t func) : object(object), func(func) {}
+ inline void assign(object_type *o, func_t f) { object = o; func = f; }
+- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+
+ inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const {
+ (object->*func) (a1, a2, a3, a4, a5);
Index: btanks-0.9.8083/engine/sl08/sl08.py
===================================================================
---- btanks-0.9.8083.orig/engine/sl08/sl08.py 2012-04-29 15:43:28.000000000 +0200
-+++ btanks-0.9.8083/engine/sl08/sl08.py 2012-04-29 15:43:28.000000000 +0200
+--- btanks-0.9.8083.orig/engine/sl08/sl08.py 2012-05-30 06:48:55.916037177 +0200
++++ btanks-0.9.8083/engine/sl08/sl08.py 2012-05-30 06:49:25.000000000 +0200
@@ -156,7 +156,7 @@
inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {}
@@ -27,7 +199,7 @@
Index: btanks-0.9.8083/math/range_list.h
===================================================================
--- btanks-0.9.8083.orig/math/range_list.h 2008-10-24 16:15:55.000000000 +0200
-+++ btanks-0.9.8083/math/range_list.h 2012-04-29 15:47:10.577334006 +0200
++++ btanks-0.9.8083/math/range_list.h 2012-05-30 06:53:15.232047856 +0200
@@ -53,14 +53,14 @@
return;
}
@@ -48,7 +220,7 @@
Index: btanks-0.9.8083/mrt/base_file.h
===================================================================
--- btanks-0.9.8083.orig/mrt/base_file.h 2009-04-04 22:28:59.000000000 +0200
-+++ btanks-0.9.8083/mrt/base_file.h 2012-04-29 15:51:45.377341574 +0200
++++ btanks-0.9.8083/mrt/base_file.h 2012-05-30 06:58:45.064050493 +0200
@@ -20,6 +20,7 @@
*/
More information about the Pkg-games-commits
mailing list