pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/wine-devel Changes 1.1.14:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e9ddf70b0312
branches:  trunk
changeset: 553800:e9ddf70b0312
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jan 30 19:39:04 2009 +0000

description:
Changes 1.1.14:
* Various bug fixes for Internet Explorer 7.
* Many crypt32 improvements, including new export wizard.
* Better support for windowless Richedit.
* Improvements to the print dialog.
* Many fixes to the regression tests on Windows.
* Various bug fixes.

diffstat:

 emulators/wine-devel/Makefile         |   4 +-
 emulators/wine-devel/PLIST.common     |  19 +++++++++-
 emulators/wine-devel/distinfo         |  17 ++++----
 emulators/wine-devel/patches/patch-ad |  27 +++++++++----
 emulators/wine-devel/patches/patch-af |  67 +---------------------------------
 emulators/wine-devel/patches/patch-ag |  58 ------------------------------
 emulators/wine-devel/patches/patch-ah |  41 +-------------------
 emulators/wine-devel/patches/patch-ba |   6 +-
 8 files changed, 55 insertions(+), 184 deletions(-)

diffs (truncated from 470 to 300 lines):

diff -r aba7eeab4855 -r e9ddf70b0312 emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Fri Jan 30 16:46:05 2009 +0000
+++ b/emulators/wine-devel/Makefile     Fri Jan 30 19:39:04 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2009/01/17 10:11:14 adam Exp $
+# $NetBSD: Makefile,v 1.9 2009/01/30 19:39:04 adam Exp $
 
-DISTNAME=      wine-1.1.13
+DISTNAME=      wine-1.1.14
 CATEGORIES=    emulators
 MASTER_SITES=  http://ibiblio.org/pub/linux/system/emulators/wine/ \
                ${MASTER_SITE_SOURCEFORGE:=wine/}
diff -r aba7eeab4855 -r e9ddf70b0312 emulators/wine-devel/PLIST.common
--- a/emulators/wine-devel/PLIST.common Fri Jan 30 16:46:05 2009 +0000
+++ b/emulators/wine-devel/PLIST.common Fri Jan 30 19:39:04 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2009/01/17 10:11:14 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2009/01/30 19:39:04 adam Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
@@ -75,6 +75,7 @@
 include/wine/unicode.h
 include/wine/windows/accctrl.h
 include/wine/windows/aclapi.h
+include/wine/windows/aclui.h
 include/wine/windows/activaut.h
 include/wine/windows/activaut.idl
 include/wine/windows/activdbg.h
@@ -340,6 +341,8 @@
 include/wine/windows/mscat.h
 include/wine/windows/mscoree.h
 include/wine/windows/mscoree.idl
+include/wine/windows/msctf.h
+include/wine/windows/msctf.idl
 include/wine/windows/mshtmcid.h
 include/wine/windows/mshtmdid.h
 include/wine/windows/mshtmhst.h
@@ -565,6 +568,7 @@
 lib/libwine.so.1
 lib/libwine.so.1.0
 lib/wine/acledit.dll.so
+lib/wine/aclui.dll.so
 lib/wine/activeds.dll.so
 lib/wine/actxprxy.dll.so
 lib/wine/advapi32.dll.so
@@ -572,6 +576,7 @@
 lib/wine/amstream.dll.so
 lib/wine/appwiz.cpl.so
 lib/wine/atl.dll.so
+lib/wine/authz.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll16
@@ -624,6 +629,9 @@
 lib/wine/d3dx9_35.dll.so
 lib/wine/d3dx9_36.dll.so
 lib/wine/d3dx9_37.dll.so
+lib/wine/d3dx9_38.dll.so
+lib/wine/d3dx9_39.dll.so
+lib/wine/d3dx9_40.dll.so
 lib/wine/d3dxof.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
@@ -698,6 +706,7 @@
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv16
 lib/wine/krnl386.exe16
+lib/wine/libaclui.def
 lib/wine/libactiveds.def
 lib/wine/libadsiid.a
 lib/wine/libadvapi32.def
@@ -756,6 +765,7 @@
 lib/wine/libinetcomm.def
 lib/wine/libiphlpapi.def
 lib/wine/libkernel32.def
+lib/wine/libloadperf.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
 lib/wine/libmlang.def
@@ -795,6 +805,7 @@
 lib/wine/libpsapi.def
 lib/wine/libquartz.def
 lib/wine/librasapi32.def
+lib/wine/librasdlg.def
 lib/wine/libresutils.def
 lib/wine/libriched20.def
 lib/wine/librpcrt4.def
@@ -846,6 +857,7 @@
 lib/wine/loadperf.dll.so
 lib/wine/localspl.dll.so
 lib/wine/localui.dll.so
+lib/wine/lodctr.exe.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
@@ -869,6 +881,7 @@
 lib/wine/mscat32.dll.so
 lib/wine/mscms.dll.so
 lib/wine/mscoree.dll.so
+lib/wine/msctf.dll.so
 lib/wine/msdmo.dll.so
 lib/wine/msftedit.dll.so
 lib/wine/msg711.acm.so
@@ -882,6 +895,7 @@
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
 lib/wine/msrle32.dll.so
+lib/wine/mssign32.dll.so
 lib/wine/mssip32.dll.so
 lib/wine/mstask.dll.so
 lib/wine/msvcirt.dll.so
@@ -941,6 +955,7 @@
 lib/wine/query.dll.so
 lib/wine/rasapi16.dll16
 lib/wine/rasapi32.dll.so
+lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
 lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
@@ -991,11 +1006,13 @@
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll16
+lib/wine/traffic.dll.so
 lib/wine/twain.dll16
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll16
 lib/wine/unicows.dll.so
 lib/wine/uninstaller.exe.so
+lib/wine/unlodctr.exe.so
 lib/wine/updspapi.dll.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
diff -r aba7eeab4855 -r e9ddf70b0312 emulators/wine-devel/distinfo
--- a/emulators/wine-devel/distinfo     Fri Jan 30 16:46:05 2009 +0000
+++ b/emulators/wine-devel/distinfo     Fri Jan 30 19:39:04 2009 +0000
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.6 2009/01/17 10:11:14 adam Exp $
+$NetBSD: distinfo,v 1.7 2009/01/30 19:39:04 adam Exp $
 
-SHA1 (wine-1.1.13.tar.bz2) = 97e781ffc7dee84ba42b0e0c11ec526c66a2a48b
-RMD160 (wine-1.1.13.tar.bz2) = e0d52905fd61afb8e23027b370891488e80787e0
-Size (wine-1.1.13.tar.bz2) = 14875035 bytes
+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 (patch-aa) = 91e612766286d8bc05d419a3dfd0c1b8a1852a54
 SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c
 SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6
-SHA1 (patch-ad) = 706b616d326fd2d4598c85ea9a32ca420d9fe18f
+SHA1 (patch-ad) = 99c4015378c20411aff5b8277bf2c0de38c0749d
 SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb
-SHA1 (patch-af) = 7bb565dd195a4da5d10494b901a5bab5780e1ca5
-SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
-SHA1 (patch-ah) = c3a71cf650b88dacbfe2f1ca6b3c279909fc5821
+SHA1 (patch-af) = 51d4a4f90e8af30ec6449b7a0f390e6a826f2cfe
+SHA1 (patch-ah) = 61520f1e238762496502b25ea257b98b01799124
 SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354
-SHA1 (patch-ba) = dfb6462898222ba528ba57f23643daa74b54d104
+SHA1 (patch-ba) = bf71c7eca89a98804c05d0312d828720dc504ae5
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3
 SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5
diff -r aba7eeab4855 -r e9ddf70b0312 emulators/wine-devel/patches/patch-ad
--- a/emulators/wine-devel/patches/patch-ad     Fri Jan 30 16:46:05 2009 +0000
+++ b/emulators/wine-devel/patches/patch-ad     Fri Jan 30 19:39:04 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2009/01/17 10:11:14 adam Exp $
+$NetBSD: patch-ad,v 1.3 2009/01/30 19:39:04 adam Exp $
 
---- dlls/iphlpapi/ipstats.c.orig       2009-01-16 17:28:07.000000000 +0100
+--- dlls/iphlpapi/ipstats.c.orig       2009-01-30 17:54:01.000000000 +0100
 +++ dlls/iphlpapi/ipstats.c
 @@ -28,6 +28,10 @@
  #include <stdlib.h>
@@ -13,7 +13,16 @@
  #ifdef HAVE_ALIAS_H
  #include <alias.h>
  #endif
-@@ -467,7 +471,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
+@@ -286,7 +290,7 @@ DWORD getInterfaceStatsByName(const char
+ 
+ DWORD getICMPStats(MIB_ICMP *stats)
+ {
+-#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS)
++#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__)
+   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)
  
  DWORD getIPStats(PMIB_IPSTATS stats)
  {
@@ -22,7 +31,7 @@
    int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    int ip_ttl, ip_forwarding;
-@@ -636,7 +640,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
+@@ -648,7 +652,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
  
  DWORD getTCPStats(MIB_TCPSTATS *stats)
  {
@@ -31,7 +40,7 @@
  #ifndef TCPTV_MIN  /* got removed in Mac OS X for some reason */
  #define TCPTV_MIN 2
  #define TCPTV_REXMTMAX 128
-@@ -773,7 +777,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
+@@ -785,7 +789,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
  
  DWORD getUDPStats(MIB_UDPSTATS *stats)
  {
@@ -40,7 +49,7 @@
    int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    struct udpstat udp_stat;
-@@ -1015,7 +1019,11 @@ DWORD getNumRoutes(void)
+@@ -1027,7 +1031,11 @@ DWORD getNumRoutes(void)
  
        /* Ignore all entries except for gateway routes which aren't
           multicast */
@@ -52,7 +61,7 @@
           continue;
  
        RouteCount++;
-@@ -1091,8 +1099,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1103,8 +1111,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
            /* Ignore all entries except for gateway routes which aren't
               multicast */
@@ -65,7 +74,7 @@
               continue;
  
            memset (&table->table[table->dwNumEntries], 0,
-@@ -1253,7 +1265,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1265,7 +1277,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
  DWORD getNumArpEntries(void)
  {
@@ -74,7 +83,7 @@
    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;
-@@ -1309,7 +1321,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
+@@ -1321,7 +1333,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
      if (numEntries > 1)
        size += (numEntries - 1) * sizeof(MIB_IPNETROW);
      table = HeapAlloc(heap, flags, size);
diff -r aba7eeab4855 -r e9ddf70b0312 emulators/wine-devel/patches/patch-af
--- a/emulators/wine-devel/patches/patch-af     Fri Jan 30 16:46:05 2009 +0000
+++ b/emulators/wine-devel/patches/patch-af     Fri Jan 30 19:39:04 2009 +0000
@@ -1,57 +1,8 @@
-$NetBSD: patch-af,v 1.4 2009/01/17 10:11:14 adam Exp $
+$NetBSD: patch-af,v 1.5 2009/01/30 19:39:04 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig      2009-01-16 17:28:07.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig      2009-01-30 17:54:01.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
-@@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT;
- 
- #endif /* bsdi */
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-+#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
- 
- typedef struct sigcontext SIGCONTEXT;
- 
-@@ -332,6 +332,39 @@ typedef ucontext_t SIGCONTEXT;
- 
- #endif /* __APPLE__ */
- 
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
-+# include <sys/ucontext.h>
-+# include <sys/types.h>
-+# include <signal.h>
-+
-+typedef ucontext_t SIGCONTEXT;
-+
-+#define EAX_sig(context)      ((context)->uc_mcontext.__gregs[_REG_EAX])
-+#define EBX_sig(context)      ((context)->uc_mcontext.__gregs[_REG_EBX])
-+#define ECX_sig(context)      ((context)->uc_mcontext.__gregs[_REG_ECX])
-+#define EDX_sig(context)      ((context)->uc_mcontext.__gregs[_REG_EDX])
-+#define ESI_sig(context)      ((context)->uc_mcontext.__gregs[_REG_ESI])
-+#define EDI_sig(context)      ((context)->uc_mcontext.__gregs[_REG_EDI])
-+#define EBP_sig(context)      ((context)->uc_mcontext.__gregs[_REG_EBP])
-+#define ESP_sig(context)      _UC_MACHINE_SP(context)
-+
-+#define CS_sig(context)               ((context)->uc_mcontext.__gregs[_REG_CS])
-+#define DS_sig(context)               ((context)->uc_mcontext.__gregs[_REG_DS])
-+#define ES_sig(context)               ((context)->uc_mcontext.__gregs[_REG_ES])
-+#define SS_sig(context)               ((context)->uc_mcontext.__gregs[_REG_SS])
-+#define FS_sig(context)               ((context)->uc_mcontext.__gregs[_REG_FS])
-+#define GS_sig(context)               ((context)->uc_mcontext.__gregs[_REG_GS])
-+
-+#define EFL_sig(context)      ((context)->uc_mcontext.__gregs[_REG_EFL])
-+#define EIP_sig(context)      _UC_MACHINE_PC(context)
-+#define TRAP_sig(context)     ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
-+#define ERROR_sig(context)    ((context)->uc_mcontext.__gregs[_REG_ERR])



Home | Main Index | Thread Index | Old Index