mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 15:08:57 +02:00
390bc8f0bc
Applied some of the Debian patches from: https://sources.debian.org/src/btanks/0.9.8083-9/debian/patches/ Consistent "SDL / BGLView::UnlockGL()" related crash on close. Works nicely otherwise. Closes #7886.
232 lines
13 KiB
Diff
232 lines
13 KiB
Diff
From: Vincent Legout <vlegout@debian.org>, Matthias Klose <doko@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-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) {}
|
|
|
|
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() %s const {
|
|
return (object->*func) %s ;
|
|
@@ -190,7 +190,7 @@
|
|
inline slotXXX () : object(0), func(0) {}
|
|
inline slotXXX (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() %s const {
|
|
(object->*func) %s;
|
|
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-05-30 06:53:15.232047856 +0200
|
|
@@ -53,14 +53,14 @@
|
|
return;
|
|
}
|
|
|
|
- typename parent_type::iterator i = lower_bound(value);
|
|
+ typename parent_type::iterator i = this->lower_bound(value);
|
|
if (i != parent_type::end()) {
|
|
if (i->first == value)
|
|
return;
|
|
|
|
if (value + 1 == i->first) {
|
|
T e = i->second;
|
|
- erase(i);
|
|
+ this->erase(i);
|
|
i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
|
|
i = pack_left(i);
|
|
}
|
|
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-05-30 06:58:45.064050493 +0200
|
|
@@ -20,6 +20,7 @@
|
|
*/
|
|
|
|
#include <string>
|
|
+#include <unistd.h>
|
|
#include "export_mrt.h"
|
|
|
|
namespace mrt {
|