summaryrefslogtreecommitdiff
path: root/emulators/wine/files
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2010-12-31 08:15:15 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2010-12-31 08:15:15 +0000
commit2ee985ee97ca23241c1d1de49a22ddeae701eef9 (patch)
tree41026f29372dacb613f5d72f243b26f22bc10371 /emulators/wine/files
parent- Drop MD5 checksum from distinfo (diff)
Update to Wine 1.3.10. [1][2] This includes the following changes:
- Icons in the "open with" menus. - Man pages for all installed binaries. - Support for schemas in MSXML. - Many installer fixes. - Beginnings of support for ActiveX in built-in browser. - More work on ActiveX support. - Icons on Internet shortcut menu entries. - Standardization of code implementing COM interfaces. - New scheme for auto-generated DLL registrations. - OpenCL library wrapper. - Support for notification balloons in system tray. - Obsolete AudioIO sound driver removed. - Various MSI fixes. - Translation updates. - Various bug fixes. Lots of new man pages. Also, remove references to FreeBSD 6 from pkg-message. [2] PR: 153434 Submitted by: Rusty Nejdl <rnejdl@ringofsaturn.com> [1] Alex Kozlov <spam@rm-rf.kiev.ua> [2]
Notes
Notes: svn path=/head/; revision=267201
Diffstat (limited to 'emulators/wine/files')
-rw-r--r--emulators/wine/files/patch-partial-reservation7
-rw-r--r--emulators/wine/files/pkg-message.in4
2 files changed, 4 insertions, 7 deletions
diff --git a/emulators/wine/files/patch-partial-reservation b/emulators/wine/files/patch-partial-reservation
index 6eca6ad32afd..35144fede910 100644
--- a/emulators/wine/files/patch-partial-reservation
+++ b/emulators/wine/files/patch-partial-reservation
@@ -1,12 +1,13 @@
--- libs/wine/mmap.c
+++ libs/wine/mmap.c
-@@ -383,6 +383,9 @@ void mmap_init(void)
+@@ -380,6 +380,9 @@
reserve_area( base, end );
}
else reserve_area( user_space_limit, 0 );
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 );
+#endif
- #endif /* __i386__ */
-
+
/* reserve the DOS area if not already done */
+
+ ptr = list_head( &reserved_areas );
diff --git a/emulators/wine/files/pkg-message.in b/emulators/wine/files/pkg-message.in
index e34fa1dcadab..ac9a492540d2 100644
--- a/emulators/wine/files/pkg-message.in
+++ b/emulators/wine/files/pkg-message.in
@@ -1,7 +1,3 @@
-Wine requires FreeBSD 6.3 or above; FreeBSD 7.0 or later is strongly
-recommended. For FreeBSD 6 you may want to consider the patch(es)
-provided at <http://wiki.freebsd.org/Wine>.
-
Some ZFS tuning guides recommend setting KVA_PAGES=512 in your kernel
configuration. This is incompatible with Wine. The maximum possible
is KVA_PAGES=500, which should still be enough for ZFS.