rpms/BasiliskII/devel cxmon-3.2-hide-symbols.patch, NONE, 1.1 cxmon-3.2-strfmt.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 BasiliskII.spec, 1.11, 1.12 sources, 1.4, 1.5 BasiliskII-SDL-audio.patch, 1.1, NONE BasiliskII-debuginfo.patch, 1.1, NONE BasiliskII-disk-scan-crash.patch, 1.1, NONE

Sat May 16 11:44:33 CEST 2015

Author: jwrdegoede

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

Modified Files:
	.cvsignore BasiliskII.spec sources 
Added Files:
	cxmon-3.2-hide-symbols.patch cxmon-3.2-strfmt.patch 
Removed Files:
	BasiliskII-SDL-audio.patch BasiliskII-debuginfo.patch 
	BasiliskII-disk-scan-crash.patch 
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede at gmail.com> - 1.0-0.20150516.5
- BasiliskII git snapshot du-jour
- Fix FTBFS (rf#3633)


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) \

cxmon-3.2-strfmt.patch:
 mon.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE cxmon-3.2-strfmt.patch ---
diff -up cxmon-3.2/src/mon.cpp~ cxmon-3.2/src/mon.cpp
--- cxmon-3.2/src/mon.cpp~	2010-02-21 12:58:33.000000000 +0100
+++ cxmon-3.2/src/mon.cpp	2015-05-16 11:00:16.619745081 +0200
@@ -868,7 +868,7 @@ static void help_or_hunt()
 	}
 	fprintf(monout, "x                        Quit mon\n"
 					"h                        This help text\n");
-	fprintf(monout, cmd_help);
+	fprintf(monout, "%s", cmd_help);
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Mar 2013 19:48:59 -0000	1.4
+++ .cvsignore	16 May 2015 09:44:33 -0000	1.5
@@ -1,3 +1,3 @@
 BasiliskII.png
-cxmon-3.2.tar.gz
+cxmon-3.2-cvs20130310.tar.gz
 macemu-master.zip


Index: BasiliskII.spec
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/BasiliskII.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasiliskII.spec	30 Aug 2014 23:59:32 -0000	1.11
+++ BasiliskII.spec	16 May 2015 09:44:33 -0000	1.12
@@ -1,19 +1,19 @@
-%define date 20130310
+%define date 20150516
 %define mon_version 3.2
 
 Summary:        68k Macintosh emulator
 Name:           BasiliskII
 Version:        1.0
-Release:        0.%{date}.4%{?dist}.1
+Release:        0.%{date}.5%{?dist}
 License:        GPLv2+
 URL:            http://basilisk.cebix.net/
 # GRRR github, no url ...
 Source0:        macemu-master.zip
-Source1:        http://cxmon.cebix.net/downloads/cxmon-%{mon_version}.tar.gz
+Source1:        cxmon-3.2-cvs20130310.tar.gz
 Source2:        BasiliskII.png
-Patch0:         BasiliskII-debuginfo.patch
-Patch1:         BasiliskII-disk-scan-crash.patch
-Patch2:         BasiliskII-SDL-audio.patch
+# Patch 10+ because this is for Source1 rather then Source0
+Patch10:        cxmon-3.2-hide-symbols.patch
+Patch11:        cxmon-3.2-strfmt.patch
 BuildRequires:  libtool gcc-c++ gtk2-devel
 BuildRequires:  desktop-file-utils readline-devel
 BuildRequires:  libXt-devel libXxf86vm-devel SDL-devel
@@ -28,9 +28,10 @@
 
 %prep
 %setup -q -a 1 -n macemu-master
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+pushd cxmon-%{mon_version}
+%patch10 -p1
+%patch11 -p1
+popd
 iconv -f ISO_8859-1 -t UTF8 BasiliskII/README > README
 touch -r BasiliskII/README README
 iconv -f ISO_8859-1 -t UTF8 BasiliskII/ChangeLog > ChangeLog
@@ -49,7 +50,7 @@
 
 %install
 pushd BasiliskII/src/Unix
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 popd
 chmod +x $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/tunconfig
 
@@ -102,6 +103,10 @@
 
 
 %changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede at gmail.com> - 1.0-0.20150516.5
+- BasiliskII git snapshot du-jour
+- Fix FTBFS (rf#3633)
+
 * Sat Aug 30 2014 SÃ©rgio Basto <sergio at serjux.com> - 1.0-0.20130310.4.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/BasiliskII/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Mar 2013 19:48:59 -0000	1.4
+++ sources	16 May 2015 09:44:33 -0000	1.5
@@ -1,3 +1,3 @@
 d82f6d88e98f6a200af96643eeef80ab  BasiliskII.png
-8fb95c58f6c04eace6ae84d0c7b79ca1  cxmon-3.2.tar.gz
-1daf9f4ef843d0f3c6fb648c26bf0722  macemu-master.zip
+477d800bb4b36e90aa94c0d6810b8e53  cxmon-3.2-cvs20130310.tar.gz
+5afbe1c0a1e7b16ce503aad4ca14f298  macemu-master.zip


--- BasiliskII-SDL-audio.patch DELETED ---


--- BasiliskII-debuginfo.patch DELETED ---


--- BasiliskII-disk-scan-crash.patch DELETED ---
