[btanks] Fixes for gcc 4.7 changes
Bruno Wolff III
bruno at fedoraproject.org
Thu Jan 26 02:56:04 UTC 2012
commit eb357f0cd82d1fda99b090145eac69c04a4cfb9d
Author: Bruno Wolff III <bruno at wolff.to>
Date: Wed Jan 25 20:56:01 2012 -0600
Fixes for gcc 4.7 changes
btanks-gcc47.patch | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++
btanks.spec | 7 ++-
2 files changed, 145 insertions(+), 1 deletions(-)
---
diff --git a/btanks-gcc47.patch b/btanks-gcc47.patch
new file mode 100644
index 0000000..b340830
--- /dev/null
+++ b/btanks-gcc47.patch
@@ -0,0 +1,139 @@
+--- math/range_list.h.orig 2012-01-25 20:51:04.728256104 -0600
++++ math/range_list.h 2012-01-25 20:51:16.333731098 -0600
+@@ -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);
+ }
+--- engine/sl08/sl08.h.orig 2012-01-25 20:52:02.889648116 -0600
++++ engine/sl08/sl08.h 2012-01-25 20:52:12.851914269 -0600
+@@ -96,7 +96,7 @@
+ inline slot0(object_type *object, func_t func, signal_type * signal = NULL) : 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) () ;
+@@ -117,7 +117,7 @@
+ inline slot0 () : object(((object_type*)NULL)), 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) ();
+@@ -271,7 +271,7 @@
+ inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : 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) ;
+@@ -292,7 +292,7 @@
+ inline slot1 () : object(((object_type*)NULL)), 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);
+@@ -446,7 +446,7 @@
+ inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : 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) ;
+@@ -467,7 +467,7 @@
+ inline slot2 () : object(((object_type*)NULL)), 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);
+@@ -621,7 +621,7 @@
+ inline slot3(object_type *object, func_t func, signal_type * signal = NULL) : 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) ;
+@@ -642,7 +642,7 @@
+ inline slot3 () : object(((object_type*)NULL)), 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);
+@@ -796,7 +796,7 @@
+ inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : 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) ;
+@@ -817,7 +817,7 @@
+ inline slot4 () : object(((object_type*)NULL)), 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);
+@@ -971,7 +971,7 @@
+ inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : 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) ;
+@@ -992,7 +992,7 @@
+ inline slot5 () : object(((object_type*)NULL)), 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);
+--- mrt/base_file.h.orig 2012-01-25 20:52:47.276289429 -0600
++++ mrt/base_file.h 2012-01-25 20:53:01.518099491 -0600
+@@ -19,6 +19,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include <unistd.h>
+ #include <string>
+ #include "export_mrt.h"
+
diff --git a/btanks.spec b/btanks.spec
index 8c0c4a3..c04cfe2 100644
--- a/btanks.spec
+++ b/btanks.spec
@@ -1,6 +1,6 @@
Name: btanks
Version: 0.9.8083
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Funny battle on your desk
Summary(ru): Веселая маленькая война на столе
@@ -21,6 +21,7 @@ Patch4: %{name}-gcc.patch
# bted doesn't explicitly link to clunl
Patch5: %{name}-dso.patch
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch6: btanks-gcc47.patch
Source1: %{name}.desktop
Source2: bted.desktop
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -73,6 +74,7 @@ running %{name}.
%patch3 -b .excessopts
%patch4 -b .gcc
%patch5 -b .dso
+%patch6 -b .gcc47
dos2unix -k *.txt ChangeLog *.url LICENSE LICENSE.EXCEPTION
iconv -f latin1 -t utf-8 LICENSE.EXCEPTION > LICENSE.EXCEPTION.new
@@ -168,6 +170,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Jan 25 2012 Bruno Wolff III <bruno at wolff.to> - 0.9.8083-3
+- Fixes for gcc 4.7
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8083-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list