From owner-svn-ports-branches@freebsd.org Mon Oct 12 10:30:20 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 299EF433394; Mon, 12 Oct 2020 10:30:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C8w180HXnz40l8; Mon, 12 Oct 2020 10:30:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1560AD51; Mon, 12 Oct 2020 10:30:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09CAUJjt059598; Mon, 12 Oct 2020 10:30:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09CAUJSb059596; Mon, 12 Oct 2020 10:30:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202010121030.09CAUJSb059596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 12 Oct 2020 10:30:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r552117 - in branches/2020Q4/mail/neomutt: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in branches/2020Q4/mail/neomutt: . files X-SVN-Commit-Revision: 552117 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2020 10:30:20 -0000 Author: bapt Date: Mon Oct 12 10:30:19 2020 New Revision: 552117 URL: https://svnweb.freebsd.org/changeset/ports/552117 Log: MFH: r552116 incorporate a side fix from upstream PR: 250097 Submitted by: Michael Bueker Added: branches/2020Q4/mail/neomutt/files/patch-sidebar_functions.c - copied unchanged from r552116, head/mail/neomutt/files/patch-sidebar_functions.c Modified: branches/2020Q4/mail/neomutt/Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/mail/neomutt/Makefile ============================================================================== --- branches/2020Q4/mail/neomutt/Makefile Mon Oct 12 10:28:46 2020 (r552116) +++ branches/2020Q4/mail/neomutt/Makefile Mon Oct 12 10:30:19 2020 (r552117) @@ -2,6 +2,7 @@ PORTNAME= neomutt PORTVERSION= 20200925 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= bapt@FreeBSD.org Copied: branches/2020Q4/mail/neomutt/files/patch-sidebar_functions.c (from r552116, head/mail/neomutt/files/patch-sidebar_functions.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q4/mail/neomutt/files/patch-sidebar_functions.c Mon Oct 12 10:30:19 2020 (r552117, copy of r552116, head/mail/neomutt/files/patch-sidebar_functions.c) @@ -0,0 +1,20 @@ +--- sidebar/functions.c.orig 2020-10-04 15:20:02 UTC ++++ sidebar/functions.c +@@ -72,7 +72,7 @@ static struct SbEntry **next_new(struct + struct SbEntry **sbep = NULL; + ARRAY_FOREACH_FROM_TO(sbep, &wdata->entries, begin, end) + { +- if ((*sbep)->mailbox->has_new && (*sbep)->mailbox->msg_unread != 0) ++ if ((*sbep)->mailbox->has_new || (*sbep)->mailbox->msg_unread != 0) + return sbep; + } + return NULL; +@@ -143,7 +143,7 @@ static struct SbEntry **prev_new(struct + struct SbEntry **sbep = NULL, **prev = NULL; + ARRAY_FOREACH_FROM_TO(sbep, &wdata->entries, begin, end) + { +- if ((*sbep)->mailbox->has_new && (*sbep)->mailbox->msg_unread != 0) ++ if ((*sbep)->mailbox->has_new || (*sbep)->mailbox->msg_unread != 0) + prev = sbep; + } +