Changes 1.1.15:

* Gecko engine update.
* Better region support in GdiPlus.
* Support for cross-compilation in winegcc.
* Beginnings of MS Text Framework support.
* Many fixes to the regression tests on Windows.
* Various bug fixes.

5 files changed, 35 insertions, 21 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index c917e5db0ee..2b6552cd1b4 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2009/01/30 19:39:04 adam Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/19 19:26:17 adam Exp $
 
-DISTNAME=	wine-1.1.14
+DISTNAME=	wine-1.1.15
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -47,6 +47,9 @@ CONFIGURE_ENV+=		ac_cv_prog_CXX=${CXX}\ -m32
 CONFIGURE_ENV+=		ac_cv_prog_AS=${AS}\ --32
 CONFIGURE_ENV+=		ac_cv_prog_LD=${LD}\ -m\ elf_i386
 .endif
+.if !empty(MACHINE_ARCH:Mx86_64)
+CONFIGURE_ARGS+=	--enable-win64
+.endif
 
 .include "options.mk"
 
diff --git a/emulators/wine-devel/PLIST.common b/emulators/wine-devel/PLIST.common
index 7d8dc5043fc..2147e9ed3b8 100644
--- a/emulators/wine-devel/PLIST.common
+++ b/emulators/wine-devel/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2009/01/30 19:39:04 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.6 2009/02/19 19:26:17 adam Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
@@ -152,6 +152,7 @@ include/wine/windows/d3dx9.h
 include/wine/windows/d3dx9core.h
 include/wine/windows/d3dx9math.h
 include/wine/windows/d3dx9math.inl
+include/wine/windows/d3dx9mesh.h
 include/wine/windows/d3dx9shader.h
 include/wine/windows/d3dx9tex.h
 include/wine/windows/dbghelp.h
@@ -483,6 +484,8 @@ include/wine/windows/svrapi.h
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/textserv.h
+include/wine/windows/textstor.h
+include/wine/windows/textstor.idl
 include/wine/windows/tlhelp32.h
 include/wine/windows/tmschema.h
 include/wine/windows/tom.h
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index cd468aa99d3..b1f4164d3c9 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.7 2009/01/30 19:39:04 adam Exp $
+$NetBSD: distinfo,v 1.8 2009/02/19 19:26:17 adam Exp $
 
-SHA1 (wine-1.1.14.tar.bz2) = b71d5b6c98e8d1c56427bf2f4b992bf74381e54d
-RMD160 (wine-1.1.14.tar.bz2) = e1eac6c7110c8f40d1ff00ec945977bce822c0f9
-Size (wine-1.1.14.tar.bz2) = 15023413 bytes
+SHA1 (wine-1.1.15.tar.bz2) = 99267058cf14d52b55c360d6e3af337d81695974
+RMD160 (wine-1.1.15.tar.bz2) = 5203e46e498ae064a07d5ebe83fcb5ded3bc422d
+Size (wine-1.1.15.tar.bz2) = 15057931 bytes
 SHA1 (patch-aa) = 91e612766286d8bc05d419a3dfd0c1b8a1852a54
 SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c
 SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6
-SHA1 (patch-ad) = 99c4015378c20411aff5b8277bf2c0de38c0749d
+SHA1 (patch-ad) = e001fe447b64e73ee45be55f985044dd911ed196
 SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb
 SHA1 (patch-af) = 51d4a4f90e8af30ec6449b7a0f390e6a826f2cfe
 SHA1 (patch-ah) = 61520f1e238762496502b25ea257b98b01799124
 SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354
-SHA1 (patch-ba) = bf71c7eca89a98804c05d0312d828720dc504ae5
+SHA1 (patch-ba) = dbd8fd07ca75da9667b28fb7e6536f617b2f2745
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3
 SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5
diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad
index 437e4a3f875..6c20daea61e 100644
--- a/emulators/wine-devel/patches/patch-ad
+++ b/emulators/wine-devel/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
+$NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
 
---- dlls/iphlpapi/ipstats.c.orig	2009-01-30 17:54:01.000000000 +0100
+--- dlls/iphlpapi/ipstats.c.orig	2009-02-13 18:01:33.000000000 +0100
 +++ dlls/iphlpapi/ipstats.c
 @@ -28,6 +28,10 @@
  #include <stdlib.h>
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    size_t needed;
-@@ -479,7 +483,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
+@@ -483,7 +487,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
  
  DWORD getIPStats(PMIB_IPSTATS stats)
  {
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    int ip_ttl, ip_forwarding;
-@@ -648,7 +652,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
+@@ -652,7 +656,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
  
  DWORD getTCPStats(MIB_TCPSTATS *stats)
  {
@@ -40,7 +40,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
  #ifndef TCPTV_MIN  /* got removed in Mac OS X for some reason */
  #define TCPTV_MIN 2
  #define TCPTV_REXMTMAX 128
-@@ -785,7 +789,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
+@@ -789,7 +793,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
  
  DWORD getUDPStats(MIB_UDPSTATS *stats)
  {
@@ -49,7 +49,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    struct udpstat udp_stat;
-@@ -1027,7 +1031,11 @@ DWORD getNumRoutes(void)
+@@ -1031,7 +1035,11 @@ DWORD getNumRoutes(void)
  
        /* Ignore all entries except for gateway routes which aren't
           multicast */
@@ -61,7 +61,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
           continue;
  
        RouteCount++;
-@@ -1103,8 +1111,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1107,8 +1115,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
            /* Ignore all entries except for gateway routes which aren't
               multicast */
@@ -74,7 +74,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
               continue;
  
            memset (&table->table[table->dwNumEntries], 0,
-@@ -1265,7 +1277,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1269,7 +1281,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
  DWORD getNumArpEntries(void)
  {
@@ -83,7 +83,7 @@ $NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
    int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    DWORD arpEntries = 0;
-@@ -1321,7 +1333,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
+@@ -1325,7 +1337,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
      if (numEntries > 1)
        size += (numEntries - 1) * sizeof(MIB_IPNETROW);
      table = HeapAlloc(heap, flags, size);
diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba
index 97fe0db2f46..ffb04d69d6d 100644
--- a/emulators/wine-devel/patches/patch-ba
+++ b/emulators/wine-devel/patches/patch-ba
@@ -1,8 +1,16 @@
-$NetBSD: patch-ba,v 1.6 2009/01/30 19:39:04 adam Exp $
+$NetBSD: patch-ba,v 1.7 2009/02/19 19:26:17 adam Exp $
 
---- configure.orig	2009-01-30 17:54:01.000000000 +0100
+--- configure.orig	2009-02-13 18:01:33.000000000 +0100
 +++ configure
-@@ -17950,6 +17950,11 @@ MAIN_BINARY="wine-pthread"
+@@ -3945,7 +3945,6 @@ TOOLSDIR=$wine_cv_toolsdir
+ 
+ if test -n "$host_alias"
+ then
+-    TARGETFLAGS="-b $host_alias $TARGETFLAGS"
+ 
+ fi
+ 
+@@ -17911,6 +17910,11 @@ MAIN_BINARY="wine-pthread"
  
          EXTRA_BINARIES="wine-pthread"
   ;;