Attachment 176980 Details for Bug 214314 – Patch to 0.7.7, version 2

[patch] Patch to 0.7.7, version 2

ncmpcpp.diff (text/plain), 7.29 KB, created by yamagi on 2016-11-14 07:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yamagi

Created: 2016-11-14 07:50:11 UTC

Size: 7.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 425877)
>+++ Makefile	(Arbeitskopie)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ncmpcpp
>-PORTVERSION=	0.7.5
>-PORTREVISION=	1
>+PORTVERSION=	0.7.7
> CATEGORIES=	audio
> MASTER_SITES=	http://ncmpcpp.rybczak.net/stable/
> 
>@@ -18,7 +17,7 @@
> 		libicuuc.so:devel/icu \
> 		libboost_filesystem.so:devel/boost-libs
> 
>-USES=		compiler:c++11-lib iconv libtool localbase ncurses:port pkgconfig tar:bzip2
>+USES=		compiler:c++11-lib iconv libtool localbase ncurses pkgconfig readline tar:bzip2
> GNU_CONFIGURE=	yes
> USE_GNOME=	glib20
> LDFLAGS+=	-lpthread
>Index: distinfo
>===================================================================
>--- distinfo	(Revision 425877)
>+++ distinfo	(Arbeitskopie)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1471591908
>-SHA256 (ncmpcpp-0.7.5.tar.bz2) = 7e4f643020b36698462879013a8b16111f8c3a4c5819cf186aed78032a41e07d
>-SIZE (ncmpcpp-0.7.5.tar.bz2) = 443072
>+TIMESTAMP = 1478602699
>+SHA256 (ncmpcpp-0.7.7.tar.bz2) = b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef
>+SIZE (ncmpcpp-0.7.7.tar.bz2) = 443801
>Index: files/patch-src_browser.cpp
>===================================================================
>--- files/patch-src_browser.cpp	(Revision 425877)
>+++ files/patch-src_browser.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/browser.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/browser.cpp.orig	2016-11-08 11:02:02 UTC
> +++ src/browser.cpp
> @@ -42,6 +42,7 @@
>  #include "utility/comparators.h"
>Index: files/patch-src_configuration.cpp
>===================================================================
>--- files/patch-src_configuration.cpp	(Revision 425877)
>+++ files/patch-src_configuration.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/configuration.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/configuration.cpp.orig	2016-11-08 11:03:23 UTC
> +++ src/configuration.cpp
> @@ -29,6 +29,7 @@
>  #include "mpdpp.h"
>Index: files/patch-src_helpers.cpp
>===================================================================
>--- files/patch-src_helpers.cpp	(Revision 425877)
>+++ files/patch-src_helpers.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/helpers.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/helpers.cpp.orig	2016-11-08 11:05:01 UTC
> +++ src/helpers.cpp
> @@ -26,6 +26,7 @@
>  #include "playlist.h"
>Index: files/patch-src_media__library.cpp
>===================================================================
>--- files/patch-src_media__library.cpp	(Revision 425877)
>+++ files/patch-src_media__library.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/media_library.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/media_library.cpp.orig	2016-11-08 11:06:09 UTC
> +++ src/media_library.cpp
> @@ -40,6 +40,7 @@
>  #include "utility/type_conversions.h"
>Index: files/patch-src_mpdpp.cpp
>===================================================================
>--- files/patch-src_mpdpp.cpp	(Revision 425877)
>+++ files/patch-src_mpdpp.cpp	(nicht existent)
>@@ -1,29 +0,0 @@
>---- 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)
>
>EigenschaftsÃ¤nderungen: files/patch-src_mpdpp.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_mpdpp.h
>===================================================================
>--- files/patch-src_mpdpp.h	(Revision 425877)
>+++ files/patch-src_mpdpp.h	(nicht existent)
>@@ -1,18 +0,0 @@
>---- 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;
>- };
>- 
>- }
>
>EigenschaftsÃ¤nderungen: files/patch-src_mpdpp.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_playlist.cpp
>===================================================================
>--- files/patch-src_playlist.cpp	(Revision 425877)
>+++ files/patch-src_playlist.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/playlist.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/playlist.cpp.orig	2016-11-08 11:16:54 UTC
> +++ src/playlist.cpp
> @@ -35,6 +35,7 @@
>  #include "utility/comparators.h"
>Index: files/patch-src_playlist__editor.cpp
>===================================================================
>--- files/patch-src_playlist__editor.cpp	(Revision 425877)
>+++ files/patch-src_playlist__editor.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/playlist_editor.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/playlist_editor.cpp.orig	2016-11-08 11:15:14 UTC
> +++ src/playlist_editor.cpp
> @@ -39,6 +39,7 @@
>  #include "utility/comparators.h"
>Index: files/patch-src_search__engine.cpp
>===================================================================
>--- files/patch-src_search__engine.cpp	(Revision 425877)
>+++ files/patch-src_search__engine.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/search_engine.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/search_engine.cpp.orig	2016-11-08 11:19:29 UTC
> +++ src/search_engine.cpp
> @@ -35,6 +35,7 @@
>  #include "utility/comparators.h"
>Index: files/patch-src_status.cpp
>===================================================================
>--- files/patch-src_status.cpp	(Revision 425877)
>+++ files/patch-src_status.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/status.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/status.cpp.orig	2016-11-08 11:20:56 UTC
> +++ src/status.cpp
> @@ -21,6 +21,8 @@
>  #include <boost/date_time/posix_time/posix_time.hpp>
>Index: files/patch-src_tag__editor.cpp
>===================================================================
>--- files/patch-src_tag__editor.cpp	(Revision 425877)
>+++ files/patch-src_tag__editor.cpp	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/tag_editor.cpp.orig	2016-04-17 05:41:01 UTC
>+--- src/tag_editor.cpp.orig	2016-11-08 11:22:40 UTC
> +++ src/tag_editor.cpp
> @@ -42,6 +42,7 @@
>  #include "title.h"
>Index: files/patch-src_window.h
>===================================================================
>--- files/patch-src_window.h	(Revision 425877)
>+++ files/patch-src_window.h	(Arbeitskopie)
>@@ -1,4 +1,4 @@
>---- src/window.h.orig	2016-04-17 05:41:01 UTC
>+--- src/window.h.orig	2016-11-08 11:23:53 UTC
> +++ src/window.h
> @@ -23,7 +23,9 @@
>

Flags:

yamagi: maintainer-approval+

Actions: View | Diff

Attachments on bug 214314: 176774 | 176980