rpms/adonthell/devel adonthell-gcc44.patch, NONE, 1.1 adonthell.spec, 1.3, 1.4

[Mathieu Bridon]

Author: bochecha

Update of /cvs/pkgs/rpms/adonthell/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11374

Modified Files:
	adonthell.spec 
Added Files:
	adonthell-gcc44.patch 
Log Message:
Fixed building with GCC 4.4



adonthell-gcc44.patch:

--- NEW FILE adonthell-gcc44.patch ---
diff -C 3 -r1.36 -r1.37
*** src/dialog.cc	13 Oct 2007 19:47:25 -0000	1.36
--- src/dialog.cc	1 Mar 2009 12:26:14 -0000	1.37
***************
*** 265,271 ****
  {
      u_int32 begin, end, len;
      PyObject *result;
!     char *tmp, *start, *mid, *str = NULL;
      character *the_player = data::the_player;
      string newstr (s); 
  
--- 265,272 ----
  {
      u_int32 begin, end, len;
      PyObject *result;
!     const char *start;
!     char *tmp, *mid, *str = NULL;
      character *the_player = data::the_player;
      string newstr (s); 
  
***************
*** 318,324 ****
  
          // Error!
          cout << "\n*** Error, unknown macro " << start << flush;
!         start[0] = ' ';
      }
      
      // execute python functions
--- 319,325 ----
  
          // Error!
          cout << "\n*** Error, unknown macro " << start << flush;
!         newstr[newstr.length () - strlen (start)] = ' ';
      }
      
      // execute python functions


Index: adonthell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/adonthell/devel/adonthell.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- adonthell.spec	24 Feb 2009 00:11:36 -0000	1.3
+++ adonthell.spec	1 Mar 2009 14:46:03 -0000	1.4
@@ -2,13 +2,16 @@
 
 Name:           adonthell
 Version:        0.3.5
-Release:        0.5%{?dist}
+Release:        0.6%{?dist}
 Summary:        A 2D graphical RPG game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://adonthell.linuxgames.com/
 Source0:        http://download.savannah.gnu.org/releases/adonthell/adonthell-0.3.5.tar.gz
+## Submitted upstream, will be in next release
+# https://savannah.nongnu.org/bugs/index.php?25737
+Patch0:         %{name}-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -49,6 +52,8 @@
 sed -i 's|myconfig.gamedir + "/locale"|"%{_datadir}/locale"|' src/nls.cc
 # remove hardcoded CFLAGS
 sed -i 's|^CFLAGS|^#CFLAGS|g' configure
+# build with GCC 4.4
+%patch0 -p0
 
 
 %build
@@ -77,6 +82,9 @@
 
 
 %changelog
+* Sun Mar 01 2009 Mathieu Bridon <bochecha at fedoraproject.org> - 0.3.5-0.6
+- Fixed building with GCC 4.4
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-0.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild