diff options
author | adam <adam@pkgsrc.org> | 2009-01-17 10:11:14 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2009-01-17 10:11:14 +0000 |
commit | 30712cd8ca7aaef8d2c7de6c28b1948df9486134 (patch) | |
tree | 470c3d508b8baf6d0c9700788fb27d80f302151d /emulators/wine-devel/patches | |
parent | 4de226c3a67b9b9511fd73bf1b436ec4b02f534a (diff) | |
download | pkgsrc-30712cd8ca7aaef8d2c7de6c28b1948df9486134.tar.gz |
Changes 1.1.13:
* Freedesktop.org-compliant startup notifications.
* Many fixes for 64-bit application support.
* Improved graphics support in Internet Explorer.
* Various Richedit improvements.
* Better certificate manager dialog.
* Various bug fixes.
Diffstat (limited to 'emulators/wine-devel/patches')
-rw-r--r-- | emulators/wine-devel/patches/patch-ad | 18 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-af | 6 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-ah | 64 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-ba | 6 | ||||
-rw-r--r-- | emulators/wine-devel/patches/patch-ca | 8 |
5 files changed, 83 insertions, 19 deletions
diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad index 9906ccbd629..f5b713609cc 100644 --- a/emulators/wine-devel/patches/patch-ad +++ b/emulators/wine-devel/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ +$NetBSD: patch-ad,v 1.2 2009/01/17 10:11:14 adam Exp $ ---- dlls/iphlpapi/ipstats.c.orig 2008-07-11 17:55:55.000000000 +0200 +--- dlls/iphlpapi/ipstats.c.orig 2009-01-16 17:28:07.000000000 +0100 +++ dlls/iphlpapi/ipstats.c @@ -28,6 +28,10 @@ #include <stdlib.h> @@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ #ifdef HAVE_ALIAS_H #include <alias.h> #endif -@@ -463,7 +467,7 @@ DWORD getICMPStats(MIB_ICMP *stats) +@@ -467,7 +471,7 @@ DWORD getICMPStats(MIB_ICMP *stats) DWORD getIPStats(PMIB_IPSTATS stats) { @@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 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; -@@ -632,7 +636,7 @@ DWORD getIPStats(PMIB_IPSTATS stats) +@@ -636,7 +640,7 @@ DWORD getIPStats(PMIB_IPSTATS stats) DWORD getTCPStats(MIB_TCPSTATS *stats) { @@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ #define TCPTV_MIN 2 #define TCPTV_REXMTMAX 128 -@@ -769,7 +773,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) +@@ -773,7 +777,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) DWORD getUDPStats(MIB_UDPSTATS *stats) { @@ -40,7 +40,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; -@@ -1011,7 +1015,11 @@ DWORD getNumRoutes(void) +@@ -1015,7 +1019,11 @@ DWORD getNumRoutes(void) /* Ignore all entries except for gateway routes which aren't multicast */ @@ -52,7 +52,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ continue; RouteCount++; -@@ -1087,8 +1095,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE +@@ -1091,8 +1099,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE /* Ignore all entries except for gateway routes which aren't multicast */ @@ -65,7 +65,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ continue; memset (&table->table[table->dwNumEntries], 0, -@@ -1249,7 +1261,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE +@@ -1253,7 +1265,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE DWORD getNumArpEntries(void) { @@ -74,7 +74,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/11/21 17:40:31 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; -@@ -1305,7 +1317,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN +@@ -1309,7 +1321,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-af b/emulators/wine-devel/patches/patch-af index a8665662a57..a00ad8aa7b9 100644 --- a/emulators/wine-devel/patches/patch-af +++ b/emulators/wine-devel/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2008/12/07 00:43:03 adam Exp $ +$NetBSD: patch-af,v 1.4 2009/01/17 10:11:14 adam Exp $ ---- dlls/ntdll/signal_i386.c.orig 2008-12-05 17:57:45.000000000 +0100 +--- dlls/ntdll/signal_i386.c.orig 2009-01-16 17:28:07.000000000 +0100 +++ dlls/ntdll/signal_i386.c @@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT; @@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.3 2008/12/07 00:43:03 adam Exp $ #else TRAP_x86_DIVIDE = 0, /* Division by zero exception */ TRAP_x86_TRCTRAP = 1, /* Single-step exception */ -@@ -1602,7 +1640,11 @@ void signal_init_process(void) +@@ -1601,7 +1639,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-ah b/emulators/wine-devel/patches/patch-ah new file mode 100644 index 00000000000..c4b1b65a3a7 --- /dev/null +++ b/emulators/wine-devel/patches/patch-ah @@ -0,0 +1,64 @@ +$NetBSD: patch-ah,v 1.3 2009/01/17 10:11:14 adam Exp $ + +--- dlls/kernel32/cpu.c.orig 2009-01-17 08:46:08.000000000 +0100 ++++ dlls/kernel32/cpu.c +@@ -551,7 +551,7 @@ VOID WINAPI GetSystemInfo( + size_t val_len; + char model[256]; + char *cpuclass; +- FILE *f = fopen ("/var/run/dmesg.boot", "r"); ++ //FILE *f = fopen ("/var/run/dmesg.boot", "r"); + + /* first deduce as much as possible from the sysctls */ + mib[0] = CTL_MACHDEP; +@@ -570,7 +570,7 @@ VOID WINAPI GetSystemInfo( + #endif + #ifdef CPU_SSE2 + mib[1] = CPU_SSE2; /* this should imply MMX */ +- value[1] = sizeof(value); ++ val_len = sizeof(value); + if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) + if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; + #endif +@@ -579,7 +579,7 @@ VOID WINAPI GetSystemInfo( + val_len = sizeof(value); + if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) + if (value > cachedsi.dwNumberOfProcessors) +- cachedsi.dwNumberOfProcessors = value[0]; ++ cachedsi.dwNumberOfProcessors = value; + mib[1] = HW_MODEL; + val_len = sizeof(model)-1; + if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) { +@@ -612,19 +612,20 @@ VOID WINAPI GetSystemInfo( + additional information such as CX8, MMX and TSC + (however this information should be considered less + reliable than that from the sysctl calls) */ ++#if 0 + if (f != NULL) + { + while (fgets(model, 255, f) != NULL) { + if (sscanf(model,"cpu%d: features %x<", value, value+1) == 2) { + /* we could scan the string but it is easier + to test the bits directly */ +- if (value[1] & 0x1) ++ if (value & 0x1) + PF[PF_FLOATING_POINT_EMULATED] = TRUE; +- if (value[1] & 0x10) ++ if (value & 0x10) + PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; +- if (value[1] & 0x100) ++ if (value & 0x100) + PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; +- if (value[1] & 0x800000) ++ if (value & 0x800000) + PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; + + break; +@@ -632,6 +633,7 @@ VOID WINAPI GetSystemInfo( + } + fclose(f); + } ++#endif + + } + #elif defined(__FreeBSD__) diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba index b9c10fc4a6a..cdcdc27e165 100644 --- a/emulators/wine-devel/patches/patch-ba +++ b/emulators/wine-devel/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.4 2009/01/03 20:12:44 adam Exp $ +$NetBSD: patch-ba,v 1.5 2009/01/17 10:11:14 adam Exp $ ---- configure.orig 2009-01-02 17:24:09.000000000 +0100 +--- configure.orig 2009-01-16 17:28:07.000000000 +0100 +++ configure -@@ -17708,6 +17708,11 @@ MAIN_BINARY="wine-pthread" +@@ -17923,6 +17923,11 @@ MAIN_BINARY="wine-pthread" EXTRA_BINARIES="wine-pthread" ;; diff --git a/emulators/wine-devel/patches/patch-ca b/emulators/wine-devel/patches/patch-ca index 7b2919b9420..63f8c4f0c27 100644 --- a/emulators/wine-devel/patches/patch-ca +++ b/emulators/wine-devel/patches/patch-ca @@ -1,8 +1,8 @@ -$NetBSD: patch-ca,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ +$NetBSD: patch-ca,v 1.2 2009/01/17 10:11:14 adam Exp $ ---- dlls/winex11.drv/settings.c.orig 2008-06-27 11:42:50.000000000 -0400 -+++ dlls/winex11.drv/settings.c 2008-06-27 11:43:40.000000000 -0400 -@@ -431,6 +431,16 @@ +--- dlls/winex11.drv/settings.c.orig 2009-01-16 17:28:07.000000000 +0100 ++++ dlls/winex11.drv/settings.c +@@ -432,6 +432,16 @@ LONG CDECL X11DRV_ChangeDisplaySettingsE return DISP_CHANGE_SUCCESSFUL; } |