diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-04-11 09:05:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-04-11 09:05:39 +0000 |
| commit | 3a97391e44451e9d0b2ffe76b3eaaeb6ddebd1da (patch) | |
| tree | e737c69dc89814e726e2cc635a49f2ad60a659f1 /app-emulation | |
| parent | Fabian Groffen says: remove alloca() usage #173998. (diff) | |
| download | gentoo-2-3a97391e44451e9d0b2ffe76b3eaaeb6ddebd1da.tar.gz gentoo-2-3a97391e44451e9d0b2ffe76b3eaaeb6ddebd1da.tar.bz2 gentoo-2-3a97391e44451e9d0b2ffe76b3eaaeb6ddebd1da.zip | |
Remove pointless call to settimeofday() #162438.
(Portage version: 2.1.2.3)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-stub-RtlSetTimeZoneInformation.patch | 13 | ||||
| -rw-r--r-- | app-emulation/wine/wine-0.9.34.ebuild | 3 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 748a94d23600..5af99b53666b 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.174 2007/03/31 02:29:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.175 2007/04/11 09:05:39 vapier Exp $ + + 11 Apr 2007; Mike Frysinger <vapier@gentoo.org> + +files/wine-stub-RtlSetTimeZoneInformation.patch, wine-0.9.34.ebuild: + Remove pointless call to settimeofday() #162438. *wine-0.9.34 (31 Mar 2007) diff --git a/app-emulation/wine/files/wine-stub-RtlSetTimeZoneInformation.patch b/app-emulation/wine/files/wine-stub-RtlSetTimeZoneInformation.patch new file mode 100644 index 000000000000..e776aa140ef7 --- /dev/null +++ b/app-emulation/wine/files/wine-stub-RtlSetTimeZoneInformation.patch @@ -0,0 +1,13 @@ +http://bugs.gentoo.org/162438 + +--- wine/dlls/ntdll/time.c ++++ wine/dlls/ntdll/time.c +@@ -1059,7 +1059,7 @@ + */ + NTSTATUS WINAPI RtlSetTimeZoneInformation( const RTL_TIME_ZONE_INFORMATION *tzinfo ) + { +-#ifdef HAVE_SETTIMEOFDAY ++#if 0 /* settimeofday(NULL) always returns -1: Bug 162438 */ + struct timezone tz; + + tz.tz_minuteswest = tzinfo->Bias; diff --git a/app-emulation/wine/wine-0.9.34.ebuild b/app-emulation/wine/wine-0.9.34.ebuild index 6921d3b5e840..bf8431998b7c 100644 --- a/app-emulation/wine/wine-0.9.34.ebuild +++ b/app-emulation/wine/wine-0.9.34.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.34.ebuild,v 1.1 2007/03/31 02:29:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.34.ebuild,v 1.2 2007/04/11 09:05:39 vapier Exp $ inherit eutils flag-o-matic multilib @@ -59,6 +59,7 @@ src_unpack() { sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002 + epatch "${FILESDIR}"/wine-stub-RtlSetTimeZoneInformation.patch #162438 sed -i '/^MimeType/d' tools/wine.desktop || die #117785 } |