[njam/f14/master] - Fix compilation with gcc 4.5
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Sep 10 07:57:31 UTC 2010
commit 0d8980fe9563fdd071178f03aa1a928662b6e0bf
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Sep 10 09:57:19 2010 +0200
- Fix compilation with gcc 4.5
njam-1.25-gcc45.patch | 21 +++++++++++++++++++++
njam.spec | 7 ++++++-
2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/njam-1.25-gcc45.patch b/njam-1.25-gcc45.patch
new file mode 100644
index 0000000..dbabbd5
--- /dev/null
+++ b/njam-1.25-gcc45.patch
@@ -0,0 +1,21 @@
+diff -up njam-1.25-src/src/njamedit.cpp~ njam-1.25-src/src/njamedit.cpp
+--- njam-1.25-src/src/njamedit.cpp~ 2010-09-10 09:33:46.000000000 +0200
++++ njam-1.25-src/src/njamedit.cpp 2010-09-10 09:40:08.140574002 +0200
+@@ -114,7 +114,7 @@ void NjamEngine::LevelEditor()
+ key = SDLK_a;
+ else if (CheckForSave())
+ {
+- LogFile::LogFile("Saving maps");
++ LogFile("Saving maps");
+ m_Maps.Save(filename);
+ level_type_was = level_type;
+ changed = false;
+@@ -139,7 +139,7 @@ void NjamEngine::LevelEditor()
+ "levels/%s.%s",
+ #endif
+ filename, types[level_type]);
+- LogFile::LogFile("Saving maps");
++ LogFile("Saving maps");
+ m_Maps.Save(buf);
+ level_type_was = level_type;
+ changed = false;
diff --git a/njam.spec b/njam.spec
index 5d6fb68..de2a7e6 100644
--- a/njam.spec
+++ b/njam.spec
@@ -1,6 +1,6 @@
Name: njam
Version: 1.25
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Maze-game, eat all the cookies while avoiding the badguys
Group: Amusements/Games
License: GPLv2+
@@ -14,6 +14,7 @@ Source2: njam.desktop
Patch0: njam-1.25-drop-setgid.patch
Patch1: njam-1.25-html.patch
Patch2: njam-1.25-leveledit.patch
+Patch3: njam-1.25-gcc45.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel
BuildRequires: ImageMagick desktop-file-utils
@@ -32,6 +33,7 @@ level skins, many different levels and an integrated level editor.
%patch0 -p1 -z .setgid
%patch1 -p1
%patch2 -p1 -z .leveledit
+%patch3 -p1
%build
@@ -101,6 +103,9 @@ fi
%changelog
+* Fri Sep 10 2010 Hans de Goede <hdegoede at redhat.com> 1.25-12
+- Fix compilation with gcc 4.5
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list