From 5302cd78ba22111ab47087d3800bd1248a9debf7 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 9 Dec 2006 19:42:43 +0000 Subject: Changes 0.9.27: - Better support for noexec kernels. - Better Dwarf support in dbghelp. - Several Winsock fixes. - Various code cleanups. - Lots of bug fixes. --- emulators/wine/Makefile | 4 ++-- emulators/wine/PLIST | 4 +--- emulators/wine/distinfo | 9 +++++---- emulators/wine/patches/patch-ad | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 emulators/wine/patches/patch-ad (limited to 'emulators') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 95d1e45a731..6380a10b20b 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.119 2006/11/25 13:23:14 adam Exp $ +# $NetBSD: Makefile,v 1.120 2006/12/09 19:42:43 adam Exp $ -DISTNAME= wine-0.9.26 +DISTNAME= wine-0.9.27 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index e0263ca3c5e..3a08e687c46 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.51 2006/11/25 13:23:14 adam Exp $ +@comment $NetBSD: PLIST,v 1.52 2006/12/09 19:42:43 adam Exp $ bin/bin2res bin/fnt2bdf bin/function_grep.pl @@ -510,7 +510,6 @@ lib/wine/explorer.exe.so lib/wine/gdi.exe16 lib/wine/gdi32.dll.so ${WINE_OPENGL}lib/wine/glu32.dll.so -${WINE_OPENGL}lib/wine/glut32.dll.so lib/wine/gphoto2.ds.so lib/wine/hh.exe.so lib/wine/hhctrl.ocx.so @@ -574,7 +573,6 @@ lib/wine/libdxerr9.a lib/wine/libdxguid.a lib/wine/libgdi32.def ${WINE_OPENGL}lib/wine/libglu32.def -${WINE_OPENGL}lib/wine/libglut32.def lib/wine/libhid.def lib/wine/libhlink.def lib/wine/libicmp.def diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 2ee78bf93fb..288f8f111f8 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.56 2006/11/25 13:23:14 adam Exp $ +$NetBSD: distinfo,v 1.57 2006/12/09 19:42:43 adam Exp $ -SHA1 (wine-0.9.26.tar.bz2) = fc5cc0f14df7db577ffbf0deb452b4a379963abf -RMD160 (wine-0.9.26.tar.bz2) = 6db55826d06fc5f008131ad90f3ffaf1fa40c65f -Size (wine-0.9.26.tar.bz2) = 11318798 bytes +SHA1 (wine-0.9.27.tar.bz2) = 9cb34d45a4a5cbd140bef6185cd5662b75c22b7e +RMD160 (wine-0.9.27.tar.bz2) = 745a89c3b270a3082d7ed0325e969a8d1c13d8ea +Size (wine-0.9.27.tar.bz2) = 11365874 bytes SHA1 (patch-aa) = ba1c86faa7e9d7008622f105359229d3593e3cee SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91 SHA1 (patch-ac) = 519aae38eac15edf3ff60936aec07a4543a0fc44 +SHA1 (patch-ad) = 7f34f406e712a3f13c7b6cc0e5219de38a2754cf SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22 SHA1 (patch-af) = a55e83f71f09fdbc5f980999ca9d435aac4120f9 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad new file mode 100644 index 00000000000..2524920afec --- /dev/null +++ b/emulators/wine/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.10 2006/12/09 19:42:43 adam Exp $ + +--- tools/wineshelllink.orig 2006-12-09 20:04:14.000000000 +0100 ++++ tools/wineshelllink +@@ -101,7 +101,7 @@ directory_entry() + [Desktop Entry] + Type=Directory + EOF +- if [ "$1" == "wine" ] ; then ++ if [ "$1" = "wine" ] ; then + echo "Name=Wine" + echo "Icon=wine" + else +@@ -208,7 +208,7 @@ if [ $mode = "menu" ] ; then + mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" + + linkpath=`dirname "$link" | sed 's!/!-!g'` +- if [ "$linkpath" == "." ] ; then ++ if [ "$linkpath" = "." ] ; then + linkpath="" + else + linkpath="-$linkpath" -- cgit v1.2.3