13 files changed, 109 insertions, 29 deletions
diff --git a/audio/ncmpcpp/files/patch-src_bindings.cpp b/audio/ncmpcpp/files/patch-src_bindings.cpp
deleted file mode 100644
index 2110552cd32f..000000000000
--- a/audio/ncmpcpp/files/patch-src_bindings.cpp
+++ /dev/null
@@ -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<int>{ k.getChar() };
-+			auto queue = std::vector<int>{ (int)k.getChar() };
- 			if (k != Key::noOp)
- 				result = new Actions::PushCharacters(&Global::wFooter, std::move(queue));
- 			else
diff --git a/audio/ncmpcpp/files/patch-src_browser.cpp b/audio/ncmpcpp/files/patch-src_browser.cpp
new file mode 100644
index 000000000000..ca8ca3b38d74
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_browser.cpp
@@ -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;
diff --git a/audio/ncmpcpp/files/patch-src_configuration.cpp b/audio/ncmpcpp/files/patch-src_configuration.cpp
new file mode 100644
index 000000000000..f519c206a591
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_configuration.cpp
@@ -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;
+ 
diff --git a/audio/ncmpcpp/files/patch-src_helpers.cpp b/audio/ncmpcpp/files/patch-src_helpers.cpp
new file mode 100644
index 000000000000..cc2045b8f1bb
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_helpers.cpp
@@ -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)
+ {
diff --git a/audio/ncmpcpp/files/patch-src_media__library.cpp b/audio/ncmpcpp/files/patch-src_media__library.cpp
new file mode 100644
index 000000000000..cbf51fa88d60
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_media__library.cpp
@@ -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;
diff --git a/audio/ncmpcpp/files/patch-src_mpdpp.cpp b/audio/ncmpcpp/files/patch-src_mpdpp.cpp
index 41043282691c..db5a6c03c5be 100644
--- a/audio/ncmpcpp/files/patch-src_mpdpp.cpp
+++ b/audio/ncmpcpp/files/patch-src_mpdpp.cpp
@@ -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
  	{
diff --git a/audio/ncmpcpp/files/patch-src_mpdpp.h b/audio/ncmpcpp/files/patch-src_mpdpp.h
index 31c1f17e81b8..38eb97278d1c 100644
--- a/audio/ncmpcpp/files/patch-src_mpdpp.h
+++ b/audio/ncmpcpp/files/patch-src_mpdpp.h
@@ -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 <set>
  #include <vector>
  
-@@ -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;
  };
  
diff --git a/audio/ncmpcpp/files/patch-src_playlist.cpp b/audio/ncmpcpp/files/patch-src_playlist.cpp
new file mode 100644
index 000000000000..6e4ddac347d9
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_playlist.cpp
@@ -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;
diff --git a/audio/ncmpcpp/files/patch-src_playlist__editor.cpp b/audio/ncmpcpp/files/patch-src_playlist__editor.cpp
new file mode 100644
index 000000000000..b71d69658a8b
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_playlist__editor.cpp
@@ -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;
diff --git a/audio/ncmpcpp/files/patch-src_search__engine.cpp b/audio/ncmpcpp/files/patch-src_search__engine.cpp
new file mode 100644
index 000000000000..68dff6bbce42
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_search__engine.cpp
@@ -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;
diff --git a/audio/ncmpcpp/files/patch-src__status.cpp b/audio/ncmpcpp/files/patch-src_status.cpp
index a7fafc7595f9..72edb2b0666c 100644
--- a/audio/ncmpcpp/files/patch-src__status.cpp
+++ b/audio/ncmpcpp/files/patch-src_status.cpp
@@ -1,4 +1,4 @@
---- src/status.cpp.orig	2015-07-05 02:18:34 UTC
+--- src/status.cpp.orig	2015-11-04 20:01:29 UTC
 +++ src/status.cpp
 @@ -21,6 +21,8 @@
  #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/audio/ncmpcpp/files/patch-src_tag__editor.cpp b/audio/ncmpcpp/files/patch-src_tag__editor.cpp
new file mode 100644
index 000000000000..f50899f6c8e8
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_tag__editor.cpp
@@ -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;
diff --git a/audio/ncmpcpp/files/patch-src_window.h b/audio/ncmpcpp/files/patch-src_window.h
new file mode 100644
index 000000000000..0ab80f40698f
--- /dev/null
+++ b/audio/ncmpcpp/files/patch-src_window.h
@@ -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 <boost/optional.hpp>