diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-07-10 04:06:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-07-10 04:06:02 +0000 |
| commit | 37eaeca658d06322babc7e687013ffe4f45952ac (patch) | |
| tree | cb4b6bdeaeed307fa9a54797f28982c988585f0c /app-emulation | |
| parent | Version bump #97367 (diff) | |
| download | gentoo-2-37eaeca658d06322babc7e687013ffe4f45952ac.tar.gz gentoo-2-37eaeca658d06322babc7e687013ffe4f45952ac.tar.bz2 gentoo-2-37eaeca658d06322babc7e687013ffe4f45952ac.zip | |
Add patch from upstream cvs to fix some hangs #98156 by Scott Jones.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-hangfix-bug2660.patch | 16 | ||||
| -rw-r--r-- | app-emulation/wine/wine-20050524.ebuild | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 210166ffbbf9..4c07364b1855 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.98 2005/07/10 04:05:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.99 2005/07/10 04:06:02 vapier Exp $ + + 10 Jul 2005; Mike Frysinger <vapier@gentoo.org> + +files/wine-hangfix-bug2660.patch, wine-20050524.ebuild: + Add patch from upstream cvs to fix some hangs #98156 by Scott Jones. *wine-20050628 (10 Jul 2005) diff --git a/app-emulation/wine/files/wine-hangfix-bug2660.patch b/app-emulation/wine/files/wine-hangfix-bug2660.patch new file mode 100644 index 000000000000..dab01e2acba7 --- /dev/null +++ b/app-emulation/wine/files/wine-hangfix-bug2660.patch @@ -0,0 +1,16 @@ +Index: dlls/user/painting.c +=================================================================== +RCS file: /home/wine/wine/dlls/user/painting.c,v +retrieving revision 1.29 +diff -u -r1.29 painting.c +--- dlls/user/painting.c 13 May 2005 14:03:06 -0000 1.29 ++++ dlls/user/painting.c 21 May 2005 06:54:26 -0000 +@@ -345,6 +345,7 @@ + send_erase( child, erase_flags, hrgn, NULL, NULL ); + + prev = 0; ++ break; + } + else + { + diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild index d059c0103e22..9e9636d0db4d 100644 --- a/app-emulation/wine/wine-20050524.ebuild +++ b/app-emulation/wine/wine-20050524.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.5 2005/07/10 03:59:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.6 2005/07/10 04:06:02 vapier Exp $ inherit eutils flag-o-matic multilib @@ -62,6 +62,7 @@ src_unpack() { epatch "${FILESDIR}"/wine-20050524-alsa-headers.patch epatch "${FILESDIR}"/winearts-kdecvs-fix.patch + epatch "${FILESDIR}"/wine-hangfix-bug2660.patch #98156 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in epatch "${FILESDIR}"/20041019-no-stack.patch #66002 } |