diff options
| -rw-r--r-- | manualPorts/alpine/.md5sum | 3 | ||||
| -rw-r--r-- | manualPorts/alpine/.signature | 7 | ||||
| -rw-r--r-- | manualPorts/alpine/Pkgfile | 4 | ||||
| -rw-r--r-- | manualPorts/alpine/backwards-search.patch | 93 |
4 files changed, 5 insertions, 102 deletions
diff --git a/manualPorts/alpine/.md5sum b/manualPorts/alpine/.md5sum index 16efca0..88518a1 100644 --- a/manualPorts/alpine/.md5sum +++ b/manualPorts/alpine/.md5sum @@ -1,3 +1,2 @@ -666c575efedbce9a0d10248a49cea003 74c603f.tar.gz -4d3befe19d6d66b3ea1024a70f4ab8bc backwards-search.patch +6f64d55db6603b62c8a79a4a78dfc5b8 78b20aa.tar.gz 09f73ce6a93a93e475253d3c90ba0315 topal-patch.patch diff --git a/manualPorts/alpine/.signature b/manualPorts/alpine/.signature index 7963a55..bab606b 100644 --- a/manualPorts/alpine/.signature +++ b/manualPorts/alpine/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGl7h5DphK8t13/LYM9ACZWOdiQ2rwgDp/UC0I9byJVnbL3H3bq56RDLRY600EC34TkRSkc5geMbsFzRiL9OYLwM= -SHA256 (Pkgfile) = c9b4cac4fa0006d440348ce164c44050c4a441b30f172505e62e9ba7e6596109 +RWQxCptPusLGGplIhgniU0BpG9cquIdqzgIfP92FXeIXWQ5U7qNTZjW/IfXhXDXdP1GscGGnH2/supWleCHnhsAN9UkOrn7XSwA= +SHA256 (Pkgfile) = 7890ea0cae941f7cfa022aa956a1fbef59ff7aab05565386ab156a5300d36282 SHA256 (.footprint) = dd67d2fc4470f569897d32b8ecd5d740c59592de8ead67668be423dd89456871 -SHA256 (74c603f.tar.gz) = a63e093d1f536ea8673e9c77089fe2ce857d0526ac7ca1fda9d0de3566206fb2 -SHA256 (backwards-search.patch) = 2de9c773a8d1754eead015c2e3952f8a803646b5859ad3440bfeece5afd7cfa9 +SHA256 (78b20aa.tar.gz) = 0005e19a0838b9e74d99d19ed836ec458d717d1412b55838e4f7caefea9c783d SHA256 (topal-patch.patch) = 8ee8e1dfa18e3089cc9d8db0ed06c49898c089ff8ba5703cce608102fb9b0b9b diff --git a/manualPorts/alpine/Pkgfile b/manualPorts/alpine/Pkgfile index c930893..6c88a84 100644 --- a/manualPorts/alpine/Pkgfile +++ b/manualPorts/alpine/Pkgfile @@ -4,17 +4,15 @@ # Depends on: libldap krb5 gettext procmail name=alpine -version=2.21.9999.r51.74c603f +version=2.21.9999.r55.78b20aa _commit=${version##*.} release=2 source=("http://repo.or.cz/alpine.git/snapshot/${_commit}.tar.gz" -backwards-search.patch topal-patch.patch) build() { cd "alpine-${_commit}" - patch -p1 -i "${SRC}/backwards-search.patch" patch -p1 -i "${SRC}/topal-patch.patch" ./configure \ diff --git a/manualPorts/alpine/backwards-search.patch b/manualPorts/alpine/backwards-search.patch deleted file mode 100644 index 8926609..0000000 --- a/manualPorts/alpine/backwards-search.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/alpine/mailindx.c b/alpine/mailindx.c -index 18583c3..f1dd874 100644 ---- a/alpine/mailindx.c -+++ b/alpine/mailindx.c -@@ -2954,19 +2954,21 @@ away. - void - index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S *msgmap) - { -- int rc, select_all = 0, flags, prefetch, we_turned_on = 0; -+ int rc, select_all = 0, flags, prefetch, searchbound, otherbound, offset = 0, we_turned_on = 0; - long i, sorted_msg, selected = 0L; - char prompt[MAX_SEARCH+50], new_string[MAX_SEARCH+1]; - char buf[MAX_SCREEN_COLS+1], *p; - HelpType help; - char search_string[MAX_SEARCH+1]; - ICE_S *ice, *ic; -+ static int direction = 1; - static HISTORY_S *history = NULL; - static ESCKEY_S header_search_key[] = { {0, 0, NULL, NULL }, - {ctrl('Y'), 10, "^Y", N_("First Msg")}, - {ctrl('V'), 11, "^V", N_("Last Msg")}, - {KEY_UP, 30, "", ""}, - {KEY_DOWN, 31, "", ""}, -+ {ctrl('W'), 32, "^W", N_("Direction")}, - {-1, 0, NULL, NULL} }; - #define KU_IS (3) /* index of KEY_UP */ - #define PREFETCH_THIS_MANY_LINES (50) -@@ -2995,7 +2997,8 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S * - new_string[0] = '\0'; - - while(1) { -- snprintf(prompt, sizeof(prompt), _("Word to search for [%s] : "), search_string); -+ snprintf(prompt, sizeof(prompt), _("Word to search %sfor [%s] : "), -+ direction == -1 ? _("(backwards) ") : "", search_string); - - if(F_ON(F_ENABLE_AGG_OPS, ps_global)){ - header_search_key[0].ch = ctrl('X'); -@@ -3092,6 +3095,10 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S * - - continue; - } -+ else if(rc == 32){ -+ direction *= -1; -+ continue; -+ } - - if(rc != 4){ /* 4 is redraw */ - save_hist(history, new_string, 0, NULL); -@@ -3115,9 +3122,18 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S * - we_turned_on = intr_handling_on(); - - prefetch = 0; -- for(i = sorted_msg + ((select_all)?0:1); -- i <= mn_get_total(msgmap) && !ps_global->intr_pending; -- i++){ -+ if (direction == -1) { -+ searchbound = -1; -+ otherbound = mn_get_total(msgmap); -+ offset = 2; -+ } else { -+ searchbound = mn_get_total(msgmap); -+ otherbound = 1; -+ } -+ -+ for(i = sorted_msg + ((select_all)?0:1) - offset; -+ i * direction <= searchbound && !ps_global->intr_pending; -+ i += direction){ - if(msgline_hidden(stream, msgmap, i, 0)) - continue; - -@@ -3139,8 +3155,11 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S * - } - - prefetch = 0; -- if(i > mn_get_total(msgmap)){ -- for(i = 1; i < sorted_msg && !ps_global->intr_pending; i++){ -+ if(i * direction > searchbound){ -+ for(i = otherbound; -+ i * direction < sorted_msg * direction && !ps_global->intr_pending; -+ i += direction ){ -+ - if(msgline_hidden(stream, msgmap, i, 0)) - continue; - -@@ -3194,7 +3213,7 @@ index_search(struct pine *state, MAILSTREAM *stream, int command_line, MSGNO_S * - } - else if(selected){ - q_status_message1(SM_ORDER, 0, 3, _("Word found%s"), -- (i < sorted_msg) ? _(". Search wrapped to beginning") : -+ (i * direction < sorted_msg * direction) ? _(". Search wrapped to beginning") : - (i == sorted_msg) ? _(". Current line contains only match") : ""); - mn_set_cur(msgmap, i); - } |