[netpanzer] gcc fix.

Jon Ciesla limb at fedoraproject.org
Fri Jan 6 15:06:00 UTC 2012


commit 992449f4d37b952b51f43bed9e14cac394c6b333
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Jan 6 09:05:42 2012 -0600

    gcc fix.

 netpanzer-0.8.4-gcc470.patch |   11 +++++++++++
 netpanzer.spec               |    3 +++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/netpanzer-0.8.4-gcc470.patch b/netpanzer-0.8.4-gcc470.patch
new file mode 100644
index 0000000..221cf54
--- /dev/null
+++ b/netpanzer-0.8.4-gcc470.patch
@@ -0,0 +1,11 @@
+--- src/Lib/ArrayUtil/QueueTemplate.hpp~	2012-01-05 10:04:04.000000000 -0600
++++ src/Lib/ArrayUtil/QueueTemplate.hpp	2012-01-06 08:16:58.960868244 -0600
+@@ -42,7 +42,7 @@
+ 
+     bool enqueue(const TYPE& object )
+     {
+-        add( object, (rear + 1) % this->size );
++        this->add( object, (rear + 1) % this->size );
+         rear = (rear + 1) % this->size;
+ 
+         if ( front == rear )
diff --git a/netpanzer.spec b/netpanzer.spec
index 79c84cc..8ea0ee6 100644
--- a/netpanzer.spec
+++ b/netpanzer.spec
@@ -16,6 +16,7 @@ Patch0:         netpanzer-desktop.patch
 Patch4:         netpanzer-0.8.2-MapSelectionView-memory.patch
 #Patch5:         netpanzer-0.8.3-scons-fixes.patch
 Patch6:         netpanzer-0.8.3-optflags-580241.patch
+Patch7:		netpanzer-0.8.4-gcc470.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  physfs-devel >= 0.1.9, desktop-file-utils, doxygen, scons
@@ -49,6 +50,7 @@ sed -i 's/\r//' RELNOTES
 %patch4 -p0
 #%patch5 -p0
 %patch6 -p1
+%patch7 -p0
 
 %build
 scons datadir=%{_datadir}/netpanzer %{?_smp_mflags}
@@ -107,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Jan 05 2012 Jon Ciesla <limburgher at gmail.com> - 0.8.4-1
 - 0.8.4.
+- Patch for gcc 4.7.0.
 
 * Mon Feb 28 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.8.3.svn612010-4
 - Build with $RPM_OPT_FLAGS (#580241).


More information about the scm-commits mailing list