[lordsawar] Need an explicit this-> for gcc 4.7

Bruno Wolff III bruno at fedoraproject.org
Mon Jan 16 20:50:04 UTC 2012


commit 0a01515faa6f724c8516600fa0637f4ba52e6754
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Jan 16 14:49:50 2012 -0600

    Need an explicit this-> for gcc 4.7

 lordsawar-explicit-this.patch |   11 +++++++++++
 lordsawar.spec                |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/lordsawar-explicit-this.patch b/lordsawar-explicit-this.patch
new file mode 100644
index 0000000..3cf4ce4
--- /dev/null
+++ b/lordsawar-explicit-this.patch
@@ -0,0 +1,11 @@
+--- src/LocationList.h.orig	2012-01-16 13:42:25.510794018 -0600
++++ src/LocationList.h	2012-01-16 13:45:34.586824610 -0600
+@@ -55,7 +55,7 @@
+ 
+   void add(T t)
+     {
+-      push_back(t);
++      this->push_back(t);
+       d_id[t->getId()] = t;
+       int size = t->getSize();
+       for (int i = 0; i < size; i++)
diff --git a/lordsawar.spec b/lordsawar.spec
index c484b67..b1f0ec8 100644
--- a/lordsawar.spec
+++ b/lordsawar.spec
@@ -1,6 +1,6 @@
 Name:           lordsawar
 Version:        0.2.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
 # This is used for prereleases and such
@@ -14,6 +14,7 @@ URL:            http://savannah.nongnu.org/projects/%{name}
 Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{rel_version}.tar.gz
 Patch1:         lordsawar-local-manual.patch
 Patch2:         lordsawar-noginit.patch
+Patch3:         lordsawar-explicit-this.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libglademm24-devel gtkmm24-devel gettext desktop-file-utils
@@ -32,6 +33,7 @@ LordsAWar! is a turn-based strategy game set in a fantasy setting.
 %setup -qn %{name}-%{rel_version}
 %patch1
 %patch2
+%patch3
 sed -i.orig -e "s/Comment=Play a clone of Warlords II/Comment=Play a turn-based strategy game/" dat/lordsawar.desktop.in.in
 
 
@@ -83,6 +85,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Jan 16 2012 Bruno Wolff III <bruno at wolff.to> 0.2.0-6
+- Fix for gcc 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list