[pkgsrc/trunk]: pkgsrc/emulators/qemu Patch to 0.6.1nb3. Java in Solaris (nee...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b6f1c6e08b1
branches:  trunk
changeset: 490097:2b6f1c6e08b1
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Wed Mar 02 23:22:41 2005 +0000

description:
Patch to 0.6.1nb3. Java in Solaris (needed e.g. for the installer)
doesn't crash any more. Patch found at
http://lists.gnu.org/archive/html/qemu-devel/2004-09/msg00271.html

diffstat:

 emulators/qemu/Makefile         |   4 ++--
 emulators/qemu/distinfo         |   3 ++-
 emulators/qemu/patches/patch-ab |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 8d4aabbb7dec -r 2b6f1c6e08b1 emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Wed Mar 02 23:06:36 2005 +0000
+++ b/emulators/qemu/Makefile   Wed Mar 02 23:22:41 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/02/19 23:12:59 heinz Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/02 23:22:41 hubertf Exp $
 #
 
 DISTNAME=              qemu-0.6.1
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            emulators
 MASTER_SITES=          http://fabrice.bellard.free.fr/qemu/
 
diff -r 8d4aabbb7dec -r 2b6f1c6e08b1 emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Wed Mar 02 23:06:36 2005 +0000
+++ b/emulators/qemu/distinfo   Wed Mar 02 23:22:41 2005 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/02 23:22:41 hubertf Exp $
 
 SHA1 (qemu-0.6.1.tar.gz) = 6f547082857068a3fbbac5a3d1910776d3c4b2bb
 RMD160 (qemu-0.6.1.tar.gz) = 306936ca4726a8df7d4c25827f6b5cc8ce82f85e
 Size (qemu-0.6.1.tar.gz) = 1010121 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
+SHA1 (patch-ab) = 831404a3a4a0f2071bd4e40bf8be712c04fd31a1
 SHA1 (patch-ac) = 2f16687e2051934a79e32e3822ee31885aa8a244
 SHA1 (patch-af) = 798f4c6194b81f20c4d284f8efd2fc0b7bf68aed
 SHA1 (patch-ag) = 4bb7ae18fd0f0c5ecfa2ab2594d1de5b33660495
diff -r 8d4aabbb7dec -r 2b6f1c6e08b1 emulators/qemu/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/qemu/patches/patch-ab   Wed Mar 02 23:22:41 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2005/03/02 23:22:41 hubertf Exp $
+
+Source: http://lists.gnu.org/archive/html/qemu-devel/2004-09/msg00271.html
+
+--- target-i386/exec.h.orig    2004-11-14 21:51:33.000000000 +0100
++++ target-i386/exec.h
+@@ -315,8 +315,8 @@ static inline void stfl(void *ptr, float
+ extern int lrint(CPU86_LDouble x);
+ extern int64_t llrint(CPU86_LDouble x);
+ #else
+-#define lrint(d)              ((int)rint(d))
+-#define llrint(d)             ((int)rint(d))
++#define lrint(d)              ((long)rint(d))
++#define llrint(d)             ((long long)rint(d))
+ #endif
+ extern CPU86_LDouble fabs(CPU86_LDouble x);
+ extern CPU86_LDouble sin(CPU86_LDouble x);