From b9d3b5f3523f1b25816b9de91d77e25275c31eb5 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 15 Sep 2003 10:51:36 +0000 Subject: Changes 20030911: - Many improvements to the winecfg configuration tool. - Massive header files cleanup for better source compatibility. - Some more progress on the kernel/ntdll separation. - Lots of bug fixes. Changes 20030813: - Partial implementation of the Microsoft Installer (msi.dll). - GUI for regedit (from ReactOS). - DirectMusic dlls reorganization. - Many Wininet improvements. - Lots of bug fixes. --- emulators/wine/Makefile | 11 +++++---- emulators/wine/PLIST | 53 +++++++++++++++++++---------------------- emulators/wine/distinfo | 15 ++++++------ emulators/wine/patches/patch-aa | 10 ++++---- emulators/wine/patches/patch-ab | 8 +++---- emulators/wine/patches/patch-ac | 46 ++++------------------------------- emulators/wine/patches/patch-ad | 10 ++++---- 7 files changed, 59 insertions(+), 94 deletions(-) (limited to 'emulators/wine') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 27e97aecd15..0bfb66ba7ed 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.49 2003/07/28 08:29:09 adam Exp $ +# $NetBSD: Makefile,v 1.50 2003/09/15 10:51:36 adam Exp $ -DISTNAME= Wine-20030709 -PKGREVISION= 1 +DISTNAME= Wine-20030911 PKGNAME= ${DISTNAME:S/W/w/} WRKSRC= ${WRKDIR}/${DISTNAME:tl} CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/} +MASTER_SITES= http://www.ibiblio.org/Linux/ALPHA/wine/development/ \ + ${MASTER_SITE_SOURCEFORGE:=wine/} \ + ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/} MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.winehq.com/ @@ -19,6 +20,8 @@ USE_BUILDLINK2= YES USE_X11= YES USE_GMAKE= YES USE_LIBTOOL= YES +BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison +YACC= ${PREFIX}/bin/bison -y GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-curses diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index e1e9ba187c4..b44315376cb 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2003/07/19 22:44:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2003/09/15 10:51:36 adam Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -41,8 +41,10 @@ include/wine/msvcrt/eh.h include/wine/msvcrt/errno.h include/wine/msvcrt/fcntl.h include/wine/msvcrt/io.h +include/wine/msvcrt/limits.h include/wine/msvcrt/locale.h include/wine/msvcrt/malloc.h +include/wine/msvcrt/math.h include/wine/msvcrt/mbctype.h include/wine/msvcrt/mbstring.h include/wine/msvcrt/process.h @@ -63,32 +65,6 @@ include/wine/msvcrt/time.h include/wine/msvcrt/unistd.h include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h -include/wine/obj_cache.h -include/wine/obj_comcat.h -include/wine/obj_commdlgbrowser.h -include/wine/obj_connection.h -include/wine/obj_contextmenu.h -include/wine/obj_control.h -include/wine/obj_dockingwindowframe.h -include/wine/obj_dragdrop.h -include/wine/obj_dragdrophelper.h -include/wine/obj_enumguid.h -include/wine/obj_enumidlist.h -include/wine/obj_extracticon.h -include/wine/obj_inplace.h -include/wine/obj_olefont.h -include/wine/obj_oleobj.h -include/wine/obj_oleundo.h -include/wine/obj_oleview.h -include/wine/obj_picture.h -include/wine/obj_property.h -include/wine/obj_serviceprovider.h -include/wine/obj_shellbrowser.h -include/wine/obj_shellextinit.h -include/wine/obj_shellfolder.h -include/wine/obj_shelllink.h -include/wine/obj_shellview.h -include/wine/obj_webbrowser.h include/wine/unicode.h include/wine/windows/accctrl.h include/wine/windows/audevcod.h @@ -98,6 +74,7 @@ include/wine/windows/basetsd.h include/wine/windows/cderr.h include/wine/windows/cguid.h include/wine/windows/comcat.h +include/wine/windows/comcat.idl include/wine/windows/commctrl.h include/wine/windows/commdlg.h include/wine/windows/compobj.h @@ -139,6 +116,7 @@ include/wine/windows/dmusicf.h include/wine/windows/dmusici.h include/wine/windows/dmusics.h include/wine/windows/docobj.h +include/wine/windows/docobj.idl include/wine/windows/dpaddr.h include/wine/windows/dplay.h include/wine/windows/dplay8.h @@ -149,6 +127,8 @@ include/wine/windows/dshow.h include/wine/windows/dsound.h include/wine/windows/dyngraph.idl include/wine/windows/excpt.h +include/wine/windows/exdisp.h +include/wine/windows/exdisp.idl include/wine/windows/fci.h include/wine/windows/fdi.h include/wine/windows/guiddef.h @@ -164,6 +144,7 @@ include/wine/windows/lmapibuf.h include/wine/windows/lmbrowsr.h include/wine/windows/lmcons.h include/wine/windows/lmerr.h +include/wine/windows/lmstats.h include/wine/windows/lmwksta.h include/wine/windows/iphlpapi.h include/wine/windows/ipifcons.h @@ -183,6 +164,8 @@ include/wine/windows/mmreg.h include/wine/windows/mmsystem.h include/wine/windows/msacm.h include/wine/windows/msacmdlg.h +include/wine/windows/msi.h +include/wine/windows/msiquery.h include/wine/windows/mssip.h include/wine/windows/mswsock.h include/wine/windows/nb30.h @@ -199,12 +182,14 @@ include/wine/windows/objbase.h include/wine/windows/objidl.h include/wine/windows/objidl.idl include/wine/windows/ocidl.h +include/wine/windows/ocidl.idl include/wine/windows/ole2.h include/wine/windows/ole2ver.h include/wine/windows/oleauto.h include/wine/windows/olectl.h include/wine/windows/oledlg.h include/wine/windows/oleidl.h +include/wine/windows/oleidl.idl include/wine/windows/pktdef.h include/wine/windows/poppack.h include/wine/windows/prsht.h @@ -224,11 +209,16 @@ include/wine/windows/rpcndr.h include/wine/windows/rpcnterr.h include/wine/windows/rpcproxy.h include/wine/windows/servprov.h +include/wine/windows/servprov.idl include/wine/windows/setupapi.h include/wine/windows/shellapi.h include/wine/windows/shlguid.h include/wine/windows/shlobj.h include/wine/windows/shlwapi.h +include/wine/windows/shobjidl.h +include/wine/windows/shobjidl.idl +include/wine/windows/shtypes.h +include/wine/windows/shtypes.idl include/wine/windows/sipbase.h include/wine/windows/sql.h include/wine/windows/sqlext.h @@ -242,6 +232,7 @@ include/wine/windows/tlhelp32.h include/wine/windows/unknwn.h include/wine/windows/unknwn.idl include/wine/windows/urlmon.h +include/wine/windows/urlmon.idl include/wine/windows/uuids.h include/wine/windows/ver.h include/wine/windows/vfw.h @@ -390,6 +381,8 @@ lib/wine/libmapi32.def lib/wine/libmpr.def lib/wine/libmsacm32.def lib/wine/libmsdmo.def +lib/wine/libmshtml.def +lib/wine/libmsi.def lib/wine/libmsimg32.def lib/wine/libmsnet32.def lib/wine/libmsrle32.def @@ -397,6 +390,7 @@ lib/wine/libmsvcrt.def lib/wine/libmsvcrt20.def lib/wine/libmsvcrtd.def lib/wine/libmsvfw32.def +lib/wine/libmswsock.def lib/wine/libnetapi32.def lib/wine/libntdll.def lib/wine/libodbc32.def @@ -461,6 +455,8 @@ lib/wine/msacm32.dll.so lib/wine/msadp32.acm.so lib/wine/msdmo.dll.so lib/wine/msg711.acm.so +lib/wine/mshtml.dll.so +lib/wine/msi.dll.so lib/wine/msimg32.dll.so lib/wine/msisys.ocx.so lib/wine/msnet32.dll.so @@ -470,6 +466,7 @@ lib/wine/msvcrt20.dll.so lib/wine/msvcrtd.dll.so lib/wine/msvfw32.dll.so lib/wine/msvideo.dll.so +lib/wine/mswsock.dll.so lib/wine/netapi32.dll.so lib/wine/notepad.exe.so lib/wine/ntdll.dll.so @@ -516,7 +513,7 @@ lib/wine/start.exe.so lib/wine/sti.dll.so lib/wine/storage.dll.so lib/wine/stress.dll.so -lib/wine/system.dll.so +lib/wine/system.drv.so lib/wine/tapi32.dll.so lib/wine/toolhelp.dll.so lib/wine/ttydrv.dll.so diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index e2b20b50a92..de68a7d8a01 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.16 2003/07/14 11:15:28 adam Exp $ +$NetBSD: distinfo,v 1.17 2003/09/15 10:51:37 adam Exp $ -SHA1 (Wine-20030709.tar.gz) = 7dbd5b3bd59f504832a0d2c690e0ad049b14a24c -Size (Wine-20030709.tar.gz) = 9026020 bytes -SHA1 (patch-aa) = c3eaf40c63a0986df2b1e026435deca7f4c1a7d0 -SHA1 (patch-ab) = 92f25e121fa6b9bb41c84e0af33b291fc5d9c7e4 -SHA1 (patch-ac) = 5960dbeccff696cdcc67edb9b7849226a4b510e5 -SHA1 (patch-ad) = 90f93650b47d8fdc6094a7c29c72e88fc0dca09e +SHA1 (Wine-20030911.tar.gz) = 3cd9ebbc2695504de51781dc3a1eeb9c7ebc9ff1 +Size (Wine-20030911.tar.gz) = 9411260 bytes +SHA1 (patch-aa) = bbae0bb4b08ea271f86bf76a4a6b874b51cbcd90 +SHA1 (patch-ab) = 650075a531c22fbb9d608c6fec113de7d4fba335 +SHA1 (patch-ac) = 142b64525b7c4c027e4d8035ad55a347933befc9 +SHA1 (patch-ad) = 437b44a5682a24b8b9bcdcffedaa8266e79ee2b7 +SHA1 (patch-ae) = 00d8f780c51df22af7aac147e80979c258b01a3e diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index 6742c66f372..0bb215ac945 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.8 2003/06/23 08:12:59 adam Exp $ +$NetBSD: patch-aa,v 1.9 2003/09/15 10:51:38 adam Exp $ ---- Make.rules.in.orig 2003-06-14 01:26:02.000000000 +0200 -+++ Make.rules.in 2003-06-19 11:33:36.000000000 +0200 -@@ -102,7 +102,7 @@ +--- Make.rules.in.orig 2003-08-23 02:45:21.000000000 +0200 ++++ Make.rules.in +@@ -102,7 +102,7 @@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core + *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab index 462fe9d35b1..26a6d7bbb12 100644 --- a/emulators/wine/patches/patch-ab +++ b/emulators/wine/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.14 2003/06/23 08:13:00 adam Exp $ +$NetBSD: patch-ab,v 1.15 2003/09/15 10:51:38 adam Exp $ ---- dlls/ntdll/cdrom.c.orig 2003-04-02 02:59:12.000000000 +0200 -+++ dlls/ntdll/cdrom.c 2003-05-30 14:47:32.000000000 +0200 -@@ -53,6 +53,16 @@ +--- dlls/ntdll/cdrom.c.orig 2003-09-06 01:08:34.000000000 +0200 ++++ dlls/ntdll/cdrom.c +@@ -54,6 +54,16 @@ #endif #ifdef HAVE_LINUX_CDROM_H # include diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 374afbe2580..e7cd9ff4e2a 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,44 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2003/06/23 08:13:00 adam Exp $ +$NetBSD: patch-ac,v 1.7 2003/09/15 10:51:38 adam Exp $ ---- configure.orig 2003-06-18 22:35:38.000000000 +0200 -+++ configure 2003-06-19 11:34:00.000000000 +0200 -@@ -12230,7 +12230,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep libX11\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` -+ ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep libX11\\.so | sed 's/^.*=>[ ]*\(.*\)[ ]*/\1/'` - if test "x$ac_cv_lib_soname_X11" = "x" - then - ac_cv_lib_soname_X11="libX11.so" -@@ -12295,7 +12295,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep libXext\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` -+ ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep libXext\\.so | sed 's/^.*=>[ ]*\(.*\)[ ]*/\1/'` - if test "x$ac_cv_lib_soname_Xext" = "x" - then - ac_cv_lib_soname_Xext="libXext.so" -@@ -12360,7 +12360,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrender\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` -+ ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrender\\.so | sed 's/^.*=>[ ]*\(.*\)[ ]*/\1/'` - if test "x$ac_cv_lib_soname_Xrender" = "x" - then - ac_cv_lib_soname_Xrender="libXrender.so" -@@ -12425,7 +12425,7 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep libfreetype\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'` -+ ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep libfreetype\\.so | sed 's/^.*=>[ ]*\(.*\)[ ]*/\1/'` - if test "x$ac_cv_lib_soname_freetype" = "x" - then - ac_cv_lib_soname_freetype="libfreetype.so" -@@ -14770,7 +14770,7 @@ +--- configure.orig 2003-09-12 03:31:07.000000000 +0200 ++++ configure +@@ -15417,7 +15417,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -47,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2003/06/23 08:13:00 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -15656,7 +15656,7 @@ +@@ -16303,7 +16303,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad index c71d29b6101..846364efd3b 100644 --- a/emulators/wine/patches/patch-ad +++ b/emulators/wine/patches/patch-ad @@ -1,12 +1,12 @@ -$NetBSD: patch-ad,v 1.4 2003/06/23 09:03:07 adam Exp $ +$NetBSD: patch-ad,v 1.5 2003/09/15 10:51:39 adam Exp $ ---- dlls/iphlpapi/ifenum.c.orig 2003-06-19 12:04:06.000000000 +0200 -+++ dlls/iphlpapi/ifenum.c 2003-06-19 12:07:17.000000000 +0200 -@@ -69,6 +69,7 @@ +--- dlls/iphlpapi/ifenum.c.orig 2003-09-06 01:08:37.000000000 +0200 ++++ dlls/iphlpapi/ifenum.c +@@ -70,6 +70,7 @@ #endif #include +#include - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H #include -- cgit v1.2.3