rpms/SheepShaver/F-18 SheepShaver-disk-scan-crash.patch, NONE, 1.1 SheepShaver-no-strip.patch, NONE, 1.1 cxmon-3.2-hide-symbols.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 SheepShaver.spec, 1.10, 1.11 sources, 1.3, 1.4 SheepShaver-2.2-nostrip.patch, 1.2, NONE SheepShaver-2.3-gcc43.patch, 1.1, NONE

Mon Mar 11 00:18:51 CET 2013

Author: jwrdegoede

Update of /cvs/free/rpms/SheepShaver/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29061

Modified Files:
	.cvsignore SheepShaver.spec sources 
Added Files:
	SheepShaver-disk-scan-crash.patch SheepShaver-no-strip.patch 
	cxmon-3.2-hide-symbols.patch 
Removed Files:
	SheepShaver-2.2-nostrip.patch SheepShaver-2.3-gcc43.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


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

--- NEW FILE SheepShaver-disk-scan-crash.patch ---
diff -up macemu-master/SheepShaver/src/Unix/sys_unix.cpp~ macemu-master/SheepShaver/src/Unix/sys_unix.cpp
--- macemu-master/SheepShaver/src/Unix/sys_unix.cpp~	2013-03-04 19:14:20.000000000 +0100
+++ macemu-master/SheepShaver/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-no-strip.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE SheepShaver-no-strip.patch ---
diff -up macemu-master/SheepShaver/src/Unix/Makefile.in~ macemu-master/SheepShaver/src/Unix/Makefile.in
--- macemu-master/SheepShaver/src/Unix/Makefile.in~	2013-03-04 19:14:20.000000000 +0100
+++ macemu-master/SheepShaver/src/Unix/Makefile.in	2013-03-10 21:37:07.317286985 +0100
@@ -35,7 +35,7 @@ BLESS = @BLESS@
 EXEEXT = @EXEEXT@
 KEYCODES = @KEYCODES@
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
 SLIRP_CFLAGS = @SLIRP_CFLAGS@

cxmon-3.2-hide-symbols.patch:
 disass/dis-asm.h |   23 -----------------------
 mon_disass.cpp   |   10 +++++-----
 2 files changed, 5 insertions(+), 28 deletions(-)

--- NEW FILE cxmon-3.2-hide-symbols.patch ---
diff -up cxmon-3.2/src/mon_disass.cpp~ cxmon-3.2/src/mon_disass.cpp
--- cxmon-3.2/src/mon_disass.cpp~	2007-06-07 11:51:56.000000000 +0200
+++ cxmon-3.2/src/mon_disass.cpp	2013-03-10 23:18:29.846310333 +0100
@@ -41,21 +41,21 @@ bool mon_macos_mode = false;
 extern "C" {
 #include "disass/dis-asm.h"
 
-int buffer_read_memory(bfd_vma from, bfd_byte *to, unsigned int length, struct disassemble_info *info)
+static int buffer_read_memory(bfd_vma from, bfd_byte *to, unsigned int length, struct disassemble_info *info)
 {
 	while (length--)
 		*to++ = mon_read_byte(from++);
 	return 0;
 }
 
-void perror_memory(int status, bfd_vma memaddr, struct disassemble_info *info)
+static void perror_memory(int status, bfd_vma memaddr, struct disassemble_info *info)
 {
 	info->fprintf_func(info->stream, "Unknown error %d\n", status);
 }
 
-bool lookup_lowmem;
+static bool lookup_lowmem;
 
-void generic_print_address(bfd_vma addr, struct disassemble_info *info)
+static void generic_print_address(bfd_vma addr, struct disassemble_info *info)
 {
 	if (lookup_lowmem && addr >= 0x100 && addr < 0x3000) {
 		if (((addr >= 0x400 && addr < 0x800) || (addr >= 0xe00 && addr < 0x1e00)) && ((addr & 3) == 0)) {
@@ -91,7 +91,7 @@ void generic_print_address(bfd_vma addr,
 		info->fprintf_func(info->stream, "$%08x", (uint32)addr);
 }
 
-int generic_symbol_at_address(bfd_vma addr, struct disassemble_info *info)
+static int generic_symbol_at_address(bfd_vma addr, struct disassemble_info *info)
 {
 	return 0;
 }
diff -up cxmon-3.2/src/disass/dis-asm.h~ cxmon-3.2/src/disass/dis-asm.h
--- cxmon-3.2/src/disass/dis-asm.h~	2002-09-07 14:48:15.000000000 +0200
+++ cxmon-3.2/src/disass/dis-asm.h	2013-03-10 23:22:15.510311199 +0100
@@ -249,29 +249,6 @@ extern disassembler_ftype disassembler	P
 extern void disassembler_usage          PARAMS ((FILE *));
 
 
-/* This block of definitions is for particular callers who read instructions
-   into a buffer before calling the instruction decoder.  */
-
-/* Here is a function which callers may wish to use for read_memory_func.
-   It gets bytes from a buffer.  */
-extern int buffer_read_memory
-  PARAMS ((bfd_vma, bfd_byte *, unsigned int, struct disassemble_info *));
-
-/* This function goes with buffer_read_memory.
-   It prints a message using info->fprintf_func and info->stream.  */
-extern void perror_memory PARAMS ((int, bfd_vma, struct disassemble_info *));
-
-
-/* Just print the address in hex.  This is included for completeness even
-   though both GDB and objdump provide their own (to print symbolic
-   addresses).  */
-extern void generic_print_address
-  PARAMS ((bfd_vma, struct disassemble_info *));
-
-/* Always true.  */
-extern int generic_symbol_at_address
-  PARAMS ((bfd_vma, struct disassemble_info *));
-
 /* Macro to initialize a disassemble_info struct.  This should be called
    by all applications creating such a struct.  */
 #define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-18/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Oct 2008 21:18:42 -0000	1.3
+++ .cvsignore	10 Mar 2013 23:18:50 -0000	1.4
@@ -1,3 +1,3 @@
-cxmon-3.2.tar.gz
-SheepShaver-2.3-0.20060514.1.tar.bz2
+cxmon-3.2-cvs20130310.tar.gz
 SheepShaver.png
+macemu-master.zip


Index: SheepShaver.spec
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-18/SheepShaver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SheepShaver.spec	2 Mar 2012 22:15:09 -0000	1.10
+++ SheepShaver.spec	10 Mar 2013 23:18:51 -0000	1.11
@@ -1,27 +1,26 @@
-%define date 20060514
+%define date 20130310
 %define mon_version 3.2
-%define desktop_vendor rpmforge
 
-Summary: Power Macintosh emulator
-Name: SheepShaver
-Version: 2.3
-Release: 0.10.%{date}%{?dist}
-License: GPLv2+
-Group: Applications/Emulators
-URL: http://www.gibix.net/projects/sheepshaver/
-Source0: http://www.gibix.net/projects/sheepshaver/files/SheepShaver-%{version}-0.%{date}.1.tar.bz2
-Source1: http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
-Source2: SheepShaver.png
-Patch0: SheepShaver-2.2-nostrip.patch
-Patch1: SheepShaver-2.3-gcc43.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, gtk2-devel, esound-devel >= 0.2.8
-BuildRequires: desktop-file-utils, readline-devel
-%{?_with_sdl:BuildRequires: SDL-devel}
-BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+Summary:        Power Macintosh emulator
+Name:           SheepShaver
+Version:        2.3
+Release:        0.12.%{date}%{?dist}
+License:        GPLv2+
+URL:            http://sheepshaver.cebix.net/
+# GRRR github, no url ...
+Source0:        macemu-master.zip
+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
+BuildRequires:  libtool gcc-c++ gtk2-devel
+BuildRequires:  desktop-file-utils readline-devel
+BuildRequires:  libXt-devel libXxf86vm-devel SDL-devel
+Requires:       hicolor-icon-theme
 # Other archs need an instruction skipper on well-known invalid
 # memory references (e.g. illegal writes to ROM).
-ExclusiveArch: i586 ppc x86_64
+ExclusiveArch:  i686 x86_64 ppc
 
 %description
 SheepShaver is a MacOS run-time environment that allows you to run classic
@@ -32,33 +31,33 @@
 speed (i.e. with no emulation involved). There is also a built-in PowerPC
 G4 emulator, without MMU support, for non-PowerPC systems.
 
-Available rebuild options :
---without : mon
---with    : sdl
-
 
 %prep
-%setup -q -a 1
-%patch0 -p1 -b .nostrip
-%patch1 -p1 -b .gcc43
+%setup -q -a 1 -n macemu-master
+%patch0 -p1
+%patch1 -p1
+pushd cxmon-%{mon_version}
+%patch2 -p1
+popd
+chmod -x SheepShaver/src/kpx_cpu/src/mathlib/ieeefp.hpp
 
 
 %build
-pushd src/Unix
-%configure \
-    --datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
-    %{!?_without_mon: --with-mon=../../cxmon-%{mon_version}/src} \
-    %{?_with_sdl: --enable-sdl-video --enable-sdl-audio}
-%{__mkdir} obj
-%{__make} %{?_smp_mflags}
+pushd SheepShaver/src/Unix
+NO_CONFIGURE=1 ./autogen.sh
+export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
+%configure --datadir=%{_sysconfdir} --enable-ppc-emulator=yes \
+    --with-mon=../../../cxmon-%{mon_version}/src \
+    --disable-xf86-dga --enable-sdl-audio --with-bincue
+make %{?_smp_mflags}
 popd
 
 
 %install
-%{__rm} -rf %{buildroot}
-%makeinstall -C src/Unix \
-    datadir="%{buildroot}%{_sysconfdir}"
-chmod +x %{buildroot}%{_sysconfdir}/%{name}/tunconfig
+pushd SheepShaver/src/Unix
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tunconfig
 
 # Create the system menu entry
 %{__cat} > %{name}.desktop << EOF
@@ -66,38 +65,58 @@
 Name=Sheep Shaver
 Comment=Power Macintosh Emulator
 Exec=SheepShaver
-Icon=SheepShaver.png
+Icon=SheepShaver
 Terminal=false
 Type=Application
 Categories=Game;Emulator;
 EOF
 
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor %{desktop_vendor} \
-    --dir %{buildroot}%{_datadir}/applications \
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+%if 0%{?fedora} && 0%{?fedora} < 19
+    --vendor rpmforge \
+%endif
     %{name}.desktop
 
-%{__install} -D -p -m 0644 %{SOURCE2} \
-    %{buildroot}%{_datadir}/pixmaps/SheepShaver.png
+install -D -p -m 0644 %{SOURCE2} \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/SheepShaver.png
+
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%clean
-%{__rm} -rf %{buildroot}
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-, root, root, 0755)
-%doc COPYING NEWS doc/Linux/*
+%doc SheepShaver/COPYING SheepShaver/NEWS SheepShaver/doc/Linux/*
 %dir %{_sysconfdir}/SheepShaver/
 %config(noreplace) %{_sysconfdir}/SheepShaver/keycodes
 %{_sysconfdir}/SheepShaver/tunconfig
 %{_bindir}/SheepShaver
-%{_datadir}/pixmaps/SheepShaver.png
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/SheepShaver.png
+%{_datadir}/applications/*%{name}.desktop
 %{_mandir}/man1/SheepShaver.1*
 
 
 %changelog
+* 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
+
+* Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.3-0.11.20060514
+- Mass rebuilt for Fedora 19 Features
+
 * Fri Mar 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.3-0.10.20060514
 - Rebuilt for c++ ABI breakage
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/SheepShaver/F-18/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Oct 2008 21:18:42 -0000	1.3
+++ sources	10 Mar 2013 23:18:51 -0000	1.4
@@ -1,3 +1,3 @@
-8fb95c58f6c04eace6ae84d0c7b79ca1  cxmon-3.2.tar.gz
-81904c06340fb8101800df864eacedcd  SheepShaver-2.3-0.20060514.1.tar.bz2
+477d800bb4b36e90aa94c0d6810b8e53  cxmon-3.2-cvs20130310.tar.gz
 22e17876d74a37e1a9f19d2150170cee  SheepShaver.png
+1daf9f4ef843d0f3c6fb648c26bf0722  macemu-master.zip


--- SheepShaver-2.2-nostrip.patch DELETED ---


--- SheepShaver-2.3-gcc43.patch DELETED ---
