Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils In directory vz-cvs-3.sog:/tmp/cvs-serv15993/10.7/stable/main/finkinfo/utils
Modified Files: qemu.info qemu.patch Log Message: qemu: update to newer upstream version. restricted to 10.6 and 10.7, because of build (linker) failure on 10.5 Index: qemu.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/qemu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- qemu.patch 19 Oct 2011 21:38:07 -0000 1.1 +++ qemu.patch 4 Apr 2012 08:39:51 -0000 1.2 @@ -10,3 +10,35 @@ asprintf(&argv[0], "%s", bin); asprintf(&argv[1], "-hda"); asprintf(&argv[2], "%s", img); +--- qemu-1.0.1/fpu/softfloat.h.orig 2012-03-18 13:24:01.000000000 -0400 ++++ qemu-1.0.1/fpu/softfloat.h 2012-03-18 13:26:01.000000000 -0400 +@@ -57,7 +57,9 @@ + typedef uint8_t uint8; + typedef int8_t int8; + #ifndef _AIX ++#if !(defined(__APPLE__) && defined(_UINT16)) + typedef int uint16; ++#endif + typedef int int16; + #endif + typedef unsigned int uint32; +--- qemu-1.0.1/ui/cocoa.m.orig 2012-03-18 13:24:56.000000000 -0400 ++++ qemu-1.0.1/ui/cocoa.m 2012-03-18 13:25:42.000000000 -0400 +@@ -22,13 +22,14 @@ + * THE SOFTWARE. + */ + +-#import <Cocoa/Cocoa.h> +-#include <crt_externs.h> +- + #include "qemu-common.h" + #include "console.h" + #include "sysemu.h" + ++#define _UINT16 ++#import <Cocoa/Cocoa.h> ++#include <crt_externs.h> ++ + #ifndef MAC_OS_X_VERSION_10_4 + #define MAC_OS_X_VERSION_10_4 1040 + #endif Index: qemu.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/qemu.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- qemu.info 20 Oct 2011 06:10:50 -0000 1.5 +++ qemu.info 4 Apr 2012 08:39:50 -0000 1.6 @@ -1,19 +1,24 @@ Package: qemu -Version: 0.15.1 -Revision: 3 +Version: 1.0.1 +Revision: 1 Description: Fast machine emulator and virtualizer License: GPL Source: http://wiki.qemu.org/download/%n-%v.tar.gz -Source-MD5: 34f17737baaf1b3495c89cd6d4a607ed +Source-MD5: 5efd1091f01e3bc31bfdec27b8edeb00 -BuildDepends: xcode (<= 4.1-1) | gcc46 +BuildDepends: gcc46, glib2-dev, libgettext8-dev, libcurl4, libpng14, libjpeg, cyrus-sasl2-dev, gnutls28 +Depends: gcc46-shlibs, glib2-shlibs, libgettext8-shlibs, libcurl4-shlibs, libpng14-shlibs, libjpeg-shlibs, cyrus-sasl2-shlibs, gnutls28-shlibs PatchFile: %n.patch -PatchFile-MD5: c819bba120764d7cafbfc7ef54d95899 +PatchFile-MD5: 2f59f3605d61d3bb1a151dd7d6818cc2 PatchScript: << #!/bin/sh -ev +# patch configure for 32 bit build on x86_64 + if [ "%m" = "i386" ]; then + sed -i.bak 's|-m64|-m32|g' configure + fi # patch configure for ,issing -arch option in gcc-4 sed -i.bak 's|-arch x86_64||g' configure # patch for window glitch as proposed by Juan Pineda. @@ -21,9 +26,10 @@ << ConfigureParams: << +(%m = i386) --cpu=%m \ --extra-cflags=-I%p/include \ --disable-darwin-user \ ---disable-bsd-user +--disable-bsd-user << CompileScript: << @@ -46,12 +52,12 @@ InstallScript: << #!/bin/sh -ev cd build - make install prefix=%i \ - sharedir=%i/share/qemu \ - datadir=%i/share/qemu \ - mandir=%i/share/man \ - docdir=%i/share/doc/qemu \ - bindir=%i/bin + make install prefix=%i \ + sharedir=%i/share/qemu \ + datadir=%i/share/qemu \ + mandir=%i/share/man \ + docdir=%i/share/doc/qemu \ + bindir=%i/bin << DocFiles: README* COPYING* TODO VERSION HACKING LICENSE MAINTAINERS @@ -74,6 +80,7 @@ The systems darwin-user and bsd-user crashed. Fixes are unlikely. Configure needs a patch for the 32 bit build on x86_64. Bug reports are filed with upstream. +_UINT16 related patch originates from MacPorts and was ported by Jack Howarth. Former maintainer (10.3): Christian Schroeder <shre...@gmx.de>, qemu 0.6 << ------------------------------------------------------------------------------ Better than sec? Nothing is better than sec when it comes to monitoring Big Data applications. Try Boundary one-second resolution app monitoring today. Free. http://p.sf.net/sfu/Boundary-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs