Changes 1.1.10:

- Support for virtual memory write watches.
- Workarounds for the WINAPI compiler bug on Mac OS.
- Several fixes for the 64-bit build.
- Some more GdiPlus functions.
- Various bug fixes.

5 files changed, 22 insertions, 22 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 25560164c85..a97a761891e 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/11/21 18:54:56 adam Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/07 00:43:03 adam Exp $
 
-DISTNAME=	wine-1.1.9
+DISTNAME=	wine-1.1.10
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index d8821d7f072..f2f8386e052 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.2 2008/11/21 18:54:56 adam Exp $
+$NetBSD: distinfo,v 1.3 2008/12/07 00:43:03 adam Exp $
 
-SHA1 (wine-1.1.9.tar.bz2) = a9d5938b76198d244f0950e843dd4347661f4e74
-RMD160 (wine-1.1.9.tar.bz2) = 3a366c6b5c8f07d61d67b278000bbe0131fa7d99
-Size (wine-1.1.9.tar.bz2) = 14731804 bytes
+SHA1 (wine-1.1.10.tar.bz2) = 21712c3c6195779304cd72f5175ea1528b2a26a0
+RMD160 (wine-1.1.10.tar.bz2) = a03ebd900622a95a3232abf1827664bbcd2861d0
+Size (wine-1.1.10.tar.bz2) = 14734081 bytes
 SHA1 (patch-aa) = 0d8512f767119d7b258e32e04c78e919879e0ba6
 SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c
 SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6
 SHA1 (patch-ad) = 140e86db716cd1b1ab256bff0c7edec9423f9384
 SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb
-SHA1 (patch-af) = 666706ccfbd87f1b9acec5974b19c0004db78827
+SHA1 (patch-af) = 942ebee58342bff6be7da5ca54ed63376a2fd671
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354
-SHA1 (patch-ba) = d7ce37854f75d6dd02025c00957f4ae692ea1422
+SHA1 (patch-ba) = c8a3b6111caf84b988ae35ad92ec8809326a8ce3
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
-SHA1 (patch-bc) = 1542a59718229a41e23aff93e4571bf7127a276b
+SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3
 SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb
diff --git a/emulators/wine-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af
index f6346af5a31..a8665662a57 100644
--- a/emulators/wine-devel/patches/patch-af
+++ b/emulators/wine-devel/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2008/11/21 18:54:56 adam Exp $
+$NetBSD: patch-af,v 1.3 2008/12/07 00:43:03 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2008-11-21 17:20:28.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2008-12-05 17:57:45.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
 @@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT;
  
@@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.2 2008/11/21 18:54:56 adam Exp $
  #else
      TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
      TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
-@@ -1600,7 +1638,11 @@ void signal_init_process(void)
+@@ -1602,7 +1640,11 @@ void signal_init_process(void)
      struct sigaction sig_act;
  
      sig_act.sa_mask = server_block_set;
diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba
index 8c03aceabaf..43a2a88254d 100644
--- a/emulators/wine-devel/patches/patch-ba
+++ b/emulators/wine-devel/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2008/11/21 18:54:56 adam Exp $
+$NetBSD: patch-ba,v 1.3 2008/12/07 00:43:03 adam Exp $
 
---- configure.orig	2008-11-21 17:20:28.000000000 +0100
+--- configure.orig	2008-12-05 17:57:45.000000000 +0100
 +++ configure
-@@ -17827,6 +17827,11 @@ MAIN_BINARY="wine-pthread"
+@@ -17837,6 +17837,11 @@ MAIN_BINARY="wine-pthread"
  
          EXTRA_BINARIES="wine-pthread"
   ;;
diff --git a/emulators/wine-devel/patches/patch-bc b/emulators/wine-devel/patches/patch-bc
index d92076eed9d..71008056db3 100644
--- a/emulators/wine-devel/patches/patch-bc
+++ b/emulators/wine-devel/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-bc,v 1.2 2008/12/07 00:43:03 adam Exp $
 
---- dlls/wineoss.drv/audio.c.orig	2008-06-26 22:44:15.000000000 -0400
-+++ dlls/wineoss.drv/audio.c	2008-06-26 22:45:02.000000000 -0400
+--- dlls/wineoss.drv/audio.c.orig	2008-12-05 17:57:45.000000000 +0100
++++ dlls/wineoss.drv/audio.c
 @@ -75,6 +75,12 @@
  
  #include "audio.h"
@@ -15,7 +15,7 @@ $NetBSD: patch-bc,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
  WINE_DEFAULT_DEBUG_CHANNEL(wave);
  
  /* Allow 1% deviation for sample rates (some ES137x cards) */
-@@ -1167,12 +1173,12 @@
+@@ -1170,12 +1176,12 @@ LRESULT OSS_WaveInit(void)
      }
      else
      {
@@ -25,8 +25,8 @@ $NetBSD: patch-bc,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
          for (i = 1; i < MAX_WAVEDRV; ++i)
          {
              WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11);
--            sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i);
-+            sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%d", i);
+-            sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i);
++            sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%u", i);
              WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13);
-             sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i);
+             sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i);
          }