svn commit: r533322 - in head/mail/neomutt: . files
Baptiste Daroussin
bapt at FreeBSD.org
Wed Apr 29 07:12:16 UTC 2020
Author: bapt
Date: Wed Apr 29 07:12:15 2020
New Revision: 533322
URL: https://svnweb.freebsd.org/changeset/ports/533322
Log:
Update to 20200424
Add an upstream patch to fix a regression in the display of the sidebar
Added:
head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch (contents, props changed)
Modified:
head/mail/neomutt/Makefile
head/mail/neomutt/distinfo
Modified: head/mail/neomutt/Makefile
==============================================================================
--- head/mail/neomutt/Makefile Wed Apr 29 07:07:56 2020 (r533321)
+++ head/mail/neomutt/Makefile Wed Apr 29 07:12:15 2020 (r533322)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= neomutt
-PORTVERSION= 20200417
+PORTVERSION= 20200424
CATEGORIES= mail
MAINTAINER= bapt at FreeBSD.org
@@ -24,7 +24,7 @@ HAS_CONFIGURE= yes
OPTIONS_SUB= yes
SHEBANG_FILES= contrib/smime_keys
-EXTRA_PATCHES= ${FILESDIR}/indent-sidebar.patch:-p1
+EXTRA_PATCHES= ${FILESDIR}/0001-fix-sidebar-use-abbreviated-path-if-possible.patch:-p1
OPTIONS_DEFINE= NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES GSSAPI_BASE
Modified: head/mail/neomutt/distinfo
==============================================================================
--- head/mail/neomutt/distinfo Wed Apr 29 07:07:56 2020 (r533321)
+++ head/mail/neomutt/distinfo Wed Apr 29 07:12:15 2020 (r533322)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587368728
-SHA256 (neomutt-neomutt-20200417_GH0.tar.gz) = 6ed358053ae17694b580f3b5b13eec9f00f5a7320e76fae6fba767607c40cc48
-SIZE (neomutt-neomutt-20200417_GH0.tar.gz) = 3322435
+TIMESTAMP = 1588144159
+SHA256 (neomutt-neomutt-20200424_GH0.tar.gz) = e708d04f057a788041acaced765861bcfbab50f287f8e83620447ec8eb5145df
+SIZE (neomutt-neomutt-20200424_GH0.tar.gz) = 3323821
Added: head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/neomutt/files/0001-fix-sidebar-use-abbreviated-path-if-possible.patch Wed Apr 29 07:12:15 2020 (r533322)
@@ -0,0 +1,41 @@
+From 96af299e8c8aff16f4c5e400f79d6edc3792eef5 Mon Sep 17 00:00:00 2001
+From: Austin Ray <austin at 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
+
More information about the svn-ports-all
mailing list