From dc067063fe0fa7f06b41af979e48acf6dcde72b4 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 28 Jul 2006 13:04:35 +0000 Subject: Changes 0.9.18: - Still more work on Direct3D. - A lot of MSI bug fixes and improvements. - More compatible memory management. - Several fixes for Win64 support. - Some performance improvements. - Lots of bug fixes. --- emulators/wine/Makefile | 5 +++-- emulators/wine/PLIST | 13 ++++++++++--- emulators/wine/distinfo | 13 ++++++------- emulators/wine/patches/patch-aa | 6 +++--- emulators/wine/patches/patch-ac | 8 ++++---- emulators/wine/patches/patch-ah | 14 -------------- 6 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 emulators/wine/patches/patch-ah (limited to 'emulators/wine') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index f20710f4fa0..edef88ce54a 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.111 2006/07/10 21:12:03 adam Exp $ +# $NetBSD: Makefile,v 1.112 2006/07/28 13:04:35 adam Exp $ -DISTNAME= wine-0.9.17 +DISTNAME= wine-0.9.18 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} @@ -51,6 +51,7 @@ post-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index 8c57284da59..d986a6adc91 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.47 2006/07/10 21:12:03 adam Exp $ +@comment $NetBSD: PLIST,v 1.48 2006/07/28 13:04:35 adam Exp $ bin/bin2res bin/fnt2bdf bin/function_grep.pl @@ -94,6 +94,7 @@ include/wine/windows/basetsd.h include/wine/windows/basetyps.h include/wine/windows/cderr.h include/wine/windows/cguid.h +include/wine/windows/cierror.h include/wine/windows/comcat.h include/wine/windows/comcat.idl include/wine/windows/commctrl.h @@ -118,6 +119,9 @@ include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl include/wine/windows/d3dx8core.h include/wine/windows/dbghelp.h +include/wine/windows/dbinit.idl +include/wine/windows/dbprop.idl +include/wine/windows/dbs.idl include/wine/windows/dbt.h include/wine/windows/dciddi.h include/wine/windows/dciman.h @@ -293,6 +297,8 @@ include/wine/windows/ole2.h include/wine/windows/ole2ver.h include/wine/windows/oleauto.h include/wine/windows/olectl.h +include/wine/windows/oledb.h +include/wine/windows/oledb.idl include/wine/windows/oledlg.h include/wine/windows/oleidl.h include/wine/windows/oleidl.idl @@ -362,6 +368,8 @@ include/wine/windows/tchar.h include/wine/windows/textserv.h include/wine/windows/tlhelp32.h include/wine/windows/tmschema.h +include/wine/windows/tom.h +include/wine/windows/tom.idl include/wine/windows/twain.h include/wine/windows/unknwn.h include/wine/windows/unknwn.idl @@ -423,8 +431,6 @@ include/wine/windows/xmldsodid.h include/wine/windows/zmouse.h lib/libwine.so lib/libwine.so.1 -lib/libwine_unicode.so -lib/libwine_unicode.so.1 lib/wine/activeds.dll.so lib/wine/advapi32.dll.so lib/wine/advpack.dll.so @@ -505,6 +511,7 @@ lib/wine/imaadp32.acm.so lib/wine/imagehlp.dll.so lib/wine/imm.dll16 lib/wine/imm32.dll.so +lib/wine/infosoft.dll.so lib/wine/inseng.dll.so lib/wine/iphlpapi.dll.so lib/wine/itss.dll.so diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index bdfa95b3336..8ba66a4b6f1 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,16 +1,15 @@ -$NetBSD: distinfo,v 1.49 2006/07/10 21:12:03 adam Exp $ +$NetBSD: distinfo,v 1.50 2006/07/28 13:04:35 adam Exp $ -SHA1 (wine-0.9.17.tar.bz2) = 9f85e246d0d3f7435a3d343dba39e86fbe9d0fb7 -RMD160 (wine-0.9.17.tar.bz2) = 44e1f760ca31d67437ba769a6bdf6939028e8530 -Size (wine-0.9.17.tar.bz2) = 11044610 bytes -SHA1 (patch-aa) = 12e51699b3e8e3a66b3ba51e5971bfc71aedb14a +SHA1 (wine-0.9.18.tar.bz2) = 2b4386e5687c5c5b9a5ec44483dbf5068f74ad0a +RMD160 (wine-0.9.18.tar.bz2) = 2a40ab811c2fe20889b89da20503466d8781655e +Size (wine-0.9.18.tar.bz2) = 10875491 bytes +SHA1 (patch-aa) = e432297394d9e92af859eaa0083d9a85b8530e5b SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91 -SHA1 (patch-ac) = 5d092eefd078e004f06328efb85282d9f97978f1 +SHA1 (patch-ac) = c0a99356a4e7fb66f41f49c8fa85f8779a419287 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c SHA1 (patch-af) = 423bb6844dc5684cf6d14528ec2a4a0f0089d0ce SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279 -SHA1 (patch-ah) = 080fd52ef3767e984c769ab46a0f2cefa5bf8a07 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0 SHA1 (patch-ak) = 4bb4f47b47fc70cca1eba422e9c4c6c14c0a78bd diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index 114f5275a91..7d2d9c47ec3 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.21 2006/06/12 09:07:22 adam Exp $ +$NetBSD: patch-aa,v 1.22 2006/07/28 13:04:35 adam Exp $ ---- Make.rules.in.orig 2006-06-08 17:06:37.000000000 +0200 +--- Make.rules.in.orig 2006-07-27 16:55:50.000000000 +0200 +++ Make.rules.in -@@ -111,7 +111,7 @@ conf_manext = 5 +@@ -110,7 +110,7 @@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ *.flc *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 2cb307ba1b7..c9d4de96d76 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.31 2006/07/10 21:12:03 adam Exp $ +$NetBSD: patch-ac,v 1.32 2006/07/28 13:04:35 adam Exp $ ---- configure.orig 2006-07-10 18:01:06.000000000 +0200 +--- configure.orig 2006-07-27 16:55:50.000000000 +0200 +++ configure -@@ -20839,7 +20839,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -20903,7 +20903,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.31 2006/07/10 21:12:03 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -22856,7 +22856,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -22920,7 +22920,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then diff --git a/emulators/wine/patches/patch-ah b/emulators/wine/patches/patch-ah deleted file mode 100644 index 5fd272474fc..00000000000 --- a/emulators/wine/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.11 2006/07/10 21:12:03 adam Exp $ - ---- libs/wine/loader.c.orig 2006-07-10 22:43:42.000000000 +0200 -+++ libs/wine/loader.c -@@ -632,7 +632,9 @@ void wine_init( int argc, char *argv[], - - /* force a few limits that are set too low on some platforms */ - set_max_limit( RLIMIT_NOFILE ); -+#if !defined(__NetBSD__) - set_max_limit( RLIMIT_AS ); -+#endif - - wine_init_argv0_path( argv[0] ); - build_dll_path(); -- cgit v1.2.3