From 5a485fda44949f6cf52f5b1594ce6551628c2af4 Mon Sep 17 00:00:00 2001 From: adam <adam@pkgsrc.org> Date: Mon, 16 Feb 2004 14:06:58 +0000 Subject: Changes 20040213: - Improved support for screen resolution changes. - More shell32 improvements. - Several Winelib compatibility fixes. - Beginnings of support for typelib creation. - Lots of bug fixes. --- emulators/wine/Makefile | 8 +++----- emulators/wine/PLIST | 9 +++++++-- emulators/wine/distinfo | 11 ++++++----- emulators/wine/patches/patch-aa | 6 +++--- emulators/wine/patches/patch-ac | 8 ++++---- emulators/wine/patches/patch-ae | 15 +++++++++++++++ 6 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 emulators/wine/patches/patch-ae (limited to 'emulators') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index a6ec4835204..e3e87171525 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.67 2004/02/11 01:45:01 abs Exp $ +# $NetBSD: Makefile,v 1.68 2004/02/16 14:06:58 adam Exp $ # -DISTNAME= Wine-20040121 +DISTNAME= Wine-20040213 PKGNAME= ${DISTNAME:S/W/w/} -WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/} CATEGORIES= emulators MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} \ @@ -23,12 +22,11 @@ ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386 NetBSD-2*-i386 ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 BUILDLINK_DEPENDS.freetype2= freetype>=2.1.4 - +WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/} USE_BUILDLINK2= YES USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -UNLIMIT_RESOURCES= datasize GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-curses #--disable-debug --disable-trace diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index e2ad6ea4d59..5bd0f513937 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2004/01/22 15:46:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.23 2004/02/16 14:06:58 adam Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -286,7 +286,6 @@ lib/libwine.so lib/libwine.so.1 lib/libwine_unicode.so lib/libwine_unicode.so.1 -lib/libwine_uuid.a lib/wine/advapi32.dll.so lib/wine/avicap32.dll.so lib/wine/avifil32.dll.so @@ -387,6 +386,7 @@ lib/wine/libdplayx.def lib/wine/libdpnhpast.def lib/wine/libdsound.def lib/wine/libdswave.def +lib/wine/libdxguid.a lib/wine/libgdi32.def lib/wine/libglu32.def lib/wine/libglut32.def @@ -411,6 +411,7 @@ lib/wine/libmsvcrt20.def lib/wine/libmsvcrt40.def lib/wine/libmsvcrtd.def lib/wine/libmsvfw32.def +lib/wine/libmsvidc32.def lib/wine/libmswsock.def lib/wine/libnetapi32.def lib/wine/libnewdev.def @@ -430,6 +431,7 @@ lib/wine/libquartz.def lib/wine/librasapi32.def lib/wine/libriched32.def lib/wine/librpcrt4.def +lib/wine/librsabase.def lib/wine/libserialui.def lib/wine/libsetupapi.def lib/wine/libshdocvw.def @@ -445,6 +447,7 @@ lib/wine/libunicows.def lib/wine/liburl.def lib/wine/liburlmon.def lib/wine/libuser32.def +lib/wine/libuuid.a lib/wine/libuxtheme.def lib/wine/libversion.def lib/wine/libw32skrnl.def @@ -491,6 +494,7 @@ lib/wine/msvcrt20.dll.so lib/wine/msvcrt40.dll.so lib/wine/msvcrtd.dll.so lib/wine/msvfw32.dll.so +lib/wine/msvidc32.dll.so lib/wine/msvideo.dll.so lib/wine/mswsock.dll.so lib/wine/netapi32.dll.so @@ -525,6 +529,7 @@ lib/wine/regsvr32.exe.so lib/wine/riched32.dll.so lib/wine/rpcrt4.dll.so lib/wine/rpcss.exe.so +lib/wine/rsabase.dll.so lib/wine/rundll32.exe.so lib/wine/serialui.dll.so lib/wine/setupapi.dll.so diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 07f058a0511..762c77c4645 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.21 2004/01/22 15:46:43 adam Exp $ +$NetBSD: distinfo,v 1.22 2004/02/16 14:06:58 adam Exp $ -SHA1 (Wine-20040121.tar.gz) = 442c6f1997f3206502f3a4883ce3fa6ceab20aab -Size (Wine-20040121.tar.gz) = 9865181 bytes -SHA1 (patch-aa) = 27f2fa6bf9825ce17fb8723c7cf3fbc0dd0ac7b3 +SHA1 (Wine-20040213.tar.gz) = b3c4b778cb4fa54bb0bc27f08ee8494b3b2b66eb +Size (Wine-20040213.tar.gz) = 9933262 bytes +SHA1 (patch-aa) = 1b3867d550221956bb4058b6b8b3a79c7f451d6f SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed -SHA1 (patch-ac) = f24e5e01cb6e96cad463c3e63ff82fd25ed1c66d +SHA1 (patch-ac) = faaeb3a07135d7c0ecd4c884006e3f0526747376 SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6 +SHA1 (patch-ae) = 691113bab9f24bcbabd786e7f1ff2fe0933d721f diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index fdbe7bdfa6d..a6f98b0a18e 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2003/10/17 13:54:18 adam Exp $ +$NetBSD: patch-aa,v 1.11 2004/02/16 14:06:58 adam Exp $ ---- Make.rules.in.orig 2003-10-11 03:05:18.000000000 +0200 +--- Make.rules.in.orig 2004-01-27 00:11:18.000000000 +0000 +++ Make.rules.in -@@ -105,7 +105,7 @@ conf_manext = 5 +@@ -104,7 +104,7 @@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 6a0772034e1..77cf5bcd0fd 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.11 2004/01/22 15:46:43 adam Exp $ +$NetBSD: patch-ac,v 1.12 2004/02/16 14:06:58 adam Exp $ ---- configure.orig 2004-01-22 01:02:29.000000000 +0000 +--- configure.orig 2004-02-13 23:41:13.000000000 +0000 +++ configure -@@ -17544,7 +17544,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17598,7 +17598,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.11 2004/01/22 15:46:43 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -18551,7 +18551,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -18605,7 +18605,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-ae b/emulators/wine/patches/patch-ae new file mode 100644 index 00000000000..a1c0537b6c6 --- /dev/null +++ b/emulators/wine/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.9 2004/02/16 14:07:35 adam Exp $ + +--- programs/winedbg/elf.c.orig 2004-02-16 14:40:16.000000000 +0000 ++++ programs/winedbg/elf.c +@@ -69,6 +69,10 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(winedbg); + ++#ifndef STN_UNDEF ++# define STN_UNDEF 0 ++#endif ++ + typedef struct tagELF_DBG_INFO + { + void *elf_addr; -- cgit v1.2.3