Bugfixes from the '0.8.x' stable branch:

Fix crash when colors are disabled
(upstream git commit a22cd2c68c71481c653d9f6547f2e7b46ce57106)

config: change default value of show_duplicate_tags from 'true' to 'yes'
(upstream git commit 4f72330bb8d04aa14fa380f969013675882b7c1b)
This commit is contained in:
dcoppa 2017-08-11 09:02:51 +00:00
parent 2cb0e31307
commit 2ce1bb55d5
3 changed files with 44 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2017/07/26 22:45:15 sthen Exp $
# $OpenBSD: Makefile,v 1.62 2017/08/11 09:02:51 dcoppa Exp $
BROKEN-alpha = error: looser throw specifier for 'virtual OutOfBounds::~OutOfBounds()'
BROKEN-hppa = bindings.h:85:4: error: type 'Binding' is not a direct base of 'Binding'
@ -6,7 +6,7 @@ BROKEN-hppa = bindings.h:85:4: error: type 'Binding' is not a direct base of 'B
COMMENT = ncurses mpd client inspired by ncmpc
DISTNAME = ncmpcpp-0.8
REVISION = 0
REVISION = 1
EXTRACT_SUFX = .tar.bz2

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-doc_config,v 1.1 2017/08/11 09:02:51 dcoppa Exp $
commit 4f72330bb8d04aa14fa380f969013675882b7c1b
Author: Andrzej Rybczak <andrzej@rybczak.net>
Date: Sat Jun 24 16:06:50 2017 +0200
config: change default value of show_duplicate_tags from 'true' to 'yes'
Index: doc/config
--- doc/config.orig
+++ doc/config
@@ -301,7 +301,7 @@
#
#discard_colors_if_item_is_selected = yes
#
-#show_duplicate_tags = true
+#show_duplicate_tags = yes
#
#incremental_seeking = yes
#

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_curses_window_cpp,v 1.1 2017/08/11 09:02:51 dcoppa Exp $
commit a22cd2c68c71481c653d9f6547f2e7b46ce57106
Author: Hugh Wang <hghwng@gmail.com>
Date: Thu Jun 8 00:26:02 2017 +0800
Fix crash when colors are disabled
Index: src/curses/window.cpp
--- src/curses/window.cpp.orig
+++ src/curses/window.cpp
@@ -214,6 +214,10 @@ Color Color::End(0, 0, false, true);
int Color::pairNumber() const
{
+ // If colors are disabled, return default pair value.
+ if (color_pair_map.empty())
+ return 0;
+
int result = 0;
if (isEnd())
throw std::logic_error("'end' doesn't have a corresponding pair number");