rpms/springlobby/devel springlobby-10425-gcc4.4.patch, NONE, 1.1 springlobby.spec, 1.3, 1.4
Aurelien Bompard
abompard at fedoraproject.org
Sun Mar 29 10:21:39 UTC 2009
Author: abompard
Update of /cvs/pkgs/rpms/springlobby/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14572
Modified Files:
springlobby.spec
Added Files:
springlobby-10425-gcc4.4.patch
Log Message:
* Sun Mar 29 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.0.1.10425-3
- add patch for gcc 4.4
springlobby-10425-gcc4.4.patch:
--- NEW FILE springlobby-10425-gcc4.4.patch ---
commit ed4e43e73b760907fd2b356e553a0a4d48a44ae6
Author: Rene Milk <koshi at springlobby.info>
Date: Sun Mar 22 11:53:22 2009 +0100
fixes 816
diff --git a/src/settings++/presets.cpp b/src/settings++/presets.cpp
index cc60791..8b13789 100644
--- a/src/settings++/presets.cpp
+++ b/src/settings++/presets.cpp
@@ -1,11 +1 @@
-#include "presets.h"
-template <typename T, int valueCount> presetValues<T,valueCount>::presetValues ( wxString key_arg,
- const wxString* levelLabels,const T* values_arg)
- {
- for(int i = 0; i< valueCount;++i)
- {
- values[levelLabels[i]]=values_arg[i];
- }
- key = key_arg;
- }
diff --git a/src/settings++/presets.h b/src/settings++/presets.h
index 53cc1be..44bb26d 100644
--- a/src/settings++/presets.h
+++ b/src/settings++/presets.h
@@ -32,8 +32,12 @@ public:
wxString key;
//levelLabels and values_arg MUST have same length
- presetValues ( wxString key_arg,const wxString* levelLabels,const T* values_arg);
-
+ presetValues ( wxString key_arg,const wxString* levelLabels,const T* values_arg) {
+ for(int i = 0; i< valueCount;++i) {
+ values[levelLabels[i]]=values_arg[i];
+ }
+ key = key_arg;
+ }
};
const int levels_low_To_High_size = 3;
const int levels_vlow_To_vHigh_size =5;
Index: springlobby.spec
===================================================================
RCS file: /cvs/pkgs/rpms/springlobby/devel/springlobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- springlobby.spec 28 Mar 2009 14:27:39 -0000 1.3
+++ springlobby.spec 29 Mar 2009 10:21:09 -0000 1.4
@@ -1,6 +1,6 @@
Name: springlobby
Version: 0.0.1.10425
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A lobby client for the spring RTS game engine
Group: Amusements/Games
@@ -8,6 +8,9 @@
License: GPLv2
URL: http://springlobby.info
Source0: http://www.springlobby.info/tarballs/springlobby-%{version}.tar.bz2
+# Upstream bug 816: http://springlobby.info/issues/show/816
+# http://springlobby.info/repositories/diff/springlobby?format=diff&rev=ed4e43e73b760907fd2b356e553a0a4d48a44ae6
+Patch0: springlobby-10425-gcc4.4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -88,6 +91,9 @@
%changelog
+* Sun Mar 29 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.0.1.10425-3
+- add patch for gcc 4.4
+
* Sat Mar 28 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.0.1.10425-2
- rebuild
More information about the scm-commits
mailing list