From 5b996b4e10277bac0cf620b471e0cc0032987e36 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 10 Aug 2011 07:27:18 +0000 Subject: [PATCH] Fixed dates when printing mails Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- www-client/seamonkey/ChangeLog | 7 +- www-client/seamonkey/Manifest | 33 ++--- ...onkey-2.2-fix-dates-in-mail-printing.patch | 120 ++++++++++++++++++ www-client/seamonkey/seamonkey-2.2-r2.ebuild | 7 +- 4 files changed, 149 insertions(+), 18 deletions(-) create mode 100644 www-client/seamonkey/files/seamonkey-2.2-fix-dates-in-mail-printing.patch diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 4dc2a1c2f97f..1932c5368e68 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.323 2011/08/03 06:55:39 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.324 2011/08/10 07:27:18 polynomial-c Exp $ + + 10 Aug 2011; Lars Wendler seamonkey-2.2-r2.ebuild, + +files/seamonkey-2.2-fix-dates-in-mail-printing.patch: + Fixed dates when printing mails (mozilla bug #669385). Thanks to Martin + Mokrejs for reporting this via mail. *seamonkey-2.2-r2 (03 Aug 2011) diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 9cf7d5dedcbb..65394a174805 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -9,6 +9,7 @@ AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 AUX seamonkey-2.0.14-curl7217-includes-fix.patch 746 RMD160 fcf9b5cbf409d6f04eb276c956824bc770abfb79 SHA1 87f829c5176b9da2a3ae564cca465072dd8aaa13 SHA256 0b48bc32b97242edc11379a3ea1c7df0e576464b72ec493d547a81dfb1ba9612 AUX seamonkey-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff 744 RMD160 7c9bab23159e956813fa2e2a59dac5dbc16dbe60 SHA1 d29a9ded0cad3df137539642e6a6031c361c47ac SHA256 a8b217e3bf7902caab447f849712459f92e19c8889bc66c977019c603ddb99d4 AUX seamonkey-2.2-curl7217-includes-fix.patch 1066 RMD160 e5581348a5dfdd1e1c07487442ff7cc06566973d SHA1 dad9bdc18fc2ba93f1925818b74bcf7e3df0d4cb SHA256 2a46c70973f93f4c2c3a2292804ed11b8daa404ee515a1e1f7a863899a37bd11 +AUX seamonkey-2.2-fix-dates-in-mail-printing.patch 4902 RMD160 558f496344974ae83e9d020cf1244191937b3ff0 SHA1 e92b9f83684ca5f7575ae9ff1d8abaa3f752bbd3 SHA256 5c82ca92a5eeb15bd929186fdc78d1a1d32254bd1f31b426e1f3fd6e3f26b712 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a DIST enigmail-1.2.1.tar.gz 1463012 RMD160 b712e964e71c3b4dd14018b33ee1d985ba4fef8b SHA1 44ea48d881a936dd72d1f974b56f31632c5ed91a SHA256 b13eec1418240aefb64e27f4f02b3026edd1782524ea524c9af233086c7c7f45 DIST enigmail-1.2.tar.gz 1326482 RMD160 868c73aa28566895d4b6c6b9cbf4602d75df0a73 SHA1 05fb80a99544f95bfa2531e6cd5cac8cf1e78780 SHA256 e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4 @@ -86,23 +87,23 @@ DIST seamonkey-2.2-tr.xpi 805151 RMD160 5accabd955766af2f6a95ec6a162fe7e9fc50790 DIST seamonkey-2.2.source.tar.bz2 87478968 RMD160 cfad0460357c357df7a5936c0bd10374c18eac04 SHA1 bb2181fbbb4aa16e51899b483acadb31f7e0cbbc SHA256 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a EBUILD seamonkey-2.0.14-r1.ebuild 10068 RMD160 f7d5bccfa3ffcb086286b63f14e5b6efdee3bb0b SHA1 d0697dc74fca26e9df5522d5d39b248b68085d07 SHA256 2f159db8ee3d4f266818f59dda7e4843e5434e636ecda0193b1ff289142acf9b EBUILD seamonkey-2.1.ebuild 8708 RMD160 5c852317c6d494f974eb97d8c3ec910f41a55406 SHA1 b3b3997fa6b8db0dabe7335d608d66f9f1eeb568 SHA256 105ec7c7bfa381068766cbc14431d7bb5e170b9c2546e6a1445d68c130df41c7 -EBUILD seamonkey-2.2-r2.ebuild 9275 RMD160 93379a106db477063e19a310c97477d51df0e155 SHA1 f2d8717e351eb9e9a0aaf4fa22ffd35be978ddb2 SHA256 502b394a5aef77c958c982ad06037e209abe6d3c6240e5547ba1a6b7c9e10750 -MISC ChangeLog 42839 RMD160 3c19e2487cb710f6f22440a4f5a80a87f7a85c52 SHA1 4f5632629f1e51909f53325570747a2bf108fe92 SHA256 5b3b3e8812824c202a554e3c3b485c0c5f40d991965202ec00063016e6c18ef9 +EBUILD seamonkey-2.2-r2.ebuild 9436 RMD160 c7f6c44714ade49dd5ee11f5c9ae6386ceec4c2d SHA1 95ea8c61a8a4a8d19320446ed71c6087ad6049ba SHA256 7c8f622fce1dbcf14ae660f9cf483aff1d7ca532b45ed602ce27c589a76bf489 +MISC ChangeLog 43089 RMD160 ee71884c2a3ceac6ce95a374a946da57cd9a441f SHA1 10855446ae64a7a5fcb68b1914f39101a0e98227 SHA256 7c14bdfc290dd304d4443e4e2b3bbdcbb4fefa07b0d9b1a73ca21c7a9b45e099 MISC metadata.xml 1201 RMD160 db4a19472bbc6e9586bdebc804c1845e4a9cf062 SHA1 cdd2acd56566f2014682735db36922d7660afd12 SHA256 a8ad3bb4d1d4643e9ad5f280b46016801d7da73e5d319870e3d91ef780825208 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBCgAGBQJOOPDxAAoJEPiazRVxLXTFUZoQAI5+qqTRG0i32ZPU8fEiZUuC -eQfXM1K4w+cDLW+5pcqBUyjpENfN/4CODJPHO6d+FJ1wOm4CabROfYhUtqxSfafJ -m1W2w4LOKl3VsByqSPJu496pRqF1Zv4EN5gdgTD/t9AlzuTs6Y8boGCrIbj1WpzM -TpbNSgxDAkl2hibQPJpLca8meQfBMWedPbPt28Hz9c4clilRsHz4WWStcfXbifJD -9QmYyC8tyKnW5xDMVt0x58EiPwGifJf2HaxxLY2+Y+cOhRJU8UaGbkrecx5C+4v0 -JArGFiM12t6Dht044L6jmzc8gdfzZRzH1oQOSd1aO3l+lCQiNnK+GqUGTElE/iON -i2I1DMu2PmDGrP4DW4Ae0ptB4xT+QtPtL4Vu13uetSaZx4AZw9Jz/41lyones/uo -u72osyoQXzKvd9uRDwbJCL+ZMYZnwIy0YcZ1SKedJwasbIL4wVAADSe46ZfEsiTD -pZOgrdLkFz9IIhFY+pcS03JNirdHbN4d+UT7kaoipgHjekmQLBNLGRo89tyvSMn0 -kVTSEH2Dd8YuuTt+fpyr9wrb3Mn3sRKo+E4dFyBo0SNbEo3ajs+jVU69ly1qsuj8 -NJASZa48ACLeF24OdJRawa4VXmbM/zhBn/PxL42ImGGSBzzQqMoBrdNsNDjtcJ4j -yP//gzBPAMaAkRs4Ed1E -=dyyp +iQIcBAEBCgAGBQJOQjLcAAoJEPiazRVxLXTFZg0QAKBrxzW87AkIxan3cF8U7nuW +3N8IGv0koA2S6zE3ELT9bydNDE4BQ+IyieYw/VonBU2AnGQB6dSp9UvOnff94Vy6 +MHgJvnil5JTMFsg4i3v1kTNjXV42l5BND6orVAOPfQKLXjx2ma2urJ4UKDwSbrZ4 +CdezABt+Iy3XJuH0IZww19tGj+tZilYdbwQrVYK7QOcQOt3xVCQz4OHJwRKBhUjW +hYcjf7orIi/DlFOLeRBymKwfqMvGcmlp7s+UDkxxA8t9rv/lHh3V8P2geBnDM1Jo +cZDKt9gEPYqXOcGtlxmJPI2ib/PEccTapmXuml0MsTBjQNUaDQ+yA2N8pH261dIL +jujlY1IxgN6PbUecE7Nv3V7cNjq7oaKKG2cre8DSDFKAZ/6kvY+iLqGUZJyS9kLe +NzMvVV5RTQyVZjiueph9BCrtvB0/uoUM7Lnf5jlbqNjZZ6CdXxauSn9TlOAiO+Y7 +65+MISVN7WUteGujg6xV4ogsUrFY4MmBNw9H+gsQ40WiNutJG4mTaDCY4LwXs4Fw +HEYXyTqWERVmvJjVJnvbxYSzNXVYk8ty48OypoHGO4KmyuM5qM5EbS9166xZ85g3 +hme8jt4jUIja9pXG+Hh1aEsdxQZlJt6h2d0aSJI0pDXi/kmixcNq7TWiAYmk5MdL +EZoCY3b03c0rDgoJNGX8 +=fjwA -----END PGP SIGNATURE----- diff --git a/www-client/seamonkey/files/seamonkey-2.2-fix-dates-in-mail-printing.patch b/www-client/seamonkey/files/seamonkey-2.2-fix-dates-in-mail-printing.patch new file mode 100644 index 000000000000..61dbbd07ab3c --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.2-fix-dates-in-mail-printing.patch @@ -0,0 +1,120 @@ + +# HG changeset patch +# User Jim Porter +# Date 1312470116 -3600 +# Node ID 65095963557ab64b5de9e462e1daa7a2fd09a43a +# Parent 5ba3c4ec69922759882709ad4d05ac51813bf52a +Bug 669385 - Wrong date format in print preview (and on paper) of today's messages; r=Standard8 + +diff --git a/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp b/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp +--- a/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp ++++ b/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp +@@ -694,17 +694,19 @@ nsMimeBaseEmitter::AddAllHeaders(const n + } + + //////////////////////////////////////////////////////////////////////////////// + // The following code is responsible for formatting headers in a manner that is + // identical to the normal XUL output. + //////////////////////////////////////////////////////////////////////////////// + + nsresult +-nsMimeBaseEmitter::GenerateDateString(const char * dateString, nsACString &formattedDate) ++nsMimeBaseEmitter::GenerateDateString(const char * dateString, ++ nsACString &formattedDate, ++ PRBool showDateForToday) + { + nsresult rv = NS_OK; + + if (!mDateFormatter) { + mDateFormatter = do_CreateInstance(NS_DATETIMEFORMAT_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + } + +@@ -745,21 +747,21 @@ nsMimeBaseEmitter::GenerateDateString(co + if (displaySenderTimezone) + explodedCompTime = explodedMsgTime; + else + PR_ExplodeTime(PR_ImplodeTime(&explodedMsgTime), PR_LocalTimeParameters, &explodedCompTime); + + PRExplodedTime explodedCurrentTime; + PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &explodedCurrentTime); + +- // if the message is from today, don't show the date, only the time. (i.e. 3:15 pm) +- // if the message is from the last week, show the day of the week. (i.e. Mon 3:15 pm) +- // in all other cases, show the full date (03/19/01 3:15 pm) ++ // If we want short dates, check if the message is from today, and if so ++ // only show the time (e.g. 3:15 pm). + nsDateFormatSelector dateFormat = kDateFormatShort; +- if (explodedCurrentTime.tm_year == explodedCompTime.tm_year && ++ if (!showDateForToday && ++ explodedCurrentTime.tm_year == explodedCompTime.tm_year && + explodedCurrentTime.tm_month == explodedCompTime.tm_month && + explodedCurrentTime.tm_mday == explodedCompTime.tm_mday) + { + // same day... + dateFormat = kDateFormatNone; + } + + nsAutoString formattedDateString; +@@ -804,17 +806,17 @@ nsMimeBaseEmitter::GetLocalizedDateStrin + + if (prefBranch) + prefBranch->GetBoolPref("mailnews.display.original_date", + &displayOriginalDate); + + if (!displayOriginalDate) + { + nsCAutoString convertedDateString; +- nsresult rv = GenerateDateString(dateString, convertedDateString); ++ nsresult rv = GenerateDateString(dateString, convertedDateString, true); + if (NS_SUCCEEDED(rv)) + i18nValue = strdup(convertedDateString.get()); + else + i18nValue = strdup(dateString); + } + else + i18nValue = strdup(dateString); + +diff --git a/mailnews/mime/emitters/src/nsMimeBaseEmitter.h b/mailnews/mime/emitters/src/nsMimeBaseEmitter.h +--- a/mailnews/mime/emitters/src/nsMimeBaseEmitter.h ++++ b/mailnews/mime/emitters/src/nsMimeBaseEmitter.h +@@ -168,14 +168,15 @@ protected: + + // For the format being used... + PRInt32 mFormat; + + // For I18N Conversion... + nsCOMPtr mUnicodeConverter; + nsString mCharset; + nsCOMPtr mDateFormatter; +- nsresult GenerateDateString(const char * dateString, nsACString& formattedDate); ++ nsresult GenerateDateString(const char * dateString, nsACString& formattedDate, ++ PRBool showDateForToday); + // The caller is expected to free the result of GetLocalizedDateString + char* GetLocalizedDateString(const char * dateString); + }; + + #endif /* _nsMimeBaseEmitter_h_ */ +diff --git a/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp b/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp +--- a/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp ++++ b/mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp +@@ -243,17 +243,17 @@ nsresult nsMimeHtmlDisplayEmitter::Broad + (!extraExpandedHeadersArray.Length() || (ToLowerCase(headerStr), + extraExpandedHeadersArray.IndexOf(headerStr) == + extraExpandedHeadersArray.NoIndex))) + continue; + } + + if (!PL_strcasecmp("Date", headerInfo->name)) + { +- GenerateDateString(headerValue, convertedDateString); ++ GenerateDateString(headerValue, convertedDateString, false); + headerValueEnumerator->Append(convertedDateString); + } + else // append the header value as is + headerValueEnumerator->Append(headerValue); + + headerNameEnumerator->Append(headerInfo->name); + } + + diff --git a/www-client/seamonkey/seamonkey-2.2-r2.ebuild b/www-client/seamonkey/seamonkey-2.2-r2.ebuild index 644e1a78421e..b247e5a7ff97 100644 --- a/www-client/seamonkey/seamonkey-2.2-r2.ebuild +++ b/www-client/seamonkey/seamonkey-2.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2-r2.ebuild,v 1.1 2011/08/03 06:55:39 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.2-r2.ebuild,v 1.2 2011/08/10 07:27:18 polynomial-c Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -156,6 +156,11 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.1b3-restore-tabbar-scrolling-from-2.1b2.diff \ "${FILESDIR}"/${PN}-2.2-curl7217-includes-fix.patch + # mailnews patches go here + pushd "${S}"/mailnews &>/dev/null || die + epatch "${FILESDIR}"/${PN}-2.2-fix-dates-in-mail-printing.patch + popd &>/dev/null || die + # Allow user to apply any additional patches without modifing ebuild epatch_user -- 2.26.2