Remove pointless call to settimeofday() #162438.

Package-Manager: portage-2.1.2.3

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 748a94d236000f89a10d7623d63155420f527632..5af99b53666bd22a23d5477477f1aeb0678366a9 100644 (file)
--- 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/Manifest b/app-emulation/wine/Manifest
index 4ef542aaf05618cb187aade390c228a8e4b6a06f..b5877e9350edc0495d540443ec1c4b1db17eeec3 100644 (file)
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -61,6 +61,10 @@ AUX wine-no-ssp.patch 676 RMD160 47a239be62f8498ab0cf4a689be41d7d8e8f7228 SHA1 9
 MD5 a4727870f6da9ca5370ba0263e220f49 files/wine-no-ssp.patch 676
 RMD160 47a239be62f8498ab0cf4a689be41d7d8e8f7228 files/wine-no-ssp.patch 676
 SHA256 c0ffb4536b7b6162894c8a4037105fea138c704b17828fc7cf7aec1f77e55daa files/wine-no-ssp.patch 676
+AUX wine-stub-RtlSetTimeZoneInformation.patch 355 RMD160 b36f400621a32215193633039dc18439193a9e0f SHA1 b0daed6f040ebe28f863bce8ba1e0d2a338ea294 SHA256 d791175883f5b5eb09afb88ece26317db6b3b3afff7f93143e59913b58f88b32
+MD5 49661151295b8dfed44daa13330250fe files/wine-stub-RtlSetTimeZoneInformation.patch 355
+RMD160 b36f400621a32215193633039dc18439193a9e0f files/wine-stub-RtlSetTimeZoneInformation.patch 355
+SHA256 d791175883f5b5eb09afb88ece26317db6b3b3afff7f93143e59913b58f88b32 files/wine-stub-RtlSetTimeZoneInformation.patch 355
 AUX wine-wmf.patch 857 RMD160 875f34690c423b0abe3e1c5b28df37b50b6af306 SHA1 bed2382a31a80ea3e6a63a118bb1cebdd59ba7c2 SHA256 a056fd8fa2aa9254b99e10b74d40a4780e824b5dedaae50de3c83974056bb514
 MD5 68927499c968ed305a0f5125fb3b7d19 files/wine-wmf.patch 857
 RMD160 875f34690c423b0abe3e1c5b28df37b50b6af306 files/wine-wmf.patch 857
@@ -218,10 +222,10 @@ EBUILD wine-0.9.33.ebuild 3139 RMD160 fee4e06875612f9eab40da0f58e3205004e58ca0 S
 MD5 5432205a11e921cd003b6ae68f023772 wine-0.9.33.ebuild 3139
 RMD160 fee4e06875612f9eab40da0f58e3205004e58ca0 wine-0.9.33.ebuild 3139
 SHA256 2276556a4526b43df3206e6ac4538c5845eed6817e16ea4bf0a38a0bfe3f1a69 wine-0.9.33.ebuild 3139
-EBUILD wine-0.9.34.ebuild 3139 RMD160 d8c187f3a5b6760eaaea1a77989f095f244bb147 SHA1 c4c9364a937f116465734f357e68d9de85366e5b SHA256 eac73eb862ed6777f1d55329ae383ddc6de2cf744de70431623fd33b00c0c553
-MD5 c11bd112c5b383156943e8c42877bf22 wine-0.9.34.ebuild 3139
-RMD160 d8c187f3a5b6760eaaea1a77989f095f244bb147 wine-0.9.34.ebuild 3139
-SHA256 eac73eb862ed6777f1d55329ae383ddc6de2cf744de70431623fd33b00c0c553 wine-0.9.34.ebuild 3139
+EBUILD wine-0.9.34.ebuild 3211 RMD160 3a52a919b005209bba88889f8fea563971b9a9b2 SHA1 0c503b6652bd176d74ca5f38e9016e0c4326c358 SHA256 cebf5df4bda779c67e9ed8bdbc0219833906a3f32f2e9542c2ffb1b97b913f03
+MD5 90f9b6839ef4c48a3f46b534faa86ef2 wine-0.9.34.ebuild 3211
+RMD160 3a52a919b005209bba88889f8fea563971b9a9b2 wine-0.9.34.ebuild 3211
+SHA256 cebf5df4bda779c67e9ed8bdbc0219833906a3f32f2e9542c2ffb1b97b913f03 wine-0.9.34.ebuild 3211
 EBUILD wine-0.9.4.ebuild 4080 RMD160 2bd6c376b89961b942670138901ac09e0045d61a SHA1 250fd2e3a25b9e6d857c88097d7f71ff490f482f SHA256 17222177e45f74389841aadc3d1df6dcc84d892ab088f7658c7b295aed0b224f
 MD5 d5e96f71ce5efe683492a3e656600362 wine-0.9.4.ebuild 4080
 RMD160 2bd6c376b89961b942670138901ac09e0045d61a wine-0.9.4.ebuild 4080
@@ -290,10 +294,10 @@ EBUILD wine-9999.ebuild 3158 RMD160 8add78480a287bf43168c4fa6f2c7786e758da80 SHA
 MD5 73eebb27b20c95bb6c420aa38d7d3ad9 wine-9999.ebuild 3158
 RMD160 8add78480a287bf43168c4fa6f2c7786e758da80 wine-9999.ebuild 3158
 SHA256 311b7ea483ffbcc4d9fe1c5241af1b2370d927babdb4510aaf07192788b52ebc wine-9999.ebuild 3158
-MISC ChangeLog 33190 RMD160 3c742229afd3283776d12794bae938d5d41be618 SHA1 47bf6d9c17ed24acaf75650afebd2c67675c5d3f SHA256 ab60cc9c1f0bcd4586b798f530b5721aa8d176718526bfa03d89d6fea969f76a
-MD5 0ab8c2b10a9974f085eff54b21c6fa0a ChangeLog 33190
-RMD160 3c742229afd3283776d12794bae938d5d41be618 ChangeLog 33190
-SHA256 ab60cc9c1f0bcd4586b798f530b5721aa8d176718526bfa03d89d6fea969f76a ChangeLog 33190
+MISC ChangeLog 33364 RMD160 d5b9722b8abfc8facabdf0637e23d973522ffce2 SHA1 721f3efcc79405897a59294ebb2a7df678dbc328 SHA256 61525082225143a1b9d2a3647a1bc1ead7351eb49f11f46ff273141537d980f7
+MD5 7091e25860fd3f5695c3f72ff9435329 ChangeLog 33364
+RMD160 d5b9722b8abfc8facabdf0637e23d973522ffce2 ChangeLog 33364
+SHA256 61525082225143a1b9d2a3647a1bc1ead7351eb49f11f46ff273141537d980f7 ChangeLog 33364
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -436,7 +440,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGDceO8bi6rjpTunYRAopOAJ9jNjxi/4po9njaRPKsd1MYNoo73wCfcdBq
-crCi8wpUdpS2XRf2zIXnGLY=
-=hmCQ
+iD8DBQFGHKUM8bi6rjpTunYRAm/4AKCqmgLXdvRYacABxdEMN66PYqHLNQCeIyIT
+Lrz39ENPFrnwcOyuXBliPXg=
+=n/nx
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/wine/files/wine-stub-RtlSetTimeZoneInformation.patch b/app-emulation/wine/files/wine-stub-RtlSetTimeZoneInformation.patch
new file mode 100644 (file)
index 0000000..e776aa1
--- /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 6921d3b5e84008ba9b316128a2d41342c102e56d..bf8431998b7c00472e7568e04cb3df99f34cf694 100644 (file)
--- 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
 }