rpms/desmume/F-10 desmume-0.9.2-fix-ioregs-crash.patch, NONE, 1.1 desmume.spec, 1.6, 1.7 desmume-0.9.2-nobuggytoolsmenu.patch, 1.1, NONE

[Andrea Musuruane]

Author: musuruan

Update of /cvs/free/rpms/desmume/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5613

Modified Files:
	desmume.spec 
Added Files:
	desmume-0.9.2-fix-ioregs-crash.patch 
Removed Files:
	desmume-0.9.2-nobuggytoolsmenu.patch 
Log Message:
* Thu Apr 30 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.2-2
- Added a patch from upstream to fix IO Regs menu crash (SF #2781065)


desmume-0.9.2-fix-ioregs-crash.patch:

--- NEW FILE desmume-0.9.2-fix-ioregs-crash.patch ---
Index: src/gtk/tools/ioregsView.cpp
===================================================================
--- src/gtk/tools/ioregsView.cpp	(revisione 2003)
+++ src/gtk/tools/ioregsView.cpp	(revisione 2004)
@@ -20,6 +20,7 @@
  */
 
 #include <gtk/gtk.h>
+#include <string.h>
 #include "../dTool.h"
 
 #include "../MMU.h"
@@ -398,6 +399,7 @@
 
 static void close()
 {
+	memset(current_reg, 0, sizeof(current_reg));
 	dTool_CloseCallback(DTOOL_ID);
 }
 


Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-10/desmume.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- desmume.spec	25 Apr 2009 10:04:26 -0000	1.6
+++ desmume.spec	30 Apr 2009 19:20:45 -0000	1.7
@@ -1,6 +1,6 @@
 Name: desmume
 Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A Nintendo DS emulator
 
 Group: Applications/Emulators
@@ -9,7 +9,9 @@
 Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1: desmume-man-pages-0.7.3.tar.gz
 Patch0: %{name}-0.9-dontlookinbuilddir.patch
-Patch1: %{name}-0.9.2-nobuggytoolsmenu.patch
+# Fix IO Regs menu
+# http://sourceforge.net/tracker/?func=detail&atid=832291&aid=2781065&group_id=164579
+Patch1: %{name}-0.9.2-fix-ioregs-crash.patch
 # Compile on 64 bit systems
 # http://sourceforge.net/tracker/?func=detail&aid=2755952&group_id=164579&atid=832291
 Patch2: %{name}-0.9.2-64bit.patch
@@ -52,9 +54,7 @@
 %setup -q -T -D -a 1
 
 %patch0 -p1
-%ifarch x86_64
-%patch1 -p1
-%endif
+%patch1 -p0
 %patch2 -p0
 
 # Fix end-of-line encoding
@@ -189,6 +189,9 @@
 
 
 %changelog
+* Thu Apr 30 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.2-2
+- Added a patch from upstream to fix IO Regs menu crash (SF #2781065)
+
 * Sun Apr 19 2009 Andrea Musuruane <musuruan at gmail.com> 0.9.2-1
 - Updated to upstream version 0.9.2
 - Removed no longer needed patch to compile with gcc 4.4


--- desmume-0.9.2-nobuggytoolsmenu.patch DELETED ---