Attachment #176774 for bug #214314

Lines 1-8 Link Here

(-)Makefile (-3 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ncmpcpp	3	PORTNAME= ncmpcpp
4	PORTVERSION= 0.7.5	4	PORTVERSION= 0.7.7
5	PORTREVISION= 1
6	CATEGORIES= audio	5	CATEGORIES= audio
7	MASTER_SITES= http://ncmpcpp.rybczak.net/stable/	6	MASTER_SITES= http://ncmpcpp.rybczak.net/stable/
8		7
Lines 18-24 Link Here
18	libicuuc.so:devel/icu \	17	libicuuc.so:devel/icu \
19	libboost_filesystem.so:devel/boost-libs	18	libboost_filesystem.so:devel/boost-libs
20		19
21	USES= compiler:c++11-lib iconv libtool localbase ncurses:port pkgconfig tar:bzip2	20	USES= compiler:c++11-lib iconv libtool localbase ncurses pkgconfig tar:bzip2
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	USE_GNOME= glib20	22	USE_GNOME= glib20
24	LDFLAGS+= -lpthread	23	LDFLAGS+= -lpthread

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1471591908	1	TIMESTAMP = 1478602699
2	SHA256 (ncmpcpp-0.7.5.tar.bz2) = 7e4f643020b36698462879013a8b16111f8c3a4c5819cf186aed78032a41e07d	2	SHA256 (ncmpcpp-0.7.7.tar.bz2) = b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef
3	SIZE (ncmpcpp-0.7.5.tar.bz2) = 443072	3	SIZE (ncmpcpp-0.7.7.tar.bz2) = 443801

Lines 1-4 Link Here

(-)files/patch-src_browser.cpp (-1 / +1 lines)
1	--- src/browser.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/browser.cpp.orig 2016-11-08 11:02:02 UTC
2	+++ src/browser.cpp	2	+++ src/browser.cpp
3	@@ -42,6 +42,7 @@	3	@@ -42,6 +42,7 @@
4	#include "utility/comparators.h"	4	#include "utility/comparators.h"

Lines 1-4 Link Here

(-)files/patch-src_configuration.cpp (-1 / +1 lines)
1	--- src/configuration.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/configuration.cpp.orig 2016-11-08 11:03:23 UTC
2	+++ src/configuration.cpp	2	+++ src/configuration.cpp
3	@@ -29,6 +29,7 @@	3	@@ -29,6 +29,7 @@
4	#include "mpdpp.h"	4	#include "mpdpp.h"

Lines 1-4 Link Here

(-)files/patch-src_helpers.cpp (-1 / +1 lines)
1	--- src/helpers.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/helpers.cpp.orig 2016-11-08 11:05:01 UTC
2	+++ src/helpers.cpp	2	+++ src/helpers.cpp
3	@@ -26,6 +26,7 @@	3	@@ -26,6 +26,7 @@
4	#include "playlist.h"	4	#include "playlist.h"

Lines 1-4 Link Here

(-)files/patch-src_media__library.cpp (-1 / +1 lines)
1	--- src/media_library.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/media_library.cpp.orig 2016-11-08 11:06:09 UTC
2	+++ src/media_library.cpp	2	+++ src/media_library.cpp
3	@@ -40,6 +40,7 @@	3	@@ -40,6 +40,7 @@
4	#include "utility/type_conversions.h"	4	#include "utility/type_conversions.h"




--- src/mpdpp.cpp.orig	2016-04-17 05:41:01 UTC
+++ src/mpdpp.cpp
@@ -105,6 +105,8 @@ Connection::Connection() : m_connection(
 				m_port(6600),
 				m_timeout(15)
 {
+	std::random_device rd;
+	m_gen.seed(rd());
 }
 
 void Connection::Connect()
@@ -570,7 +572,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)
 	{
@@ -609,7 +611,7 @@ bool Connection::AddRandomSongs(size_t n
 	}
 	else
 	{
-		std::random_shuffle(files.begin(), files.end());
+		std::shuffle(files.begin(), files.end(), m_gen);
 		StartCommandsList();
 		auto it = files.begin();
 		for (size_t i = 0; i < number && it != files.end(); ++i, ++it)




--- src/mpdpp.h.orig	2016-04-17 05:41:01 UTC
+++ src/mpdpp.h
@@ -23,6 +23,7 @@
 
 #include <cassert>
 #include <exception>
+#include <random>
 #include <set>
 #include <vector>
 
@@ -587,6 +588,7 @@ private:
 	int m_port;
 	int m_timeout;
 	std::string m_password;
+	std::mt19937 m_gen;
 };
 
 }

Lines 1-4 Link Here

(-)files/patch-src_playlist.cpp (-1 / +1 lines)
1	--- src/playlist.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/playlist.cpp.orig 2016-11-08 11:16:54 UTC
2	+++ src/playlist.cpp	2	+++ src/playlist.cpp
3	@@ -35,6 +35,7 @@	3	@@ -35,6 +35,7 @@
4	#include "utility/comparators.h"	4	#include "utility/comparators.h"

Lines 1-4 Link Here

(-)files/patch-src_playlist__editor.cpp (-1 / +1 lines)
1	--- src/playlist_editor.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/playlist_editor.cpp.orig 2016-11-08 11:15:14 UTC
2	+++ src/playlist_editor.cpp	2	+++ src/playlist_editor.cpp
3	@@ -39,6 +39,7 @@	3	@@ -39,6 +39,7 @@
4	#include "utility/comparators.h"	4	#include "utility/comparators.h"

Lines 1-4 Link Here

(-)files/patch-src_search__engine.cpp (-1 / +1 lines)
1	--- src/search_engine.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/search_engine.cpp.orig 2016-11-08 11:19:29 UTC
2	+++ src/search_engine.cpp	2	+++ src/search_engine.cpp
3	@@ -35,6 +35,7 @@	3	@@ -35,6 +35,7 @@
4	#include "utility/comparators.h"	4	#include "utility/comparators.h"

Lines 1-4 Link Here

(-)files/patch-src_status.cpp (-1 / +1 lines)
1	--- src/status.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/status.cpp.orig 2016-11-08 11:20:56 UTC
2	+++ src/status.cpp	2	+++ src/status.cpp
3	@@ -21,6 +21,8 @@	3	@@ -21,6 +21,8 @@
4	#include <boost/date_time/posix_time/posix_time.hpp>	4	#include <boost/date_time/posix_time/posix_time.hpp>

Lines 1-4 Link Here

(-)files/patch-src_tag__editor.cpp (-1 / +1 lines)
1	--- src/tag_editor.cpp.orig 2016-04-17 05:41:01 UTC	1	--- src/tag_editor.cpp.orig 2016-11-08 11:22:40 UTC
2	+++ src/tag_editor.cpp	2	+++ src/tag_editor.cpp
3	@@ -42,6 +42,7 @@	3	@@ -42,6 +42,7 @@
4	#include "title.h"	4	#include "title.h"

Lines 1-4 Link Here

(-)files/patch-src_window.h (-1 / +1 lines)
1	--- src/window.h.orig 2016-04-17 05:41:01 UTC	1	--- src/window.h.orig 2016-11-08 11:23:53 UTC
2	+++ src/window.h	2	+++ src/window.h
3	@@ -23,7 +23,9 @@	3	@@ -23,7 +23,9 @@
4		4

Return to bug 214314

Lines 1-29 Link Here

(-)files/patch-src_mpdpp.cpp (-29 lines)
1	--- src/mpdpp.cpp.orig 2016-04-17 05:41:01 UTC
2	+++ src/mpdpp.cpp
3	@@ -105,6 +105,8 @@ Connection::Connection() : m_connection(
4	m_port(6600),
5	m_timeout(15)
6	{
7	+ std::random_device rd;
8	+ m_gen.seed(rd());
9	}
10
11	void Connection::Connect()
12	@@ -570,7 +572,7 @@ bool Connection::AddRandomTag(mpd_tag_ty
13	if (number > tags.size())
14	return false;
15
16	- std::random_shuffle(tags.begin(), tags.end());
17	+ std::shuffle(tags.begin(), tags.end(), m_gen);
18	auto it = tags.begin();
19	for (size_t i = 0; i < number && it != tags.end(); ++i)
20	{
21	@@ -609,7 +611,7 @@ bool Connection::AddRandomSongs(size_t n
22	}
23	else
24	{
25	- std::random_shuffle(files.begin(), files.end());
26	+ std::shuffle(files.begin(), files.end(), m_gen);
27	StartCommandsList();
28	auto it = files.begin();
29	for (size_t i = 0; i < number && it != files.end(); ++i, ++it)

Lines 1-18 Link Here

(-)files/patch-src_mpdpp.h (-18 lines)
1	--- src/mpdpp.h.orig 2016-04-17 05:41:01 UTC
2	+++ src/mpdpp.h
3	@@ -23,6 +23,7 @@
4
5	#include <cassert>
6	#include <exception>
7	+#include <random>
8	#include <set>
9	#include <vector>
10
11	@@ -587,6 +588,7 @@ private:
12	int m_port;
13	int m_timeout;
14	std::string m_password;
15	+ std::mt19937 m_gen;
16	};
17
18	}