rpms/KoboDeluxe/devel KoboDeluxe-0.5.1-gcc44.patch, NONE, 1.1 KoboDeluxe.spec, 1.8, 1.9

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/KoboDeluxe/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21868

Modified Files:
	KoboDeluxe.spec 
Added Files:
	KoboDeluxe-0.5.1-gcc44.patch 
Log Message:
* Mon Mar 9  2009 Hans de Goede <hdegoede at redhat.com> 0.5.1-4
- Fix building with gcc 4.4


KoboDeluxe-0.5.1-gcc44.patch:

--- NEW FILE KoboDeluxe-0.5.1-gcc44.patch ---
diff -up KoboDeluxe-0.5.1/graphics/window.cpp~ KoboDeluxe-0.5.1/graphics/window.cpp
--- KoboDeluxe-0.5.1/graphics/window.cpp~	2007-12-14 10:13:24.000000000 +0100
+++ KoboDeluxe-0.5.1/graphics/window.cpp	2009-03-09 11:16:04.000000000 +0100
@@ -398,7 +398,7 @@ void window_t::center_token_fxp(int _x, 
 		 */
 		if(token)
 		{
-			char *tok = strchr(txt, token);
+			const char *tok = strchr(txt, token);
 			if(tok)
 				tokpos = tok-txt;
 			else


Index: KoboDeluxe.spec
===================================================================
RCS file: /cvs/extras/rpms/KoboDeluxe/devel/KoboDeluxe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KoboDeluxe.spec	23 Feb 2009 21:54:43 -0000	1.8
+++ KoboDeluxe.spec	9 Mar 2009 10:18:08 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           KoboDeluxe
 Version:        0.5.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        3'rd person scrolling 2D shooter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,6 +10,7 @@
 Source2:        %{name}.desktop
 Patch1:         KoboDeluxe-defaults.patch
 Patch2:         KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch
+Patch3:         KoboDeluxe-0.5.1-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -30,6 +31,7 @@
 %setup -q
 %patch1 -p1 -z .defaults
 %patch2 -p1 -b .pipe-unistd
+%patch3 -p1
 sed -i 's|$(sharedstatedir)/kobo-deluxe/scores|%{_var}/games/kobo-deluxe|g' \
   configure
 iconv -f ISO-8859-1 -t UTF8 README > tmp;         mv tmp README
@@ -91,6 +93,9 @@
 
 
 %changelog
+* Mon Mar 9  2009 Hans de Goede <hdegoede at redhat.com> 0.5.1-4
+- Fix building with gcc 4.4
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild