rpms/SheepShaver/devel BasiliskII-disk-scan-crash.patch, NONE, 1.1 SheepShaver-configure-fix.patch, NONE, 1.1 SheepShaver.spec, 1.12, 1.13 SheepShaver-disk-scan-crash.patch, 1.1, NONE

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/SheepShaver/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv393

Modified Files:
	SheepShaver.spec 
Added Files:
	BasiliskII-disk-scan-crash.patch 
	SheepShaver-configure-fix.patch 
Removed Files:
	SheepShaver-disk-scan-crash.patch 
Log Message:
* Sun Mar 10 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 2.3-0.12.20130310
- New upstream: http://sheepsaver.cebix.net/
- Uses github, no source tarbals :| Update to todays git master (bbc0af47)
- Modernize spec
- Fix FTBFS (since F-11 !)
- Switch from esound (deprecated / obsolete) to SDL for sound output


BasiliskII-disk-scan-crash.patch:
 sys_unix.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE BasiliskII-disk-scan-crash.patch ---
diff -up macemu-master/BasiliskII/src/Unix/sys_unix.cpp~ macemu-master/BasiliskII/src/Unix/sys_unix.cpp
--- macemu-master/BasiliskII/src/Unix/sys_unix.cpp~	2013-03-04 19:14:20.000000000 +0100
+++ macemu-master/BasiliskII/src/Unix/sys_unix.cpp	2013-03-10 17:33:06.005230783 +0100
@@ -324,7 +324,7 @@ void SysAddDiskPrefs(void)
 			line[len-1] = 0;
 
 			// Parse line
-			char *dev, *mnt_point, *fstype;
+			char *dev = NULL, *mnt_point = NULL, *fstype = NULL;
 			if (sscanf(line, "%as %as %as", &dev, &mnt_point, &fstype) == 3) {
 				if (strcmp(fstype, "hfs") == 0)
 					PrefsAddString("disk", dev);

SheepShaver-configure-fix.patch:
 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE SheepShaver-configure-fix.patch ---
diff -up macemu-master/SheepShaver/src/Unix/configure.ac~ macemu-master/SheepShaver/src/Unix/configure.ac
--- macemu-master/SheepShaver/src/Unix/configure.ac~	2013-03-04 19:14:20.000000000 +0100
+++ macemu-master/SheepShaver/src/Unix/configure.ac	2013-03-12 13:02:00.559524476 +0100
@@ -652,7 +652,7 @@ esac
 dnl BINCUE
 AS_IF([test  "x$with_bincue" = "xyes" ], [have_bincue=yes], [have_bincue=no])
 AS_IF([test  "x$have_bincue" = "xyes" ], [
-   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno"]]; then
+   if [[ "xOSX_CORE_AUDIO" = "xno"  -a "x$WANT_SDL_AUDIO"="xno" ]]; then
        AC_MSG_ERROR([You need SDL or OSX Core Audio to use BINCUE support.])
    else
        CPPFLAGS="$CPPFLAGS -DBINCUE $OSX_CORE_AUDIO"


Index: SheepShaver.spec
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/devel/SheepShaver.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SheepShaver.spec	10 Mar 2013 23:16:20 -0000	1.12
+++ SheepShaver.spec	12 Mar 2013 12:07:16 -0000	1.13
@@ -12,8 +12,11 @@
 Source1:        cxmon-3.2-cvs20130310.tar.gz
 Source2:        SheepShaver.png
 Patch0:         SheepShaver-no-strip.patch
-Patch1:         SheepShaver-disk-scan-crash.patch
-Patch2:         cxmon-3.2-hide-symbols.patch
+Patch1:         SheepShaver-configure-fix.patch
+# SheepShaver uses BasiliskII's sys_unix.cpp through a symlink
+Patch2:         BasiliskII-disk-scan-crash.patch
+# Patch 10 because this is for Source1 rather then Source0
+Patch10:        cxmon-3.2-hide-symbols.patch
 BuildRequires:  libtool gcc-c++ gtk2-devel
 BuildRequires:  desktop-file-utils readline-devel
 BuildRequires:  libXt-devel libXxf86vm-devel SDL-devel
@@ -36,8 +39,9 @@
 %setup -q -a 1 -n macemu-master
 %patch0 -p1
 %patch1 -p1
-pushd cxmon-%{mon_version}
 %patch2 -p1
+pushd cxmon-%{mon_version}
+%patch10 -p1
 popd
 chmod -x SheepShaver/src/kpx_cpu/src/mathlib/ieeefp.hpp
 


--- SheepShaver-disk-scan-crash.patch DELETED ---