Update to ncmpcpp-0.7

This commit is contained in:
dcoppa 2015-12-10 11:26:27 +00:00
parent a519b1b8b1
commit cc375a94c3
5 changed files with 31 additions and 43 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.39 2015/11/12 15:36:06 dcoppa Exp $
# $OpenBSD: Makefile,v 1.40 2015/12/10 11:26:27 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'
COMMENT = ncurses mpd client inspired by ncmpc
DISTNAME = ncmpcpp-0.6.8
DISTNAME = ncmpcpp-0.7
EXTRACT_SUFX = .tar.bz2
@ -47,7 +47,12 @@ CONFIGURE_ARGS = --enable-clock \
--with-taglib \
--without-fftw
CONFIGURE_ENV = CPPFLAGS="-pthread"
CONFIGURE_ENV = BOOST_LIB_SUFFIX="-mt" \
CPPFLAGS="-DBOOST_RESULT_OF_USE_DECLTYPE \
-D_XOPEN_SOURCE_EXTENDED \
-pthread" \
ICU_CFLAGS="icu-is-not-really-needed" \
ICU_LIBS="icu-is-not-really-needed"
NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (ncmpcpp-0.6.8.tar.bz2) = 7oHz/bKktnC14mF/ZInxVOaaVS5o/FULHiCthfUm5pI=
SIZE (ncmpcpp-0.6.8.tar.bz2) = 431213
SHA256 (ncmpcpp-0.7.tar.bz2) = UJJP8FAsm5DOG2eWOHaRIt79A7yF64qVkkxiyNMD/3c=
SIZE (ncmpcpp-0.7.tar.bz2) = 442319

View File

@ -1,22 +1,31 @@
$OpenBSD: patch-doc_ncmpcpp_1,v 1.5 2015/07/06 06:04:57 dcoppa Exp $
--- doc/ncmpcpp.1.orig Sat May 2 21:16:11 2015
+++ doc/ncmpcpp.1 Fri Jun 19 16:33:11 2015
$OpenBSD: patch-doc_ncmpcpp_1,v 1.6 2015/12/10 11:26:27 dcoppa Exp $
--- doc/ncmpcpp.1.orig Sun Nov 22 18:30:58 2015
+++ doc/ncmpcpp.1 Thu Dec 10 09:40:35 2015
@@ -1,4 +1,4 @@
-.TH "ncmpcpp" "1"
+.TH "NCMPCPP" "1"
.SH "NAME"
ncmpcpp \- An ncurses Music Player Daemon (MPD) client.
.SH "SYNOPSIS"
@@ -26,7 +26,6 @@ Display help.
@@ -38,7 +38,6 @@ Display help.
.TP
.B \-v, \-\-version
Display version information.
-.TP
.SH "CONFIGURATION"
When ncmpcpp starts, it tries to read user's settings from the ~/.ncmpcpp/config file. If no user's configuration is found, ncmpcpp uses its default configuration. An example configuration file containing all default values is provided with ncmpcpp and can be usually found in /usr/share/doc/ncmpcpp (exact location may depend on used distribution or configure prefix).
When ncmpcpp starts, it tries to read user's settings from $HOME/.ncmpcpp/config and $XDG_CONFIG_HOME/ncmpcpp/config files. If no configuration is found, ncmpcpp uses its default configuration. An example configuration file containing all default values is provided with ncmpcpp and can be usually found in /usr/share/doc/ncmpcpp (exact location may depend on used distribution or configure prefix).
@@ -371,7 +370,6 @@ Color of visualization.
Border color of pop-up windows. If set to 'none', no border will be shown.
@@ -268,7 +267,7 @@ Slave screen that has to be displayed at start (nothin
.TP
.B startup_slave_screen_focus = yes/no
If set to yes, slave screen will be the active one after startup. Otherwise master screen will be.
-.TP
+.TP
.B locked_screen_width_part = 20-80
If you want to lock a screen, ncmpcpp asks for % of locked screen's width to be reserved before that and provides a default value, which is the one you can set here.
.TP
@@ -382,7 +381,6 @@ Border color of pop-up windows. If set to 'none', no b
.TP
.B active_window_border = COLOR
Color of active window's border.
-.TP

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_ncmpcpp_cpp,v 1.8 2015/05/06 08:43:04 dcoppa Exp $
$OpenBSD: patch-src_ncmpcpp_cpp,v 1.9 2015/12/10 11:26:27 dcoppa Exp $
OpenBSD lacks sigignore()
--- src/ncmpcpp.cpp.orig Sat May 2 21:16:11 2015
+++ src/ncmpcpp.cpp Wed May 6 10:33:16 2015
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
--- src/ncmpcpp.cpp.orig Sun Nov 22 18:30:58 2015
+++ src/ncmpcpp.cpp Thu Dec 10 09:38:14 2015
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
signal(SIGPIPE, sighandler);
signal(SIGWINCH, sighandler);
// ignore Ctrl-C
@ -12,4 +12,4 @@ OpenBSD lacks sigignore()
+ signal(SIGINT, SIG_IGN);
# endif // !WIN32
NC::initScreen("ncmpcpp ver. " VERSION, Config.colors_enabled);
NC::initScreen(Config.colors_enabled, Config.mouse_support);

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_playlist_cpp,v 1.1 2014/11/07 09:02:29 dcoppa Exp $
commit bf33a45935eca553f85d047b7a986ccbe769adc5
Author: Andrzej Rybczak <electricityispower@gmail.com>
Date: Thu Nov 6 20:30:42 2014 +0100
playlist: initialize timer
--- src/playlist.cpp.orig Thu Nov 6 19:21:21 2014
+++ src/playlist.cpp Fri Nov 7 09:44:10 2014
@@ -20,6 +20,7 @@
#include <algorithm>
#include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
#include <sstream>
#include "display.h"
@@ -49,6 +50,7 @@ bool playlistEntryMatcher(const boost::regex &rx, cons
Playlist::Playlist()
: m_total_length(0), m_remaining_time(0), m_scroll_begin(0)
+, m_timer(boost::posix_time::from_time_t(0))
, m_reload_total_length(false), m_reload_remaining(false)
{
w = NC::Menu<MPD::Song>(0, MainStartY, COLS, MainHeight, Config.playlist_display_mode == DisplayMode::Columns && Config.titles_visibility ? Display::Columns(COLS) : "", Config.main_color, NC::Border::None);