Fix timezone offsets on fbsd. bug #183708

Package-Manager: portage-2.1.3_rc6

4 files changed, 66 insertions, 10 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index e6a55f905408..392fec51ed11 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.181 2007/06/27 07:36:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.182 2007/07/06 01:46:06 dang Exp $
+
+  06 Jul 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/evolution-2.10.2-fbsd.patch, evolution-2.10.2.ebuild:
+  Fix timezone offsets on fbsd.  bug #183708
 
 *evolution-2.10.2 (27 Jun 2007)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index ff25a8950365..8a2af6f1f36e 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX evolution-2.10.2-fbsd.patch 1094 RMD160 d1e2ff1fe20f39ea7b2f812ae655f6782485de93 SHA1 74963e72dc0926bb714990432590ff0a1b1bfdba SHA256 226e248ce85db7f6eec28b31e8b69b2adf82e93a11672ee82e0599623247f092
+MD5 614305851a89fd1fa35c24adbf35838e files/evolution-2.10.2-fbsd.patch 1094
+RMD160 d1e2ff1fe20f39ea7b2f812ae655f6782485de93 files/evolution-2.10.2-fbsd.patch 1094
+SHA256 226e248ce85db7f6eec28b31e8b69b2adf82e93a11672ee82e0599623247f092 files/evolution-2.10.2-fbsd.patch 1094
 AUX evolution-2.3.7-configure_plugins.patch 3010 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 SHA1 8b996b3a578dcc593c752e240c01516d5ee5c2f9 SHA256 c7aa48137fff3e4f8d8fe0d466ff70e6feadb95ed07402273318d111b8ee3c70
 MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
 RMD160 9ae69aa76db215f6c9dcaf251ed03369131d86d8 files/evolution-2.3.7-configure_plugins.patch 3010
@@ -59,10 +66,10 @@ EBUILD evolution-2.10.1.ebuild 6669 RMD160 3649fbc0637d11e23ae126d256ffc98de0d6d
 MD5 15e25471874c6520e117937deb5a8236 evolution-2.10.1.ebuild 6669
 RMD160 3649fbc0637d11e23ae126d256ffc98de0d6d944 evolution-2.10.1.ebuild 6669
 SHA256 f6cc46d3f90f6d6b0228b5462e63a05a72309aca37c62d2176f49fa8f55f7d02 evolution-2.10.1.ebuild 6669
-EBUILD evolution-2.10.2.ebuild 6541 RMD160 01e28af68ee20886d80c585af2452f4479a0e687 SHA1 8b27df04242c0fec9cd16f743fa0dc1f9fa7da23 SHA256 7d137d3f29104e47beb7aba8c2dda6b32d1cda471f02e99cd2ce5e2907cfee9c
-MD5 7346f5d006f6f64f424768d1c156a43b evolution-2.10.2.ebuild 6541
-RMD160 01e28af68ee20886d80c585af2452f4479a0e687 evolution-2.10.2.ebuild 6541
-SHA256 7d137d3f29104e47beb7aba8c2dda6b32d1cda471f02e99cd2ce5e2907cfee9c evolution-2.10.2.ebuild 6541
+EBUILD evolution-2.10.2.ebuild 6627 RMD160 c7357a9bf706bd773864736fe3625dc476987922 SHA1 a26d4b52bff852d17fcebf973b7f325300b956a8 SHA256 54ce2a9347a3d1870f8ff9b708bf83375a9ef4bbedd12473ca9a0e33706f5724
+MD5 e16a6db8c47b63a1f71bf3b8ad9c115e evolution-2.10.2.ebuild 6627
+RMD160 c7357a9bf706bd773864736fe3625dc476987922 evolution-2.10.2.ebuild 6627
+SHA256 54ce2a9347a3d1870f8ff9b708bf83375a9ef4bbedd12473ca9a0e33706f5724 evolution-2.10.2.ebuild 6627
 EBUILD evolution-2.6.2-r1.ebuild 6093 RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 SHA1 325ef903fe2670a8ba51e7b00899a534d01fc868 SHA256 2b82e23e800e9856955cb39b1f3fd91caae4def71b7e58aa11c4388b44cec9a3
 MD5 7ec60cee6b484082d89e292811a06d2b evolution-2.6.2-r1.ebuild 6093
 RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 evolution-2.6.2-r1.ebuild 6093
@@ -71,10 +78,10 @@ EBUILD evolution-2.8.3-r2.ebuild 6864 RMD160 5cbc94fca510ee008884ba409b1ad8704f8
 MD5 d1302bd49fb30d84905a5608c3db314c evolution-2.8.3-r2.ebuild 6864
 RMD160 5cbc94fca510ee008884ba409b1ad8704f84c109 evolution-2.8.3-r2.ebuild 6864
 SHA256 e1d81ca2d7f6498433cb5b3294923802b42628e74c0093af2e210293f74720d6 evolution-2.8.3-r2.ebuild 6864
-MISC ChangeLog 43908 RMD160 e37c940615fd8e3a24a47f591eb20484ab105c8a SHA1 51bab9572a9f7970a1391751eb002b4ad55afa4b SHA256 9a5fc1f57113a529374a29f50ec77116e39dc8e097eb24d0c294b6165c12fd75
-MD5 e24b9440da315cc80e1e04a1d850647d ChangeLog 43908
-RMD160 e37c940615fd8e3a24a47f591eb20484ab105c8a ChangeLog 43908
-SHA256 9a5fc1f57113a529374a29f50ec77116e39dc8e097eb24d0c294b6165c12fd75 ChangeLog 43908
+MISC ChangeLog 44069 RMD160 7a25482df432be7195c29bb7dd8ff8c91be1a606 SHA1 b793dd347f4caec463d8d153d8ed8e6e249eaa5f SHA256 4581f6148b81d17d8136305b6b0b72a203428577387a282200efd11663c48678
+MD5 3314b48474614196a3e287cfbcfe20c0 ChangeLog 44069
+RMD160 7a25482df432be7195c29bb7dd8ff8c91be1a606 ChangeLog 44069
+SHA256 4581f6148b81d17d8136305b6b0b72a203428577387a282200efd11663c48678 ChangeLog 44069
 MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
 MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
@@ -91,3 +98,10 @@ SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/di
 MD5 4baf69f8a0985f0b493a39c1e5f2920e files/digest-evolution-2.8.3-r2 533
 RMD160 0aca45717cdcb1e57839b1826d465c3f96ebd8b5 files/digest-evolution-2.8.3-r2 533
 SHA256 4a580168c5f139e4e65dec026d9c27358a0caad314d78b403d51b38e6fb7a424 files/digest-evolution-2.8.3-r2 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGjZ7uomPajV0RnrERAsETAJ4qoY6JuB6Gq7DJ9ags/bjBOZccRgCfUPR3
+Efl31PSmOJcgikilyvdoIgE=
+=9RAk
+-----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.10.2.ebuild b/mail-client/evolution/evolution-2.10.2.ebuild
index 0770a36bc9d4..6690cc3f3952 100644
--- a/mail-client/evolution/evolution-2.10.2.ebuild
+++ b/mail-client/evolution/evolution-2.10.2.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/mail-client/evolution/evolution-2.10.2.ebuild,v 1.1 2007/06/27 07:36:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.2.ebuild,v 1.2 2007/07/06 01:46:06 dang Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.9"
@@ -170,6 +170,9 @@ src_unpack() {
 	# certificate filtering for clueless users (and even for those who know)
 	epatch ${FILESDIR}/${PN}-2.8.2.1-certificate-manager-filtering.patch
 
+	# Fix timezone offsets on fbsd.  bug #183708
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+
 	eautoreconf
 }
 
diff --git a/mail-client/evolution/files/evolution-2.10.2-fbsd.patch b/mail-client/evolution/files/evolution-2.10.2-fbsd.patch
new file mode 100644
index 000000000000..c7a35e57eb1b
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.10.2-fbsd.patch
@@ -0,0 +1,35 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-2.10.2.orig/widgets/e-timezone-dialog/e-timezone-dialog.c evolution-2.10.2/widgets/e-timezone-dialog/e-timezone-dialog.c
+--- evolution-2.10.2.orig/widgets/e-timezone-dialog/e-timezone-dialog.c	2007-04-09 09:10:21.000000000 -0400
++++ evolution-2.10.2/widgets/e-timezone-dialog/e-timezone-dialog.c	2007-07-05 21:24:05.000000000 -0400
+@@ -80,7 +80,9 @@ struct _ETimezoneDialogPrivate {
+ 
+ #ifndef G_OS_WIN32 /* Declared properly in time.h already */
+ extern char *tzname[2];
++#ifndef __BSD_VISIBLE
+ extern long timezone;
++#endif
+ extern int daylight;
+ #endif
+ 
+@@ -322,9 +324,20 @@ static const icaltimezone*
+ get_local_timezone()
+ {
+ 	icaltimezone *zone;
++	long offset;
++#ifdef __BSD_VISIBLE
++	time_t tt;
++	struct tm tm;
++#endif
+ 	
+ 	tzset();
+-	zone =  icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]);
++#ifdef __BSD_VISIBLE
++	localtime_r (&tt, &tm);
++	offset = tm.tm_gmtoff;
++#else
++	offset = -timezone;
++#endif
++	zone =  icaltimezone_get_builtin_timezone_from_offset (offset, tzname[0]);
+ 
+ 	return zone;
+ }