Date: Sat, 25 Dec 2010 04:20:16 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/153434: Update wine to 1.3.10 Message-ID: <201012250420.oBP4KG5W094643@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/153434; it has been noted by GNATS.
From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: Rusty Nejdl <rnejdl@ringofsaturn.com>,
Gerald Pfeifer <gerald@FreeBSD.org>, bug-followup@freebsd.org,
spam@rm-rf.kiev.ua
Cc:
Subject: Re: ports/153434: Update wine to 1.3.10
Date: Sat, 25 Dec 2010 06:17:49 +0200
--W/nzBZO5zC0uMSeA
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hi
A few little corrections:
- don't touch EPOCH
- fix pkg-plist
- remove FreeBSD 6 notes from pkg-message
(wiki still need an update, also I left OSVERSION check in Makefile for now)
--W/nzBZO5zC0uMSeA
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch.txt"
Index: emulators/wine/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= wine
-DISTVERSION= 1.3.7
+DISTVERSION= 1.3.10
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
Index: emulators/wine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.7.tar.bz2) = 13cf54ec8b83d49abd6888b543ab359661d70af9df3e30ab70d7e54b6b5cd025
-SIZE (wine-1.3.7.tar.bz2) = 18379692
+SHA256 (wine-1.3.10.tar.bz2) = f7a2c0565ba7fd765f9498cf023ffb75c96caa999ae25ae16416eb09899b5038
+SIZE (wine-1.3.10.tar.bz2) = 18366433
Index: emulators/wine/pkg-plist
@@ -542,6 +542,7 @@
include/wine/windows/storage.h
include/wine/windows/strmif.h
include/wine/windows/strmif.idl
+include/wine/windows/strsafe.h
include/wine/windows/structuredquerycondition.h
include/wine/windows/structuredquerycondition.idl
include/wine/windows/svrapi.h
@@ -643,7 +644,6 @@
include/wine/windows/xmldom.h
include/wine/windows/xmldom.idl
include/wine/windows/xmldomdid.h
-include/wine/windows/xmldso.h
include/wine/windows/xmldso.idl
include/wine/windows/xmldsodid.h
include/wine/windows/xmllite.h
@@ -760,6 +760,7 @@
lib/wine/d3dx9_42.dll.so
lib/wine/d3dx9_43.dll.so
lib/wine/d3dxof.dll.so
+lib/wine/dbgeng.dll.so
lib/wine/dbghelp.dll.so
lib/wine/dciman32.dll.so
lib/wine/ddeml.dll16.so
@@ -895,6 +896,7 @@
lib/wine/fakedlls/d3dx9_42.dll
lib/wine/fakedlls/d3dx9_43.dll
lib/wine/fakedlls/d3dxof.dll
+lib/wine/fakedlls/dbgeng.dll
lib/wine/fakedlls/dbghelp.dll
lib/wine/fakedlls/dciman32.dll
lib/wine/fakedlls/ddeml.dll16
@@ -1046,15 +1048,19 @@
lib/wine/fakedlls/msvidc32.dll
lib/wine/fakedlls/msvideo.dll16
lib/wine/fakedlls/mswsock.dll
+lib/wine/fakedlls/msxml.dll
+lib/wine/fakedlls/msxml2.dll
lib/wine/fakedlls/msxml3.dll
lib/wine/fakedlls/msxml4.dll
lib/wine/fakedlls/msxml6.dll
lib/wine/fakedlls/nddeapi.dll
lib/wine/fakedlls/net.exe
lib/wine/fakedlls/netapi32.dll
+lib/wine/fakedlls/netsh.exe
lib/wine/fakedlls/newdev.dll
lib/wine/fakedlls/ngen.exe
lib/wine/fakedlls/notepad.exe
+lib/wine/fakedlls/npmshtml.dll
lib/wine/fakedlls/ntdll.dll
lib/wine/fakedlls/ntdsapi.dll
lib/wine/fakedlls/ntoskrnl.exe
@@ -1125,6 +1131,7 @@
lib/wine/fakedlls/sensapi.dll
lib/wine/fakedlls/serialui.dll
lib/wine/fakedlls/services.exe
+lib/wine/fakedlls/servicemodelreg.exe
lib/wine/fakedlls/setupapi.dll
lib/wine/fakedlls/setupx.dll16
lib/wine/fakedlls/sfc.dll
@@ -1194,7 +1201,6 @@
lib/wine/fakedlls/windebug.dll16
lib/wine/fakedlls/windowscodecs.dll
lib/wine/fakedlls/winealsa.drv
-lib/wine/fakedlls/wineaudioio.drv
lib/wine/fakedlls/wineboot.exe
lib/wine/fakedlls/winebrowser.exe
lib/wine/fakedlls/winecfg.exe
@@ -1237,6 +1243,7 @@
lib/wine/fakedlls/wlanapi.dll
lib/wine/fakedlls/wldap32.dll
lib/wine/fakedlls/wmi.dll
+lib/wine/fakedlls/wmic.exe
lib/wine/fakedlls/wmiutils.dll
lib/wine/fakedlls/wnaspi32.dll
lib/wine/fakedlls/wordpad.exe
@@ -1331,6 +1338,7 @@
lib/wine/libd3drm.def
lib/wine/libd3dx9.def
lib/wine/libd3dxof.def
+lib/wine/libdbgeng.def
lib/wine/libdbghelp.def
lib/wine/libdciman32.def
lib/wine/libddraw.def
@@ -1522,15 +1530,19 @@
lib/wine/msvidc32.dll.so
lib/wine/msvideo.dll16.so
lib/wine/mswsock.dll.so
+lib/wine/msxml.dll.so
+lib/wine/msxml2.dll.so
lib/wine/msxml3.dll.so
lib/wine/msxml4.dll.so
lib/wine/msxml6.dll.so
lib/wine/nddeapi.dll.so
lib/wine/net.exe.so
lib/wine/netapi32.dll.so
+lib/wine/netsh.exe.so
lib/wine/newdev.dll.so
lib/wine/ngen.exe.so
lib/wine/notepad.exe.so
+lib/wine/npmshtml.dll.so
lib/wine/ntdll.dll.so
lib/wine/ntdsapi.dll.so
lib/wine/ntoskrnl.exe.so
@@ -1601,6 +1613,7 @@
lib/wine/sensapi.dll.so
lib/wine/serialui.dll.so
lib/wine/services.exe.so
+lib/wine/servicemodelreg.exe.so
lib/wine/setupapi.dll.so
lib/wine/setupx.dll16.so
lib/wine/sfc.dll.so
@@ -1670,7 +1683,6 @@
lib/wine/windebug.dll16.so
lib/wine/windowscodecs.dll.so
lib/wine/winealsa.drv.so
-lib/wine/wineaudioio.drv.so
lib/wine/wineboot.exe.so
lib/wine/winebrowser.exe.so
lib/wine/winecfg.exe.so
@@ -1713,6 +1725,7 @@
lib/wine/wlanapi.dll.so
lib/wine/wldap32.dll.so
lib/wine/wmi.dll.so
+lib/wine/wmic.exe.so
lib/wine/wmiutils.dll.so
lib/wine/wnaspi32.dll.so
lib/wine/wordpad.exe.so
Index: 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 );
Index: 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.
--W/nzBZO5zC0uMSeA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012250420.oBP4KG5W094643>