Index: Makefile =================================================================== --- Makefile (Revision 401344) +++ Makefile (Arbeitskopie) @@ -1,9 +1,10 @@ # $FreeBSD$ PORTNAME= ncmpcpp -PORTVERSION= 0.6.7 +PORTVERSION= 0.7.0b1 CATEGORIES= audio MASTER_SITES= http://ncmpcpp.rybczak.net/stable/ +DISTNAME= ncmpcpp-0.7_beta1 MAINTAINER= yamagi@yamagi.org COMMENT= ncurses mpd client, clone of ncmpc with some new features @@ -15,7 +16,9 @@ libfftw3.so:${PORTSDIR}/math/fftw3 \ libboost_filesystem.so:${PORTSDIR}/devel/boost-libs -USES= compiler:c++11-lib iconv libtool ncurses pkgconfig tar:bzip2 +WRKSRC= ${WRKDIR}/ncmpcpp-0.7_beta1 + +USES= compiler:c++11-lib iconv libtool ncurses:port pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 CPPFLAGS+= -I${LOCALBASE}/include @@ -51,11 +54,6 @@ .include -.if ${NCURSESBASE} == /usr -# no need to use ncurses-config if we use ncurses from the base system -CONFIGURE_ARGS+= NCURSES_CONFIG=/usr/bin/true -.endif - post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/ post-install-DOCS-on: Index: distinfo =================================================================== --- distinfo (Revision 401344) +++ distinfo (Arbeitskopie) @@ -1,2 +1,2 @@ -SHA256 (ncmpcpp-0.6.7.tar.bz2) = 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b -SIZE (ncmpcpp-0.6.7.tar.bz2) = 429687 +SHA256 (ncmpcpp-0.7_beta1.tar.bz2) = 5d84fca070e19461524bdfcf46245e9ee4d445f1966984b7c48c71115e408065 +SIZE (ncmpcpp-0.7_beta1.tar.bz2) = 440532 Index: files/patch-src__status.cpp =================================================================== --- files/patch-src__status.cpp (Revision 401344) +++ files/patch-src__status.cpp (Arbeitskopie) @@ -1,11 +0,0 @@ ---- src/status.cpp.orig 2015-07-05 02:18:34 UTC -+++ src/status.cpp -@@ -21,6 +21,8 @@ - #include - #include - #include -+#include -+#include - - #include "browser.h" - #include "charset.h" Index: files/patch-src_bindings.cpp =================================================================== --- files/patch-src_bindings.cpp (Revision 401344) +++ files/patch-src_bindings.cpp (Arbeitskopie) @@ -1,11 +0,0 @@ ---- src/bindings.cpp.orig 2015-07-05 02:18:34 UTC -+++ src/bindings.cpp -@@ -108,7 +108,7 @@ Actions::BaseAction *parseActionLine(con - // push single character into input queue - std::string arg = getEnclosedString(line, '"', '"', 0); - Key k = stringToSpecialKey(arg); -- auto queue = std::vector{ k.getChar() }; -+ auto queue = std::vector{ (int)k.getChar() }; - if (k != Key::noOp) - result = new Actions::PushCharacters(&Global::wFooter, std::move(queue)); - else Index: files/patch-src_browser.cpp =================================================================== --- files/patch-src_browser.cpp (Revision 0) +++ files/patch-src_browser.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/browser.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/browser.cpp +@@ -42,6 +42,7 @@ + #include "utility/comparators.h" + #include "utility/string.h" + #include "configuration.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Eigenschaftsänderungen: files/patch-src_browser.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_configuration.cpp =================================================================== --- files/patch-src_configuration.cpp (Revision 0) +++ files/patch-src_configuration.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/configuration.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/configuration.cpp +@@ -29,6 +29,7 @@ + #include "mpdpp.h" + #include "settings.h" + #include "utility/string.h" ++#include "format_impl.h" + + namespace po = boost::program_options; + Eigenschaftsänderungen: files/patch-src_configuration.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_helpers.cpp =================================================================== --- files/patch-src_helpers.cpp (Revision 0) +++ files/patch-src_helpers.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/helpers.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/helpers.cpp +@@ -26,6 +26,7 @@ + #include "playlist.h" + #include "statusbar.h" + #include "utility/functional.h" ++#include "format_impl.h" + + const MPD::Song *currentSong(const BaseScreen *screen) + { Eigenschaftsänderungen: files/patch-src_helpers.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_media__library.cpp =================================================================== --- files/patch-src_media__library.cpp (Revision 0) +++ files/patch-src_media__library.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/media_library.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/media_library.cpp +@@ -40,6 +40,7 @@ + #include "utility/type_conversions.h" + #include "title.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Eigenschaftsänderungen: files/patch-src_media__library.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_mpdpp.cpp =================================================================== --- files/patch-src_mpdpp.cpp (Revision 401344) +++ files/patch-src_mpdpp.cpp (Arbeitskopie) @@ -1,6 +1,6 @@ ---- src/mpdpp.cpp.orig 2015-07-05 02:18:34 UTC +--- src/mpdpp.cpp.orig 2015-11-09 12:52:27 UTC +++ src/mpdpp.cpp -@@ -38,6 +38,8 @@ Connection::Connection() : m_connection( +@@ -95,6 +95,8 @@ Connection::Connection() : m_connection( m_port(6600), m_timeout(15) { @@ -8,17 +8,17 @@ + m_gen.seed(rd()); } - Connection::~Connection() -@@ -504,7 +506,7 @@ bool Connection::AddRandomTag(mpd_tag_ty - } - else + void Connection::Connect() +@@ -560,7 +562,7 @@ bool Connection::AddRandomTag(mpd_tag_ty + if (number > tags.size()) + return false; + +- std::random_shuffle(tags.begin(), tags.end()); ++ std::shuffle(tags.begin(), tags.end(), m_gen); + auto it = tags.begin(); + for (size_t i = 0; i < number && it != tags.end(); ++i) { -- std::random_shuffle(tags.begin(), tags.end()); -+ std::shuffle(tags.begin(), tags.end(), m_gen); - auto it = tags.begin(); - for (size_t i = 0; i < number && it != tags.end(); ++i) - { -@@ -544,7 +546,7 @@ bool Connection::AddRandomSongs(size_t n +@@ -599,7 +601,7 @@ bool Connection::AddRandomSongs(size_t n } else { Index: files/patch-src_mpdpp.h =================================================================== --- files/patch-src_mpdpp.h (Revision 401344) +++ files/patch-src_mpdpp.h (Arbeitskopie) @@ -1,4 +1,4 @@ ---- src/mpdpp.h.orig 2015-07-05 02:18:34 UTC +--- src/mpdpp.h.orig 2015-11-09 12:51:44 UTC +++ src/mpdpp.h @@ -23,6 +23,7 @@ @@ -8,11 +8,10 @@ #include #include -@@ -277,6 +278,8 @@ private: +@@ -587,6 +588,7 @@ private: + int m_port; + int m_timeout; std::string m_password; - - mpd_tag_type m_searched_field; -+ + std::mt19937 m_gen; }; Index: files/patch-src_playlist.cpp =================================================================== --- files/patch-src_playlist.cpp (Revision 0) +++ files/patch-src_playlist.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/playlist.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/playlist.cpp +@@ -35,6 +35,7 @@ + #include "utility/comparators.h" + #include "utility/functional.h" + #include "title.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Eigenschaftsänderungen: files/patch-src_playlist.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_playlist__editor.cpp =================================================================== --- files/patch-src_playlist__editor.cpp (Revision 0) +++ files/patch-src_playlist__editor.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/playlist_editor.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/playlist_editor.cpp +@@ -39,6 +39,7 @@ + #include "utility/comparators.h" + #include "title.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Eigenschaftsänderungen: files/patch-src_playlist__editor.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_search__engine.cpp =================================================================== --- files/patch-src_search__engine.cpp (Revision 0) +++ files/patch-src_search__engine.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/search_engine.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/search_engine.cpp +@@ -35,6 +35,7 @@ + #include "utility/comparators.h" + #include "title.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::MainHeight; + using Global::MainStartY; Eigenschaftsänderungen: files/patch-src_search__engine.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_status.cpp =================================================================== --- files/patch-src_status.cpp (Revision 0) +++ files/patch-src_status.cpp (Arbeitskopie) @@ -0,0 +1,11 @@ +--- src/status.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/status.cpp +@@ -21,6 +21,8 @@ + #include + #include + #include ++#include ++#include + + #include "browser.h" + #include "charset.h" Eigenschaftsänderungen: files/patch-src_status.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_tag__editor.cpp =================================================================== --- files/patch-src_tag__editor.cpp (Revision 0) +++ files/patch-src_tag__editor.cpp (Arbeitskopie) @@ -0,0 +1,10 @@ +--- src/tag_editor.cpp.orig 2015-11-04 20:01:29 UTC ++++ src/tag_editor.cpp +@@ -42,6 +42,7 @@ + #include "title.h" + #include "tags.h" + #include "screen_switcher.h" ++#include "format_impl.h" + + using Global::myScreen; + using Global::MainHeight; Eigenschaftsänderungen: files/patch-src_tag__editor.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-src_window.h =================================================================== --- files/patch-src_window.h (Revision 0) +++ files/patch-src_window.h (Arbeitskopie) @@ -0,0 +1,12 @@ +--- src/window.h.orig 2015-11-04 20:01:29 UTC ++++ src/window.h +@@ -23,7 +23,9 @@ + + #include "config.h" + ++#define _XOPEN_SOURCE_EXTENDED + #include "curses.h" ++ + #include "gcc.h" + + #include Eigenschaftsänderungen: files/patch-src_window.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-message =================================================================== --- pkg-message (Revision 401344) +++ pkg-message (Arbeitskopie) @@ -1,15 +0,0 @@ -########################################################################### -ncmpcpp has been installed. - -Attention: -ncmcpp no longer uses ~/.ncmpcpp/keys for configuration. It has been replaced -by the incompatible ~/.ncmpcpp/bindings. - --------------------------------------------------------------------------- - -A default config has been installed to: -PREFIX/share/doc/ncmpcpp/config - -For more information about ncmpcpp visit: -http://unkart.ovh.org/ncmpcpp -###########################################################################