wine: Version bump
This commit is contained in:
Stefan Reimer
parent
3d01d7013f
commit
7df860c482
@ -1,14 +1,13 @@
|
||||
AUX AcceptEX.patch 2315 RMD160 7fd16659d4c3b24b4fc41ca2300959e2fc430ea7 SHA1 113dee9a99589580d8482610e0fdbc8535218a07 SHA256 2045b0c6931c3cb9b51107b53d5629eb732a7f4ee3d817b19064b9b24b7599e7
|
||||
AUX msvcr_eve.patch 1618 RMD160 746cc393725b50a4af8ee42bc2d46ec5abf55b43 SHA1 054891ded59398f0e2073af6ba5106c82ef0477f SHA256 e84065733ac736413af3c22fd25bc5e1b9edd40fbd4ceaa6e72102ccac88611d
|
||||
AUX pulseaudio.patch 109370 RMD160 a7412efb915018d657ae329aeed2b907e285425c SHA1 bcf663862186bb62a6ccefb85297c6b218b06087 SHA256 71e28f02a9a3d341e123303ad7ff2ee63aaa33945cd6d40fdb2986b9a393a4a1
|
||||
AUX reset_stencil.patch 984 RMD160 e95dca101ccfabcfb9f244c2a36a8a01b2408588 SHA1 e0599e9ca851ea6a6c16db187eb8dd00580a4460 SHA256 bf1cd3f1fa4875b1a73d57c6c924a5de08edd3aab56142c68655f92646268ae8
|
||||
AUX wine-1.1.15-winegcc.patch 1556 RMD160 ca7e0df0a45507e7d31ed81c5712111b83ed9bfa SHA1 4b155fe7cb5e831b7f92757d52aa1ab12569b232 SHA256 dbd89db561d7583faf317d795b8c11231575d885e21c6414add39079604dbd0d
|
||||
AUX wine-1.4_rc2-multilib-portage.patch 1256 RMD160 6445df9cc97ad523f54de256f37810366a0693fd SHA1 8d0d794f74952a53d38c75a8cb586f784a3b9357 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938
|
||||
DIST wine-1.4.tar.bz2 20035856 RMD160 ee523c4cf15984197487432790c0e5bbba3ec495 SHA1 ce5d56b9b949c01dde663ab39739ffcfb41a73c4 SHA256 99a437bb8bd350bb1499d59183635e58217e73d631379c43cfd0d6020428ee65
|
||||
DIST wine-1.5.5.tar.bz2 20158084 RMD160 02d99b464f66b7b45a728e9e40520968a938e2dd SHA1 523c15277995f4edac539b333ab980b5b208f8d0 SHA256 e7d5ba716d2ac47193fa31eff66cc179145ddcb453c6923eaea70596a82b084e
|
||||
DIST wine-1.5.6.tar.bz2 20380981 RMD160 92eb37e878a5e62936742e1ee057443d88b2db95 SHA1 c1cd750d974f9e6f0e4958f483264b2492c20150 SHA256 b178bc34a69341a8f0a7ff73f7dadf2562ed2e5eb03dc0522b7c4d6002e53994
|
||||
DIST wine-mono-0.0.4.msi 44408320 RMD160 4a68b97bbe6f5202de594c51a2cc45ea7e1e5089 SHA1 7d827f7d28a88ae0da95a136573783124ffce4b1 SHA256 15d8a612cdeca4eff3137353f29fdeb7a99e055cd633844c91cd00e0186b8882
|
||||
DIST wine_gecko-1.4-x86.msi 14732288 RMD160 02363538a77a954f2bf1014b28ec1ed8fe2d1b6e SHA1 c30aa99621e98336eb4b7e2074118b8af8ea2ad5 SHA256 b30e0ac29a91a6fc40c73b5b760a56360a1d5323282545e32efaa40c75d8986d
|
||||
DIST wine_gecko-1.4-x86_64.msi 14980096 RMD160 5613e27d474085c31b53c868ed020445bdee37ae SHA1 bf0aaf56a8cf9abd75be02b56b05e5c4e9a4df93 SHA256 ceab7f1866e85175ed4cd3b5d081ee4f77c8d32ac7adf489a19c1f7329187219
|
||||
DIST wine_gecko-1.5-x86.msi 15950848 RMD160 691e4e96abf2bd17a6d55f8bb784c40e23b0ff9c SHA1 07b2bc74d03c885bb39124a7641715314cd3ae71 SHA256 2e372a1b87ff2a22ad5127400ece4b09e55591d9f84e00bb562d294898a49b5c
|
||||
DIST wine_gecko-1.5-x86_64.msi 16345088 RMD160 e5557156e11ebcc78529c655e5b93081e9bd5b9c SHA1 80a3b36c30bb79a11889879392fdc1fcda9ca165 SHA256 762e80b41e6922849b28299dc5810a28634d484fe73fb7ca52804460588a1730
|
||||
EBUILD wine-1.4.ebuild 6236 RMD160 aea6af88d59cfcb02d72c1194a85b26d59fd40a4 SHA1 c03b0d215b10f4d5f6230796a9becf2925693f49 SHA256 8e6ed9bdaa8ff6f89d72f0eccc580a689fbc8aae8692c481893a1a5aa307cea4
|
||||
EBUILD wine-1.5.5.ebuild 6415 RMD160 b7580772601dcb534d43c34602b2f04b4025b587 SHA1 f0255a1b78ea4bec4c550a23d98e6dbf5161842e SHA256 c9bb676741a3afd328c4a8c60107fa4cbf8d681993d29403a69e97843334455d
|
||||
EBUILD wine-1.5.6.ebuild 6584 RMD160 0d7c168aca9905facb177d9334f4e7b69124a88b SHA1 648e775ec2cb98e6614df8acc2938f826c879220 SHA256 6e6e65ac697ca895821658b6a5e1f326c139998b9c67db52ae840d1c64bad87c
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
|
||||
index d3a4590..dd818f2 100644
|
||||
--- a/dlls/ws2_32/socket.c
|
||||
+++ b/dlls/ws2_32/socket.c
|
||||
@@ -1700,7 +1700,7 @@ static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS sta
|
||||
if (status != STATUS_PENDING)
|
||||
goto finish;
|
||||
|
||||
- return STATUS_SUCCESS;
|
||||
+ return STATUS_ALERTED;
|
||||
|
||||
finish:
|
||||
iosb->u.Status = status;
|
||||
@@ -1708,8 +1708,6 @@ finish:
|
||||
|
||||
if (wsa->user_overlapped->hEvent)
|
||||
SetEvent(wsa->user_overlapped->hEvent);
|
||||
- if (wsa->cvalue)
|
||||
- WS_AddCompletion( HANDLE2SOCKET(wsa->listen_socket), wsa->cvalue, iosb->u.Status, iosb->Information );
|
||||
|
||||
*apc = ws2_async_accept_apc;
|
||||
return status;
|
||||
@@ -2040,7 +2038,9 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW
|
||||
req->async.callback = wine_server_client_ptr( WS2_async_accept );
|
||||
req->async.iosb = wine_server_client_ptr( overlapped );
|
||||
req->async.arg = wine_server_client_ptr( wsa );
|
||||
- /* We don't set event or completion since we may also have to read */
|
||||
+ req->async.cvalue = cvalue;
|
||||
+ /* We don't set event since we may also have to read, completion returns STATUS_ALERTED
|
||||
+ * to indicate that no completion should be queued. */
|
||||
status = wine_server_call( req );
|
||||
}
|
||||
SERVER_END_REQ;
|
||||
diff --git a/server/async.c b/server/async.c
|
||||
index dd28dff..b8be5cd 100644
|
||||
--- a/server/async.c
|
||||
+++ b/server/async.c
|
||||
@@ -256,10 +256,12 @@ void async_set_result( struct object *obj, unsigned int status, unsigned int tot
|
||||
else
|
||||
{
|
||||
if (async->timeout) remove_timeout_user( async->timeout );
|
||||
+ if (async->completion && async->data.cvalue && status != STATUS_ALERTED)
|
||||
+ add_completion( async->completion, async->comp_key, async->data.cvalue, status, total );
|
||||
+ else if (async->completion && async->data.cvalue && status == STATUS_ALERTED)
|
||||
+ status = STATUS_SUCCESS;
|
||||
async->timeout = NULL;
|
||||
async->status = status;
|
||||
- if (async->completion && async->data.cvalue)
|
||||
- add_completion( async->completion, async->comp_key, async->data.cvalue, status, total );
|
||||
if (apc)
|
||||
{
|
||||
apc_call_t data;
|
||||
@ -1,41 +0,0 @@
|
||||
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
|
||||
index 99d6c3d..3e57e47 100644
|
||||
--- a/dlls/msvcr100/msvcr100.spec
|
||||
+++ b/dlls/msvcr100/msvcr100.spec
|
||||
@@ -459,7 +459,7 @@
|
||||
@ cdecl __p__wenviron() msvcrt.__p__wenviron
|
||||
@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
|
||||
@ cdecl __pctype_func() msvcrt.__pctype_func
|
||||
-### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size
|
||||
+@ extern __pioinfo msvcrt.__pioinfo
|
||||
@ stub __pwctype_func
|
||||
@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
|
||||
@ stub __report_gsfailure
|
||||
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
|
||||
index ca284bf..f41b0da 100644
|
||||
--- a/dlls/msvcr80/msvcr80.spec
|
||||
+++ b/dlls/msvcr80/msvcr80.spec
|
||||
@@ -283,7 +283,7 @@
|
||||
@ cdecl __p__winver() msvcrt.__p__winver
|
||||
@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
|
||||
@ cdecl __pctype_func() msvcrt.__pctype_func
|
||||
-### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size
|
||||
+@ extern __pioinfo msvcrt.__pioinfo
|
||||
@ stub __pwctype_func
|
||||
@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
|
||||
@ stub __report_gsfailure
|
||||
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
|
||||
index 2ede2cc..2bba469 100644
|
||||
--- a/dlls/msvcr90/msvcr90.spec
|
||||
+++ b/dlls/msvcr90/msvcr90.spec
|
||||
@@ -275,7 +275,7 @@
|
||||
@ cdecl __p__wenviron() msvcrt.__p__wenviron
|
||||
@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
|
||||
@ cdecl __pctype_func() msvcrt.__pctype_func
|
||||
-### extern __pioinfo #don't forward to msvcrt.__pioinfo, it has different size
|
||||
+@ extern __pioinfo msvcrt.__pioinfo
|
||||
@ stub __pwctype_func
|
||||
@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
|
||||
@ stub __report_gsfailure
|
||||
--
|
||||
1.7.9.5
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.4.ebuild,v 1.1 2012/03/07 23:49:32 tetromino Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.6.ebuild,v 1.1 2012/06/10 03:24:21 tetromino Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
@ -19,18 +19,23 @@ else
|
||||
fi
|
||||
|
||||
GV="1.5"
|
||||
MV="0.0.4"
|
||||
DESCRIPTION="free implementation of Windows(tm) on Unix"
|
||||
HOMEPAGE="http://www.winehq.org/"
|
||||
SRC_URI="${SRC_URI}
|
||||
gecko? (
|
||||
mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
|
||||
win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
|
||||
)"
|
||||
mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
|
||||
win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
|
||||
)
|
||||
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap mp3 ncurses nls odbc openal opencl +opengl +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
|
||||
REQUIRED_USE="elibc_glibc? ( threads )" #286560
|
||||
IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2
|
||||
gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl
|
||||
+opengl +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
|
||||
REQUIRED_USE="elibc_glibc? ( threads )
|
||||
mono? ( || ( win32 !win64 ) )" #286560
|
||||
RESTRICT="test" #72375
|
||||
|
||||
MLIB_DEPS="amd64? (
|
||||
@ -128,10 +133,7 @@ src_prepare() {
|
||||
# Pulseaudio
|
||||
epatch "${FILESDIR}"/pulseaudio.patch
|
||||
# Diablo3 beta fixes
|
||||
epatch "${FILESDIR}"/AcceptEX.patch
|
||||
epatch "${FILESDIR}"/reset_stencil.patch
|
||||
# EVE online
|
||||
# epatch "${FILESDIR}"/msvcr_eve.patch
|
||||
epatch_user #282735
|
||||
eautoreconf
|
||||
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
|
||||
@ -220,6 +222,10 @@ src_install() {
|
||||
doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
|
||||
use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
|
||||
fi
|
||||
if use mono ; then
|
||||
insinto /usr/share/wine/mono
|
||||
doins "${DISTDIR}"/wine-mono-${MV}.msi
|
||||
fi
|
||||
if ! use perl ; then
|
||||
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
|
||||
fi
|
||||
Loading…
Reference in New Issue
Block a user