| 1 |
commit: 9d1fe53d43487df8a3768b14d50daca3799c5a2f |
| 2 |
Author: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 27 01:35:49 2011 +0000 |
| 4 |
Commit: Donnie Berkholz <dberkholz <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 27 01:35:49 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dberkholz.git;a=commit;h=9d1fe53d |
| 7 |
|
| 8 |
mutt: move sidebar patches to FILESDIR to avoid custom patchball. |
| 9 |
|
| 10 |
--- |
| 11 |
mail-client/mutt/Manifest | 6 +- |
| 12 |
mail-client/mutt/files/sidebar-dotted.patch | 70 +++++++++++++++++++++++ |
| 13 |
mail-client/mutt/files/sidebar-sorted.patch | 81 +++++++++++++++++++++++++++ |
| 14 |
mail-client/mutt/mutt-1.5.21-r3.ebuild | 6 +- |
| 15 |
4 files changed, 158 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest |
| 18 |
index caeacbe..803aa75 100644 |
| 19 |
--- a/mail-client/mutt/Manifest |
| 20 |
+++ b/mail-client/mutt/Manifest |
| 21 |
@@ -5,8 +5,10 @@ AUX 1.5.21-write_postponed.patch 13650 RMD160 eaa96e52253d880aeabfc382f15150e0a7 |
| 22 |
AUX Muttrc 667 RMD160 0405e73c6a4122869ce9a9bd408068d316740b71 SHA1 e30c96e6f21a30fe576abcb3be65a34accf4e11f SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f |
| 23 |
AUX Muttrc.mbox 486 RMD160 0f692c9d3a7591f3a0611529616aa94a5c62a641 SHA1 9e231303fe9fb2fe80542115ceefb972c7b11d5a SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 |
| 24 |
AUX mutt-1.5.17-parallel-make.patch 936 RMD160 f6a216d9ff06ae55d9569e05632b60332cf49ebe SHA1 0a9b98b37987ffa10039424bb6f5849a08dbb168 SHA256 3ecc199b83f6fa747d342694d8ffacf0aedd4590e0d9943c9b6004c31cbdb931 |
| 25 |
+AUX sidebar-dotted.patch 2604 RMD160 8463797c67094ae122f828af632954dd94314229 SHA1 b01cf833f04e092240728e7308ca9917b6e3a99b SHA256 044d09cb132e740706bd3a3bb8dffebbd3361874972b5d712e0c49a95c3d4476 |
| 26 |
+AUX sidebar-sorted.patch 2304 RMD160 80e738234985f623a7d6d88249bb92ad677778e0 SHA1 54cb51ed660c01e7dced958b90ab1504157547b8 SHA256 0361cb04ff84f08d42fad22eb34a252253113b0d3b92d474b3498cebf360aa08 |
| 27 |
AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7 |
| 28 |
-DIST mutt-1.5.21-gentoo-patches-r3.tar.bz2 73247 RMD160 5e658dce6e2e93193808f88490f83672f629e6d3 SHA1 e2a27668c6327597f90d9abe4ea2869fb216b397 SHA256 d61dccc0eb5179036d1108a70601ff43367dbe70d162c3042c376acd2a87daf0 |
| 29 |
+DIST mutt-1.5.21-gentoo-patches-r2.tar.bz2 72256 RMD160 cd028c7d12e1885d8ea98ff60554a5fbf98e1922 SHA1 28ef259d8a964bbe46f72169ab597825819f244e SHA256 0ad8dcfbcb5b31321c7e96909d53a5d1e8e2f69241f9ddb0f36f69cf086ed615 |
| 30 |
DIST mutt-1.5.21.tar.gz 3716886 RMD160 b235a42972ae410592253cdc117a90baf279f47a SHA1 a8475f2618ce5d5d33bff85c0affdf21ab1d76b9 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 |
| 31 |
-EBUILD mutt-1.5.21-r3.ebuild 7896 RMD160 a064a94b727c0fa3dbbae34492712d181fe4d140 SHA1 fc35d77ca790b67e082f27641e7221ac8d606e9b SHA256 0e8eefea56abfc5a8a2dad42d43943b94165410fb9acb7652653680536d419d5 |
| 32 |
+EBUILD mutt-1.5.21-r3.ebuild 7896 RMD160 906910fdf98bb7981044007692a073f396fe59a3 SHA1 fc81b11bcfb56791d827dde54b451038baf269e3 SHA256 18aeeee854d77612b73739b437a1981ef89667e91e2ef10bafa2dd5a30b2767a |
| 33 |
MISC ChangeLog 48499 RMD160 6e416e0da020639c4254c26a23c0e653241c5d7f SHA1 ed9c0af2c86b929ae363695790ae21234d854559 SHA256 8e3dd35c0f68d7474ddd71dd1e7f8cada79df3f59df1363a8b48a5bf6d156139 |
| 34 |
|
| 35 |
diff --git a/mail-client/mutt/files/sidebar-dotted.patch b/mail-client/mutt/files/sidebar-dotted.patch |
| 36 |
new file mode 100644 |
| 37 |
index 0000000..95150b2 |
| 38 |
--- /dev/null |
| 39 |
+++ b/mail-client/mutt/files/sidebar-dotted.patch |
| 40 |
@@ -0,0 +1,70 @@ |
| 41 |
+From: Evgeni Golov <sargentd@××××××××.net> |
| 42 |
+License: 3-BSD |
| 43 |
+ |
| 44 |
+When using IMAP, a '.' is often used as a separator instead of '/'. |
| 45 |
+This patch enables mutt to find these dots and |
| 46 |
+1. correctly intend the dir in the sidebar |
| 47 |
+2. if "sidebar_shortpath" is set, shorten the dir to the part after |
| 48 |
+ the last dot |
| 49 |
+ |
| 50 |
+I hope, it's usefull for someone ;) |
| 51 |
+ |
| 52 |
+Index: mutt-1.5.18/sidebar.c |
| 53 |
+=================================================================== |
| 54 |
+--- mutt-1.5.18.orig/sidebar.c 2008-11-06 18:36:26.000000000 +0100 |
| 55 |
++++ mutt-1.5.18/sidebar.c 2008-11-06 18:37:18.000000000 +0100 |
| 56 |
+@@ -255,14 +255,23 @@ |
| 57 |
+ int i; |
| 58 |
+ tmp_folder_name = tmp->path + strlen(Maildir); |
| 59 |
+ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) { |
| 60 |
+- if (tmp_folder_name[i] == '/') sidebar_folder_depth++; |
| 61 |
++ if (tmp_folder_name[i] == '/' || tmp_folder_name[i] == '.') sidebar_folder_depth++; |
| 62 |
+ } |
| 63 |
+ if (sidebar_folder_depth > 0) { |
| 64 |
+- sidebar_folder_name = malloc(strlen(basename(tmp->path)) + sidebar_folder_depth + 1); |
| 65 |
++ if (option(OPTSIDEBARSHORTPATH)) { |
| 66 |
++ tmp_folder_name = strrchr(tmp->path, '.'); |
| 67 |
++ if (tmp_folder_name == NULL) |
| 68 |
++ tmp_folder_name = tmp->path; |
| 69 |
++ else |
| 70 |
++ tmp_folder_name++; |
| 71 |
++ } |
| 72 |
++ else |
| 73 |
++ tmp_folder_name = tmp->path; |
| 74 |
++ sidebar_folder_name = malloc(strlen(basename(tmp_folder_name)) + sidebar_folder_depth + 1); |
| 75 |
+ for (i=0; i < sidebar_folder_depth; i++) |
| 76 |
+ sidebar_folder_name[i]=' '; |
| 77 |
+ sidebar_folder_name[i]=0; |
| 78 |
+- strncat(sidebar_folder_name, basename(tmp->path), strlen(basename(tmp->path)) + sidebar_folder_depth); |
| 79 |
++ strncat(sidebar_folder_name, basename(tmp_folder_name), strlen(basename(tmp_folder_name)) + sidebar_folder_depth); |
| 80 |
+ } |
| 81 |
+ } |
| 82 |
+ printw( "%.*s", SidebarWidth - delim_len + 1, |
| 83 |
+Index: mutt-1.5.18/init.h |
| 84 |
+=================================================================== |
| 85 |
+--- mutt-1.5.18.orig/init.h 2008-11-06 18:37:26.000000000 +0100 |
| 86 |
++++ mutt-1.5.18/init.h 2008-11-06 18:37:47.000000000 +0100 |
| 87 |
+@@ -1548,6 +1548,11 @@ |
| 88 |
+ ** .pp |
| 89 |
+ ** The width of the sidebar. |
| 90 |
+ */ |
| 91 |
++ { "sidebar_shortpath", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 }, |
| 92 |
++ /* |
| 93 |
++ ** .pp |
| 94 |
++ ** Should the sidebar shorten the path showed. |
| 95 |
++ */ |
| 96 |
+ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, |
| 97 |
+ /* |
| 98 |
+ ** .pp |
| 99 |
+Index: mutt-1.5.18/mutt.h |
| 100 |
+=================================================================== |
| 101 |
+--- mutt-1.5.18.orig/mutt.h 2008-11-06 18:37:55.000000000 +0100 |
| 102 |
++++ mutt-1.5.18/mutt.h 2008-11-06 18:38:10.000000000 +0100 |
| 103 |
+@@ -438,6 +438,7 @@ |
| 104 |
+ OPTSAVENAME, |
| 105 |
+ OPTSCORE, |
| 106 |
+ OPTSIDEBAR, |
| 107 |
++ OPTSIDEBARSHORTPATH, |
| 108 |
+ OPTSIGDASHES, |
| 109 |
+ OPTSIGONTOP, |
| 110 |
+ OPTSORTRE, |
| 111 |
|
| 112 |
diff --git a/mail-client/mutt/files/sidebar-sorted.patch b/mail-client/mutt/files/sidebar-sorted.patch |
| 113 |
new file mode 100644 |
| 114 |
index 0000000..8a164dd |
| 115 |
--- /dev/null |
| 116 |
+++ b/mail-client/mutt/files/sidebar-sorted.patch |
| 117 |
@@ -0,0 +1,81 @@ |
| 118 |
+From: Evgeni Golov <sargentd@××××××××.net> |
| 119 |
+License: 3-BSD |
| 120 |
+ |
| 121 |
+When using IMAP and imap_check_subscribed, the server reports the |
| 122 |
+dirs in a random order. |
| 123 |
+This patch introduces a new option, sidebar_sort. Which, when it is |
| 124 |
+set, sorts the dirs in the sidebar alphabetically. |
| 125 |
+ |
| 126 |
+I hope, it's usefull for someone ;) |
| 127 |
+ |
| 128 |
+PS: This has to be applied ontop of my sidebar-dotted patch, but it |
| 129 |
+should be easy to adopt it to a vanilla mutt. |
| 130 |
+ |
| 131 |
+Index: mutt-1.5.18/sidebar.c |
| 132 |
+=================================================================== |
| 133 |
+--- mutt-1.5.18.orig/sidebar.c 2008-11-06 18:58:19.000000000 +0100 |
| 134 |
++++ mutt-1.5.18/sidebar.c 2008-11-06 18:59:16.000000000 +0100 |
| 135 |
+@@ -54,6 +54,35 @@ |
| 136 |
+ for ( ; tmp->next != 0; tmp = tmp->next ) |
| 137 |
+ tmp->next->prev = tmp; |
| 138 |
+ |
| 139 |
++ if (option(OPTSIDEBARSORT)) { |
| 140 |
++ int needsort=1; |
| 141 |
++ BUFFY *prev; |
| 142 |
++ BUFFY *next; |
| 143 |
++ BUFFY *tmp2; |
| 144 |
++ while (needsort==1) { |
| 145 |
++ needsort=0; |
| 146 |
++ tmp = Incoming; |
| 147 |
++ for ( ; tmp ; tmp=tmp->next ) { |
| 148 |
++ if (tmp->next != NULL && strcmp(tmp->path, tmp->next->path) > 0) { |
| 149 |
++ needsort=1; |
| 150 |
++ prev = tmp->prev; |
| 151 |
++ next = tmp->next; |
| 152 |
++ if (prev != NULL) |
| 153 |
++ prev->next = next; |
| 154 |
++ else |
| 155 |
++ Incoming = next; |
| 156 |
++ next->prev = prev; |
| 157 |
++ tmp2 = next->next; |
| 158 |
++ next->next = tmp; |
| 159 |
++ tmp->prev = next; |
| 160 |
++ tmp->next = tmp2; |
| 161 |
++ if (tmp2 != NULL) |
| 162 |
++ tmp2->prev = tmp; |
| 163 |
++ } |
| 164 |
++ } |
| 165 |
++ } |
| 166 |
++ } |
| 167 |
++ |
| 168 |
+ if ( TopBuffy == 0 && BottomBuffy == 0 ) |
| 169 |
+ TopBuffy = Incoming; |
| 170 |
+ if ( BottomBuffy == 0 ) { |
| 171 |
+Index: mutt-1.5.18/init.h |
| 172 |
+=================================================================== |
| 173 |
+--- mutt-1.5.18.orig/init.h 2008-11-06 18:58:19.000000000 +0100 |
| 174 |
++++ mutt-1.5.18/init.h 2008-11-06 18:58:19.000000000 +0100 |
| 175 |
+@@ -1553,6 +1553,11 @@ |
| 176 |
+ ** .pp |
| 177 |
+ ** Should the sidebar shorten the path showed. |
| 178 |
+ */ |
| 179 |
++ { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 }, |
| 180 |
++ /* |
| 181 |
++ ** .pp |
| 182 |
++ ** Should the sidebar be sorted. |
| 183 |
++ */ |
| 184 |
+ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0}, |
| 185 |
+ /* |
| 186 |
+ ** .pp |
| 187 |
+Index: mutt-1.5.18/mutt.h |
| 188 |
+=================================================================== |
| 189 |
+--- mutt-1.5.18.orig/mutt.h 2008-11-06 18:58:19.000000000 +0100 |
| 190 |
++++ mutt-1.5.18/mutt.h 2008-11-06 18:58:19.000000000 +0100 |
| 191 |
+@@ -439,6 +439,7 @@ |
| 192 |
+ OPTSCORE, |
| 193 |
+ OPTSIDEBAR, |
| 194 |
+ OPTSIDEBARSHORTPATH, |
| 195 |
++ OPTSIDEBARSORT, |
| 196 |
+ OPTSIGDASHES, |
| 197 |
+ OPTSIGONTOP, |
| 198 |
+ OPTSORTRE, |
| 199 |
|
| 200 |
diff --git a/mail-client/mutt/mutt-1.5.21-r3.ebuild b/mail-client/mutt/mutt-1.5.21-r3.ebuild |
| 201 |
index 868d299..169d9a4 100644 |
| 202 |
--- a/mail-client/mutt/mutt-1.5.21-r3.ebuild |
| 203 |
+++ b/mail-client/mutt/mutt-1.5.21-r3.ebuild |
| 204 |
@@ -6,7 +6,7 @@ EAPI="3" |
| 205 |
|
| 206 |
inherit eutils flag-o-matic autotools |
| 207 |
|
| 208 |
-PATCHSET_REV="-r3" |
| 209 |
+PATCHSET_REV="-r2" |
| 210 |
|
| 211 |
DESCRIPTION="A small but very powerful text-based mail client" |
| 212 |
HOMEPAGE="http://www.mutt.org" |
| 213 |
@@ -103,10 +103,10 @@ src_prepare() { |
| 214 |
epatch "${PATCHDIR}"/sidebar.patch |
| 215 |
# From http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523774 |
| 216 |
# sidebar-dotted handles Courier IMAP folders correctly |
| 217 |
- epatch "${PATCHDIR}"/sidebar-dotted.patch |
| 218 |
+ epatch "${FILESDIR}"/sidebar-dotted.patch |
| 219 |
# sidebar-sorted will sort IMAP folders instead of randomly |
| 220 |
# displaying them |
| 221 |
- epatch "${PATCHDIR}"/sidebar-sorted.patch |
| 222 |
+ epatch "${FILESDIR}"/sidebar-sorted.patch |
| 223 |
fi |
| 224 |
|
| 225 |
# patch version string for bug reports |
Archives