rpms/sidplay/devel gcc440.patch,NONE,1.1 sidplay.spec,1.4,1.5

[Linus Walleij]

Author: snirkel

Update of /cvs/nonfree/rpms/sidplay/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11554

Modified Files:
	sidplay.spec 
Added Files:
	gcc440.patch 
Log Message:
Trying to resolve build problem.


gcc440.patch:

--- NEW FILE gcc440.patch ---
diff -ur sidplay-2.0.9-orig/src/args.cpp sidplay-2.0.9/src/args.cpp
--- sidplay-2.0.9-orig/src/args.cpp	2009-05-11 21:57:04.000000000 +0200
+++ sidplay-2.0.9/src/args.cpp	2009-05-11 22:06:46.000000000 +0200
@@ -97,21 +97,22 @@
 {
     char *sep;
     uint_least32_t _time;
+    char *str_copy = strdup(str);
 
     // Check for empty string
     if (*str == '\0')
         return false;
 
-    sep = strstr (str, ":");
+    sep = strstr (str_copy, ":");
     if (!sep)
     {   // User gave seconds
-        _time = atoi (str);
+        _time = atoi (str_copy);
     }
     else
     {   // Read in MM:SS format
         int val;
         *sep = '\0';
-        val  = atoi (str);
+        val  = atoi (str_copy);
         if (val < 0 || val > 99)
             return false;
         _time = (uint_least32_t) val * 60;


Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/devel/sidplay.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sidplay.spec	29 Mar 2009 15:16:15 -0000	1.4
+++ sidplay.spec	11 May 2009 20:09:15 -0000	1.5
@@ -11,6 +11,7 @@
 # Patch lifted from Debian
 # http://packages.debian.org/unstable/oldlibs/sidplay
 Patch0:		sidplay_2.0.9-5.diff.gz
+Patch1:		gcc440.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	GPL
 BuildRequires:	libsidplay-devel
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-sidbuilders=%{_libdir}/sidplay/builders