diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2006-04-26 19:59:29 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2006-04-26 19:59:29 +0000 |
| commit | 83963d37692455ebc9e37f56b8140182d6e7f85b (patch) | |
| tree | 6e8cd8e8f74e44412f82f629d3f31e48e0e9a44d | |
| parent | Pull old versions. (diff) | |
| download | gentoo-2-83963d37692455ebc9e37f56b8140182d6e7f85b.tar.gz gentoo-2-83963d37692455ebc9e37f56b8140182d6e7f85b.tar.bz2 gentoo-2-83963d37692455ebc9e37f56b8140182d6e7f85b.zip | |
Fix of smarttime patch that screwed up the { } time
(Portage version: 2.1_pre7-r5)
| -rw-r--r-- | mail-client/muttng/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/muttng/Manifest | 6 | ||||
| -rw-r--r-- | mail-client/muttng/files/muttng-20060309-smarttime.patch | 24 |
3 files changed, 21 insertions, 15 deletions
diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog index 7d604fb5c4d0..41b3bdb6531d 100644 --- a/mail-client/muttng/ChangeLog +++ b/mail-client/muttng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-client/muttng # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.17 2006/04/22 11:22:17 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.18 2006/04/26 19:59:29 grobian Exp $ + + 26 Apr 2006; Fabian Groffen <grobian@gentoo.org> + files/muttng-20060309-smarttime.patch: + Fix of smarttime patch that screwed up the { } time *muttng-20060415 (22 Apr 2006) diff --git a/mail-client/muttng/Manifest b/mail-client/muttng/Manifest index 485bc427112b..3823c39506a6 100644 --- a/mail-client/muttng/Manifest +++ b/mail-client/muttng/Manifest @@ -16,9 +16,9 @@ SHA256 5a0b5b7e6ba41d7c7aa3b7aaf27d7c89af4801ae4b7548c7564b7af1a333e474 files/mu MD5 773e2d1ebb9519fb4c8e84d99cd0c214 files/muttng-20060309-nodoc.patch 478 RMD160 4094dc10a297e4d65e4d13233f4c0640dc76db74 files/muttng-20060309-nodoc.patch 478 SHA256 0a76b63c30a893b82ab34b12f9d6f096479fdbd73d4449f62f1a8adb96c1940b files/muttng-20060309-nodoc.patch 478 -MD5 8a929ad66fdad47209a98f4335f7ae98 files/muttng-20060309-smarttime.patch 3709 -RMD160 5754effa0ee52e4260f32d80f8f830dc835e9c20 files/muttng-20060309-smarttime.patch 3709 -SHA256 97d7dc7611e178bd220f730de1b090b9a7654f0a835bccb780a9b71b80665b64 files/muttng-20060309-smarttime.patch 3709 +MD5 006cbd177e94c8fe6cf70bc896fbd905 files/muttng-20060309-smarttime.patch 3741 +RMD160 5ec2b9d3920f416aaa0e5e56aee3c835baf4e655 files/muttng-20060309-smarttime.patch 3741 +SHA256 f659c9794c41fca9a3c1d79b393f27c1910000777a8f3143e4d36802ed6dba8f files/muttng-20060309-smarttime.patch 3741 MD5 f9b88fa28c766dcc15f27ded3bf7f892 files/muttng-20060309-statusbar_length.patch 549 RMD160 4cf9bb0c64d1adda69ad836e46d6ea053e9f3bdd files/muttng-20060309-statusbar_length.patch 549 SHA256 f2c2e6651f14e0aa488d028673417b1531a4dcef0e5d66c37f3af6501c39b399 files/muttng-20060309-statusbar_length.patch 549 diff --git a/mail-client/muttng/files/muttng-20060309-smarttime.patch b/mail-client/muttng/files/muttng-20060309-smarttime.patch index c367c0b0c588..0927aac8a0f0 100644 --- a/mail-client/muttng/files/muttng-20060309-smarttime.patch +++ b/mail-client/muttng/files/muttng-20060309-smarttime.patch @@ -1,6 +1,6 @@ Index: hdrline.c =================================================================== ---- hdrline.c (revision 790) +--- hdrline.c (revision 802) +++ hdrline.c (working copy) @@ -302,11 +302,11 @@ case '(': @@ -17,7 +17,7 @@ Index: hdrline.c p = dest; -@@ -318,6 +318,29 @@ +@@ -318,6 +318,28 @@ else do_locales = 1; @@ -42,16 +42,16 @@ Index: hdrline.c + T += (hdr->zhours * 3600 + hdr->zminutes * 60); + tm = gmtime_r (&T, tm); + } -+ t = mktime (tm); + len = destlen - 1; while (len > 0 && (((op == 'd' || op == 'D') && *cp) || (op == '{' && *cp != '}') || -@@ -335,6 +358,40 @@ +@@ -335,6 +357,43 @@ } else break; /* not enough space left */ + } else if (*cp == 'Q' || *cp == 'q') { ++ t = mktime (tm); + T = time (NULL); + TM = localtime (&T); + @@ -74,13 +74,15 @@ Index: hdrline.c + sprintf (p, "%s", "%H:%M "); + p += 1; + len -= 1; -+ } else if (t >= T - 518400) { /* 6 days */ ++ } ++ else if (t >= T - 518400) { /* 6 days */ + sprintf (p, "%s", "%a-%d"); -+ } else if (((TM->tm_year - tm->tm_year) * 12 + TM->tm_mon) - -+ tm->tm_mon < 12) -+ { /* last 11 months */ ++ } ++ else if (((TM->tm_year - tm->tm_year) * 12 + TM->tm_mon) - ++ tm->tm_mon < 12) { /* last 11 months */ + sprintf (p, "%s", "%d-%b"); -+ } else { /* older than a year */ ++ } ++ else { /* older than a year */ + sprintf (p, "%s", "%b-%y"); + } + p += 5; @@ -88,7 +90,7 @@ Index: hdrline.c } else { if (len >= 2) { -@@ -354,27 +411,6 @@ +@@ -354,27 +413,6 @@ } *p = 0; @@ -116,7 +118,7 @@ Index: hdrline.c strftime (buf2, sizeof (buf2), dest, tm); if (do_locales) -@@ -751,3 +787,4 @@ +@@ -751,3 +789,4 @@ mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags); } |