rpms/pachi/devel pachi-alt-warnigs-fix.patch, NONE, 1.1 pachi-more-fixes.patch, NONE, 1.1 pachi.spec, 1.5, 1.6

[Hans de Goede]

Author: jwrdegoede

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

Modified Files:
	pachi.spec 
Added Files:
	pachi-alt-warnigs-fix.patch pachi-more-fixes.patch 
Log Message:
* Sun Jan 11 2009 Hans de Goede <hdegoede at redhat.com> 1.0-6
- Add 2 patches with small fixes from altlinux


pachi-alt-warnigs-fix.patch:

--- NEW FILE pachi-alt-warnigs-fix.patch ---
--- src/gfx.c.orig
+++ src/gfx.c
@@ -16,7 +16,7 @@
 /*
     LoadT carga un grafico en formato .T de 24 bits en una superficie SDL
 */
-void LoadT(SDL_Surface **Tsurface, char *str)
+void LoadT(SDL_Surface **Tsurface, const char *str)
 {
     FILE *Tsrc;
 
@@ -69,7 +69,7 @@ void LoadT(SDL_Surface **Tsurface, char *str)
     fclose(Tsrc);
 }
 
-SDL_Surface * LoadT8(char *str)
+SDL_Surface * LoadT8(const char *str)
 {
     SDL_Surface *Tsurface;
     FILE *Tsrc;
--- src/output.c.orig
+++ src/output.c
@@ -210,7 +210,7 @@ void print_room()
     SDL_Flip(screen);
 }
 
-void showcode(char *str)
+void showcode(const char *str)
 {
     SDL_Rect code;
 	code.x=280; code.y=220;code.w=240;code.h=50;
--- src/structs.h.orig
+++ src/structs.h
@@ -39,11 +39,11 @@ struct Cplayer
 
 struct Cstages
 {
-    char * title;
-    char * music;
+    const char * title;
+    const char * music;
     int  objects;
     int  time;
-    char * code;
+    const char * code;
 };
 
 struct Croom
--- src/fx.c.orig
+++ src/fx.c
@@ -58,7 +58,7 @@ void initfade_object(int x, int y, int object)
     alphade=255;
     object-=200;
     fadeobject=SDL_CreateRGBSurface(SDL_SWSURFACE,R_tileside,R_tileside,16,0,0,0,0);
-    SDL_SetColorKey(fadeobject,SDL_SRCCOLORKEY,(fadeobject->format,0,255,0));
+    SDL_SetColorKey(fadeobject,SDL_SRCCOLORKEY,SDL_MapRGB(fadeobject->format,0,255,0));
     SDL_Rect objectsrc;
 	objectsrc.w=R_tileside;objectsrc.h=R_tileside;
 	objectsrc.y=R_tileside*10;objectsrc.x=R_tileside*object;

pachi-more-fixes.patch:

--- NEW FILE pachi-more-fixes.patch ---
--- Pachi/src/game.c	2009-01-11 21:15:47.000000000 +0100
+++ Pachi.new/src/game.c	2009-01-11 21:05:04.000000000 +0100
@@ -80,7 +80,7 @@
     if(y < R_max_y)
 	if(roommap[x][y+1]==stage)
 	    show_arrow(arrow_down, show);
-    if(y < 0)
+    if(y > 0)
 	if(roommap[x][y-1]==stage)
 	    show_arrow(arrow_up, show);
 }
--- Pachi/src/text.c	2009-01-11 21:15:47.000000000 +0100
+++ Pachi.new/src/text.c	2009-01-11 21:08:15.000000000 +0100
@@ -15,7 +15,7 @@
     srctxt.y = 0;
     int linecounter = 0 ; // este contador se utiliza para saber en que linea imprimimos el texto
     int charpos = 0;
-    for(unsigned charcounter = 0; charcounter <= (strlen(texto));charcounter++)
+    for(size_t charcounter = 0; charcounter < strlen(texto); charcounter++)
     {
 	int curchar=texto[charcounter];
 	if(curchar == 94)


Index: pachi.spec
===================================================================
RCS file: /cvs/extras/rpms/pachi/devel/pachi.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pachi.spec	19 Feb 2008 09:25:55 -0000	1.5
+++ pachi.spec	11 Jan 2009 20:22:34 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pachi
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Pachi El Marciano - Platform Game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -9,6 +9,8 @@
 Source1:        %{name}.desktop
 Patch0:         %{name}-fixes.patch
 Patch1:         %{name}-nosound.patch
+Patch2:         %{name}-more-fixes.patch
+Patch3:         %{name}-alt-warnigs-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel desktop-file-utils ImageMagick
 Requires:       hicolor-icon-theme
@@ -20,8 +22,10 @@
 
 %prep
 %setup -q -n Pachi
-%patch0 -p1 -z .fixes
-%patch1 -p1 -z .nosound
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p0
 
 
 %build
@@ -78,6 +82,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Hans de Goede <hdegoede at redhat.com> 1.0-6
+- Add 2 patches with small fixes from altlinux
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-5
 - Autorebuild for GCC 4.3