Bump for patch to fix subject not properly being truncated when there are tree arrows on the same line

Package-Manager: portage-2.2.00.15153-prefix/cvs/Darwin powerpc

4 files changed, 43 insertions, 4 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index c303f087d3ed..97d174ca7d6c 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.171 2009/12/17 11:38:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.172 2009/12/29 10:36:59 grobian Exp $
+
+*mutt-1.5.20-r10 (29 Dec 2009)
+
+  29 Dec 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.20-r9.ebuild,
+  +mutt-1.5.20-r10.ebuild,
+  +files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch:
+  Bump for patch to fix subject not properly being truncated when there are
+  tree arrows on the same line
 
   17 Dec 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r6,
   mutt-1.5.20-r9.ebuild:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 28296bdd7495..7b2a071945c9 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -30,6 +30,7 @@ AUX mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch 634 RMD160 c7eb6d6977b8b
 AUX mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch 2211 RMD160 730cd88c1cfaf83d9eeeb1f2ed7d58b2eb43b85f SHA1 e6ce5e3b0ea1a9885a53ba93fc43ce8a17654287 SHA256 838f9734ba360936f99e06b25eb14425870ea788d97769ee2a0c57bd98e42468
 AUX mutt-1.5.20-ssl-CVE-2009-3765-dc09812e63a3.patch 860 RMD160 c7a4a69194fd735a992c470bae0b1e21f5346fc0 SHA1 a151b6424f261a1988f72f9f9df00d17f44b7726 SHA256 c16df7b212806867ae134837dafdc7aff9e36084a493238adfd8f80b3935d370
 AUX mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch 549 RMD160 4a12ab918d4fe97a80061ef2bbbd2ab6c41ec093 SHA1 43d1a28aae183e94d522c546a686f61a4e006046 SHA256 077a9a9ce029545d2a4f0dde308f8c341a82cbe68e39150fc5ab0492d42ae8b8
+AUX mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch 801 RMD160 3ac604ea054f471c3d00c2816aeedda1ba550b81 SHA1 d33dab2db973a70215607d3c074ecfd6ae4fcf32 SHA256 31e5348c352a4307e3ae3159ecac1ba6cadce6d55d46e833d34dc2329511a724
 AUX mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch 1131 RMD160 5286dc8809747291e31e1c1a3801ad5efbdc285b SHA1 fe3cc48c0592b5f7775db8f46a5fccfff4a68895 SHA256 8cec9af4bc073faacfec09331fc928ddb9c0b98be11da5c5022fc1af2bdece5f
 AUX mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch 14089 RMD160 e26623f79a4ecf5d7a84cd94159e01ad8bfb8b42 SHA1 2f3811d9f85ac2764c33cd1aa4f852dc1b56d017 SHA256 830bb141fbfe42226f12af508d6f4d7fa2904213386695967c488a8a89f8b8ab
 AUX mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch 455 RMD160 63b73ed21d42d0849f38ef1098029c64933c47a5 SHA1 9da6a6914d3ae276887efd1a30ed3ea55bc57bcb SHA256 7d44b98e8f7538ce85ddb80877a0caabd1edcfd5e558258896d50691c51a3d0e
@@ -37,8 +38,8 @@ DIST mutt-1.5.20-gentoo-patches-r3.tar.bz2 59753 RMD160 9660c73602e97364ae5a732e
 DIST mutt-1.5.20-gentoo-patches-r4.tar.bz2 59836 RMD160 b323f50c65aba7ec2e29fd5c372428e55c38a00c SHA1 6a986efa6eb682a9b4f8da1ecbab1fad4a0e5c85 SHA256 1407cb4b2dd572dae4b628490741540521e1f2570c993a075677baf4e23e9512
 DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb SHA1 d2bec7a33771f128ca49b1723b06b6d248a35d31 SHA256 9579fc079d74ff5c89223ff09df402ef4e508ba8ca925c49e74aa09c02a9a796
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
+EBUILD mutt-1.5.20-r10.ebuild 9560 RMD160 36ac702b08bc11ea6e9fdf32d519bb1153e6b7e8 SHA1 6b56ab55b4b440d0fe230a9fcc1da94f18c1fe5c SHA256 363947b291e784051e13372e4142ce6fba952c8bba223e92114acb8e8f283e21
 EBUILD mutt-1.5.20-r4.ebuild 8442 RMD160 b8e5a90fa48cb236f31e69dddb63ba7078f2dd5d SHA1 88f66d53c60f431173ac86c7c1ca5888879e9e7c SHA256 ddfda6ec2a6649f05b36e492b5237feaf64546c758e1c8bfd0a600af8b25ee80
 EBUILD mutt-1.5.20-r6.ebuild 8728 RMD160 eaa1fe9cca6954c0d4dbfb92596b42741c2c6198 SHA1 5563d95b4f885f47bd3f9d1c29493f754bbfadc3 SHA256 795bff0f6a9ed1a9725702d2a281600804188d4b02c2d3e2a82702e4a4946df5
-EBUILD mutt-1.5.20-r9.ebuild 9484 RMD160 2991b11267790cb8efd150f2ee975871ff2b2425 SHA1 830717c9fddeb76cc75261b876fa274359f02e3d SHA256 02cd7e5db8576be229ac12b281be8da418ce0fba3cf1e9d949909bc102be4551
-MISC ChangeLog 37820 RMD160 5732ccb4064136d02bd57b08b618c49494821ccb SHA1 67153032066ae233a9e0b6e8fbce11e150b9d8c0 SHA256 13d23a6e095b0aec092b676ea4b6d746ee708009aa4a845c989a3c0279cd6ff3
+MISC ChangeLog 38125 RMD160 5cebd0c8ae2f6f2e71305401e8cac063fa587ac1 SHA1 ae8c7ce13ab3ee9f23a86d34182042370f1391cc SHA256 ef1bb89c0a64f369b4f54687608e416dfe9944ead75d78ed04dbf755fe25c704
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
diff --git a/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch b/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
new file mode 100644
index 000000000000..f6f46e40e58b
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
@@ -0,0 +1,29 @@
+http://dev.mutt.org/trac/ticket/3364
+http://dev.mutt.org/trac/changeset/31881f38ca1e
+
+Hack mutt_wstr_trunc to treat M_TREE characters as 1 cell.
+Closes #3364.
+
+Index: curs_lib.c
+===================================================================
+--- curs_lib.c	(revision 6010:c837ab790d2e)
++++ curs_lib.c	(revision 6035:31881f38ca1e)
+@@ -884,5 +884,5 @@
+   wchar_t wc;
+   int w = 0, l = 0, cl;
+-  size_t cw, n;
++  int cw, n;
+   mbstate_t mbstate;
+ 
+@@ -898,5 +898,11 @@
+       cw = cl = 1;
+     else
++    {
+       cw = wcwidth (wc);
++      /* hack because M_TREE symbols aren't turned into characters
++       * until rendered by print_enriched_string (#3364) */
++      if (cw < 0 && cl == 1 && src[0] && src[0] < M_TREE_MAX)
++	cw = 1;
++    }
+     if (cl + l > maxlen || cw + w > maxwid)
+       break;
diff --git a/mail-client/mutt/mutt-1.5.20-r9.ebuild b/mail-client/mutt/mutt-1.5.20-r10.ebuild
index e53b2c5fe0d2..54de991a49de 100644
--- a/mail-client/mutt/mutt-1.5.20-r9.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r9.ebuild,v 1.2 2009/12/17 11:38:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r10.ebuild,v 1.1 2009/12/29 10:36:59 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -104,6 +104,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/mutt-1.5.20-ssl-stack-compile-fix-1cf34ea1f128.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-no-hcolor-in-hcache-b7d2cb7c7ce1.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-off-by-one-mailcap-736b6af3c5f1.patch
+	epatch "${FILESDIR}"/mutt-1.5.20-subject-mistruncation-31881f38ca1e.patch
 
 	# patch version string for bug reports
 	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \