From b05abfffcfb09183bfb29113dc903f31b28397eb Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 10 Oct 2005 08:32:23 +0000 Subject: Changes 20050930: - Joystick force feedback support. - Beginnings of Win64 support. - Many MSI fixes and cleanups. - Font linking support. - Several OLE fixes. - Some fixes for MacOS/x86. - Lots of bug fixes. --- emulators/wine/Makefile | 4 ++-- emulators/wine/PLIST | 53 ++++++++++++++++++++++++++++++----------- emulators/wine/distinfo | 14 +++++------ emulators/wine/patches/patch-aa | 6 ++--- emulators/wine/patches/patch-ac | 8 +++---- emulators/wine/patches/patch-af | 6 ++--- 6 files changed, 58 insertions(+), 33 deletions(-) (limited to 'emulators') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 8742cc912e0..c55edf1b5e6 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.90 2005/09/07 14:28:38 adam Exp $ +# $NetBSD: Makefile,v 1.91 2005/10/10 08:32:23 adam Exp $ -DISTNAME= Wine-20050830 +DISTNAME= Wine-20050930 PKGNAME= ${DISTNAME:S/W/w/} CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wine/} \ diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index de6e634ce14..e5bf4332f25 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.33 2005/09/07 14:28:38 adam Exp $ +@comment $NetBSD: PLIST,v 1.34 2005/10/10 08:32:23 adam Exp $ bin/function_grep.pl bin/msiexec bin/notepad @@ -91,7 +91,6 @@ include/wine/windows/axextend.idl include/wine/windows/basetsd.h include/wine/windows/basetyps.h include/wine/windows/cderr.h -include/wine/windows/cfgmgr32.h include/wine/windows/cguid.h include/wine/windows/comcat.h include/wine/windows/comcat.idl @@ -122,6 +121,8 @@ include/wine/windows/dciddi.h include/wine/windows/dciman.h include/wine/windows/dde.h include/wine/windows/ddeml.h +include/wine/windows/ddk/cfgmgr32.h +include/wine/windows/ddk/wdm.h include/wine/windows/ddk/winsplp.h include/wine/windows/ddraw.h include/wine/windows/ddrawi.h @@ -177,6 +178,8 @@ include/wine/windows/guiddef.h include/wine/windows/hlink.h include/wine/windows/hlink.idl include/wine/windows/htmlhelp.h +include/wine/windows/iads.h +include/wine/windows/iads.idl include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/idispids.h @@ -259,6 +262,8 @@ include/wine/windows/oaidl.idl include/wine/windows/objbase.h include/wine/windows/objidl.h include/wine/windows/objidl.idl +include/wine/windows/objsafe.h +include/wine/windows/objsafe.idl include/wine/windows/objsel.h include/wine/windows/ocidl.h include/wine/windows/ocidl.idl @@ -765,22 +770,42 @@ man/man1/winedump.1 man/man1/wineg++.1 man/man1/winegcc.1 man/man1/winemaker.1 +man/man1/wineserver.1 man/man1/wmc.1 man/man1/wrc.1 share/aclocal/wine.m4 share/applications/wine.desktop -share/fonts/wine/wine_coure.fon -share/fonts/wine/wine_couree.fon -share/fonts/wine/wine_courer.fon -share/fonts/wine/wine_cvgasys.fon -share/fonts/wine/wine_marlett.ttf -share/fonts/wine/wine_sserife.fon -share/fonts/wine/wine_sserifee.fon -share/fonts/wine/wine_sserifer.fon -share/fonts/wine/wine_svgasys.fon -share/fonts/wine/wine_vgasys.fon -share/fonts/wine/wine_vgasyse.fon -share/fonts/wine/wine_vgasysr.fon +share/fonts/wine/coue1255.fon +share/fonts/wine/coue1256.fon +share/fonts/wine/coue1257.fon +share/fonts/wine/coure.fon +share/fonts/wine/couree.fon +share/fonts/wine/coureg.fon +share/fonts/wine/courer.fon +share/fonts/wine/couret.fon +share/fonts/wine/cvgasys.fon +share/fonts/wine/hvgasys.fon +share/fonts/wine/jvgasys.fon +share/fonts/wine/marlett.ttf +share/fonts/wine/ssee1255.fon +share/fonts/wine/ssee1256.fon +share/fonts/wine/ssee1257.fon +share/fonts/wine/ssee874.fon +share/fonts/wine/sserife.fon +share/fonts/wine/sserifee.fon +share/fonts/wine/sserifeg.fon +share/fonts/wine/sserifer.fon +share/fonts/wine/sserifet.fon +share/fonts/wine/svgasys.fon +share/fonts/wine/vgas1255.fon +share/fonts/wine/vgas1256.fon +share/fonts/wine/vgas1257.fon +share/fonts/wine/vgas874.fon +share/fonts/wine/vgasys.fon +share/fonts/wine/vgasyse.fon +share/fonts/wine/vgasysg.fon +share/fonts/wine/vgasysr.fon +share/fonts/wine/vgasyst.fon share/wine/generic.ppd share/wine/wine.inf @dirrm share/wine diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index f54cb06f88f..2817d193be9 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.36 2005/09/07 14:28:38 adam Exp $ +$NetBSD: distinfo,v 1.37 2005/10/10 08:32:23 adam Exp $ -SHA1 (Wine-20050830.tar.gz) = 6e2c5b51efc4563c7a5f032160414bf110fb1e08 -RMD160 (Wine-20050830.tar.gz) = 95b68d68706310cf52406f6528d9dabb0f407da4 -Size (Wine-20050830.tar.gz) = 12433457 bytes -SHA1 (patch-aa) = fdbe7d0faffa7f0837482f18cb5f96d520d7a538 +SHA1 (Wine-20050930.tar.gz) = 5aac3b30392e53baa279b724dbd1828d3937d6f5 +RMD160 (Wine-20050930.tar.gz) = 2c794d814dc0160c5880572f30c2f6fc8dceb97a +Size (Wine-20050930.tar.gz) = 12838537 bytes +SHA1 (patch-aa) = 731b1a861597cd9ca9a772bf3dec8d2e891f6282 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91 -SHA1 (patch-ac) = 61b05ff6fddc71af03168971a9e01c575efb8266 +SHA1 (patch-ac) = 422df60c75a3dca01f969eb3a6727822d4b6defa SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c -SHA1 (patch-af) = a8eb0a12b990ce5431498bff51bd2ad6a0b9d7b8 +SHA1 (patch-af) = eb852f31e451db81692a25fadf81b7e20f2c4d9b SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279 SHA1 (patch-ah) = 077f4a49280cb120fbd9a6f3a84a278377e90e05 SHA1 (patch-ai) = 6980c8ba0a17d003e9b5d9e5d512a141a11508cb diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index 7b6613e1596..bea9ca23726 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.17 2005/09/07 14:28:38 adam Exp $ +$NetBSD: patch-aa,v 1.18 2005/10/10 08:32:23 adam Exp $ ---- Make.rules.in.orig 2005-08-11 17:12:19.000000000 +0000 +--- Make.rules.in.orig 2005-09-28 18:34:01.000000000 +0000 +++ Make.rules.in @@ -109,7 +109,7 @@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.spec.c *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core + *.flc *.tab.c *.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-ac b/emulators/wine/patches/patch-ac index 371985d6817..e55102bce2b 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.20 2005/09/07 14:28:38 adam Exp $ +$NetBSD: patch-ac,v 1.21 2005/10/10 08:32:23 adam Exp $ ---- configure.orig 2005-08-30 10:58:42.000000000 +0000 +--- configure.orig 2005-09-30 12:02:39.000000000 +0000 +++ configure -@@ -15831,7 +15831,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -16049,7 +16049,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.20 2005/09/07 14:28:38 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -17733,7 +17733,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -17951,7 +17951,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-af b/emulators/wine/patches/patch-af index f7aea013548..0fac23fac73 100644 --- a/emulators/wine/patches/patch-af +++ b/emulators/wine/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.13 2005/07/26 13:24:36 adam Exp $ +$NetBSD: patch-af,v 1.14 2005/10/10 08:32:23 adam Exp $ ---- dlls/ntdll/signal_i386.c.orig 2005-07-03 11:24:54.000000000 +0000 +--- dlls/ntdll/signal_i386.c.orig 2005-09-27 09:36:15.000000000 +0000 +++ dlls/ntdll/signal_i386.c @@ -204,7 +204,7 @@ typedef struct trapframe SIGCONTEXT; @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.13 2005/07/26 13:24:36 adam Exp $ typedef struct sigcontext SIGCONTEXT; -@@ -324,7 +324,40 @@ typedef struct sigcontext SIGCONTEXT; +@@ -325,7 +325,40 @@ typedef ucontext_t SIGCONTEXT; #endif /* __APPLE__ */ -- cgit v1.2.3