[pkgsrc/trunk]: pkgsrc/emulators/wine-devel Let wine compile and work again. ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f1969eaffb1
branches:  trunk
changeset: 398755:9f1969eaffb1
user:      reinoud <reinoud%pkgsrc.org@localhost>
date:      Mon Sep 07 20:27:25 2009 +0000

description:
Let wine compile and work again. There are still some minor issues that need
to be adressed but example programs i had installed before worked fine.

The errors i currently get are:
1       Could not load Mozilla. HTML rendering will be disabled.
2       err:seh:raise_exception Exception frame is not in stack limits => unable to
                dispatch exception.

Where 1) is annoying but 2) is more revealing.

diffstat:

 emulators/wine-devel/Makefile         |   4 ++--
 emulators/wine-devel/distinfo         |   7 ++++++-
 emulators/wine-devel/patches/patch-cc |  17 +++++++++++++++++
 emulators/wine-devel/patches/patch-cd |  16 ++++++++++++++++
 emulators/wine-devel/patches/patch-ce |  12 ++++++++++++
 emulators/wine-devel/patches/patch-cf |  12 ++++++++++++
 emulators/wine-devel/patches/patch-cg |  12 ++++++++++++
 7 files changed, 77 insertions(+), 3 deletions(-)

diffs (120 lines):

diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Mon Sep 07 20:05:30 2009 +0000
+++ b/emulators/wine-devel/Makefile     Mon Sep 07 20:27:25 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:56:42 sno Exp $
+# $NetBSD: Makefile,v 1.14 2009/09/07 20:27:25 reinoud Exp $
 
 DISTNAME=      wine-1.1.16
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/distinfo
--- a/emulators/wine-devel/distinfo     Mon Sep 07 20:05:30 2009 +0000
+++ b/emulators/wine-devel/distinfo     Mon Sep 07 20:27:25 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2009/02/28 15:30:13 adam Exp $
+$NetBSD: distinfo,v 1.10 2009/09/07 20:27:25 reinoud Exp $
 
 SHA1 (wine-1.1.16.tar.bz2) = 02f3363de5a2476b513beca3da2bb42aeeff5218
 RMD160 (wine-1.1.16.tar.bz2) = 449baa620eea114d65a8a65d1f0e88d377b94615
@@ -17,3 +17,8 @@
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3
 SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5
+SHA1 (patch-cc) = c6fb13ca5625e9231719a0deabede3ec5239b50d
+SHA1 (patch-cd) = aec27ca5616625e80123e92b3db1abdd90d212a0
+SHA1 (patch-ce) = 23088aac01e74164ec6d4a42f96ab7fa34d002c3
+SHA1 (patch-cf) = 6a1c8ce2c77de0eebb9aad9cd5078cf18538d8d8
+SHA1 (patch-cg) = 3269054e3cee4af027ea3029c6d05ce2bf70408a
diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/patches/patch-cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine-devel/patches/patch-cc     Mon Sep 07 20:27:25 2009 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-cc,v 1.1 2009/09/07 20:27:25 reinoud Exp $
+
+--- dlls/inetcomm/internettransport.c.orig     2009-02-27 23:21:46.000000000 +0100
++++ dlls/inetcomm/internettransport.c
+@@ -23,11 +23,11 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
++#include "winsock2.h"
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winnt.h"
+ #include "winuser.h"
+-#include "winsock2.h"
+ #include "ws2tcpip.h"
+ #include "objbase.h"
+ #include "ole2.h"
diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/patches/patch-cd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine-devel/patches/patch-cd     Mon Sep 07 20:27:25 2009 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-cd,v 1.1 2009/09/07 20:27:25 reinoud Exp $
+
+--- dlls/wsock32/socket.c.orig 2009-02-27 23:21:46.000000000 +0100
++++ dlls/wsock32/socket.c
+@@ -23,10 +23,10 @@
+ #include "config.h"
+ #include <stdarg.h>
+ 
++#include "winsock2.h"
+ #include "windef.h"
+ #include "winbase.h"
+ #include "wine/debug.h"
+-#include "winsock2.h"
+ #include "winnt.h"
+ #include "wscontrol.h"
+ #include "iphlpapi.h"
diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/patches/patch-ce
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine-devel/patches/patch-ce     Mon Sep 07 20:27:25 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ce,v 1.1 2009/09/07 20:27:25 reinoud Exp $
+
+--- dlls/riched20/tests/editor.c.orig  2009-02-27 23:21:46.000000000 +0100
++++ dlls/riched20/tests/editor.c
+@@ -23,6 +23,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <assert.h>
++#include <winsock2.h>
+ #include <windef.h>
+ #include <winbase.h>
+ #include <wingdi.h>
diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/patches/patch-cf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine-devel/patches/patch-cf     Mon Sep 07 20:27:25 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-cf,v 1.1 2009/09/07 20:27:25 reinoud Exp $
+
+--- dlls/riched32/tests/editor.c.orig  2009-02-27 23:21:46.000000000 +0100
++++ dlls/riched32/tests/editor.c
+@@ -23,6 +23,7 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
++#include <winsock2.h>
+ #include <windef.h>
+ #include <winbase.h>
+ #include <wingdi.h>
diff -r 288137b2b5ef -r 9f1969eaffb1 emulators/wine-devel/patches/patch-cg
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine-devel/patches/patch-cg     Mon Sep 07 20:27:25 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-cg,v 1.1 2009/09/07 20:27:25 reinoud Exp $
+
+--- dlls/ws2_32/tests/sock.c.orig      2009-02-27 23:21:46.000000000 +0100
++++ dlls/ws2_32/tests/sock.c
+@@ -22,6 +22,7 @@
+ 
+ #include <stdarg.h>
+ 
++#include <winsock2.h>
+ #include <windef.h>
+ #include <winbase.h>
+ #include <winsock2.h>