diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-05-04 07:31:27 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2020-05-04 07:31:27 +0000 |
| commit | ec6c369b614498993c1214c719d9b33ecbac6f9d (patch) | |
| tree | 9d6745d11cb1b302591046174ec75f7052088ed8 /mail/neomutt | |
| parent | acf17604b32ece0f81462668b5409f63340c2639 (diff) | |
| download | freebsd-ports-ec6c369b614498993c1214c719d9b33ecbac6f9d.zip | |
Update to 20200501
Diffstat (limited to 'mail/neomutt')
| -rw-r--r-- | mail/neomutt/Makefile | 2 | ||||
| -rw-r--r-- | mail/neomutt/distinfo | 6 | ||||
| -rw-r--r-- | mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch | 41 |
3 files changed, 4 insertions, 45 deletions
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile index 506e714b5298..f484b0bca9c5 100644 --- a/mail/neomutt/Makefile +++ b/mail/neomutt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= neomutt -PORTVERSION= 20200424 +PORTVERSION= 20200501 CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo index 0b28e01813cb..a0f7efb2cfa5 100644 --- a/mail/neomutt/distinfo +++ b/mail/neomutt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1588144159 -SHA256 (neomutt-neomutt-20200424_GH0.tar.gz) = e708d04f057a788041acaced765861bcfbab50f287f8e83620447ec8eb5145df -SIZE (neomutt-neomutt-20200424_GH0.tar.gz) = 3323821 +TIMESTAMP = 1588577251 +SHA256 (neomutt-neomutt-20200501_GH0.tar.gz) = 9d0a0da14448ebb60f2585532fc4cd903c10146903c8639cd0a3d51fe620430f +SIZE (neomutt-neomutt-20200501_GH0.tar.gz) = 3324180 diff --git a/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch b/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch deleted file mode 100644 index 6e665b590aba..000000000000 --- a/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 96af299e8c8aff16f4c5e400f79d6edc3792eef5 Mon Sep 17 00:00:00 2001 -From: Austin Ray <austin@austinray.io> -Date: Tue, 28 Apr 2020 21:00:57 -0400 -Subject: [PATCH] fix(sidebar): use abbreviated path if possible - -After the refactor in commit d77c704ceb85f34061e1333ab9c8eb5a264a0685, -the sidebar only displays a mailbox's full path/URI except in the case -of 'sidebar_short_path'. The full path/URI is not preferable for end -users. - -What broke during the refactor is how the variable 'display' is updated. -It's initialized to a mailbox's full path/URI and only updated if using -'sidebar_short_path'. However, after initialization, an abbreviation is -calculated to remove the 'folder' or protocol. - -To resolve this issue, if there's an abbreviation, store it in the -'display' variable. - -Fixes #2293 ---- - sidebar.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sidebar.c b/sidebar.c -index 810146e66..bc680000d 100644 ---- a/sidebar.c -+++ b/sidebar.c -@@ -1101,6 +1101,10 @@ static void draw_sidebar(struct MuttWindow *win, int num_rows, int num_cols, int - if (!abbr) - abbr = abbrev_url(display, m->type); - -+ // Use the abbreviation if we have one. The full path is not preferable. -+ if (abbr) -+ display = abbr; -+ - const char *last_part = abbr; - int depth = calc_path_depth(abbr, C_SidebarDelimChars, &last_part); - --- -2.26.2 - |