cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ncmpcpp-0.5.9

Browse Source
This commit is contained in:
dcoppa 2012-03-18 17:09:27 +00:00
parent a87d2df940
commit cf6e7cb3cd
8 changed files with 21 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/ncmpcpp/Makefile
View File

@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2012/02/03 11:48:52 dcoppa Exp $
# $OpenBSD: Makefile,v 1.10 2012/03/18 17:09:27 dcoppa Exp $
COMMENT = ncurses mpd client inspired by ncmpc
DISTNAME = ncmpcpp-0.5.8
REVISION = 2
DISTNAME = ncmpcpp-0.5.9
EXTRACT_SUFX = .tar.bz2

10
audio/ncmpcpp/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ncmpcpp-0.5.8.tar.bz2) = KIlSxrTPT6NoPz+DpY2jfA==
RMD160 (ncmpcpp-0.5.8.tar.bz2) = S0a7eT7cldjn0dAf0TVpbF4eXpY=
SHA1 (ncmpcpp-0.5.8.tar.bz2) = JAKm4zNITWQBHQE16mZZ3HhK3Fo=
SHA256 (ncmpcpp-0.5.8.tar.bz2) = nVLlxhkpRa/ylCrK2jfVJZJEG494aq5G+clBR/Szc80=
SIZE (ncmpcpp-0.5.8.tar.bz2) = 373853
MD5 (ncmpcpp-0.5.9.tar.bz2) = B/YtZXTQ3MmcrYStuXVCAw==
RMD160 (ncmpcpp-0.5.9.tar.bz2) = sVx39ZrQ6MOLkIBgaoy6nJy8UmY=
SHA1 (ncmpcpp-0.5.9.tar.bz2) = BwL8qLFqZnwDy/Or2fwYxDEJ7vg=
SHA256 (ncmpcpp-0.5.9.tar.bz2) = PGbp8oBhjgxQZxoZ/1sU4R1rZMe0pU7cK70LFoXRE7s=
SIZE (ncmpcpp-0.5.9.tar.bz2) = 380741

10
audio/ncmpcpp/patches/patch-configure
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.2 2011/10/13 11:15:41 dcoppa Exp $
$OpenBSD: patch-configure,v 1.3 2012/03/18 17:09:27 dcoppa Exp $
Fix libpthread linkage
--- configure.orig Tue Oct 11 21:34:09 2011
+++ configure Thu Oct 13 12:53:07 2011
@@ -15429,13 +15429,13 @@ if test "x$ac_cv_header_pthread_h" = xyes; then :
--- configure.orig Sat Mar 17 17:07:17 2012
+++ configure Sun Mar 18 17:49:12 2012
@@ -15485,13 +15485,13 @@ if test "x$ac_cv_header_pthread_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_PTHREAD_H 1
_ACEOF
@ -21,7 +21,7 @@ Fix libpthread linkage
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15466,7 +15466,7 @@ fi
@@ -15522,7 +15522,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :

10
audio/ncmpcpp/patches/patch-doc_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2011/07/25 20:08:23 dcoppa Exp $
--- doc/Makefile.in.orig Thu Apr 21 02:33:28 2011
+++ doc/Makefile.in Wed Jul 20 06:52:49 2011
@@ -283,15 +283,15 @@ uninstall-man1:
cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
$OpenBSD: patch-doc_Makefile_in,v 1.2 2012/03/18 17:09:27 dcoppa Exp $
--- doc/Makefile.in.orig Sat Mar 17 17:07:17 2012
+++ doc/Makefile.in Sun Mar 18 17:49:13 2012
@@ -287,15 +287,15 @@ uninstall-man1:
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"

8
audio/ncmpcpp/patches/patch-src_clock_cpp
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_clock_cpp,v 1.2 2011/10/13 11:15:41 dcoppa Exp $
$OpenBSD: patch-src_clock_cpp,v 1.3 2012/03/18 17:09:27 dcoppa Exp $
Unbreak compilation
--- src/clock.cpp.orig Tue Oct 11 21:27:41 2011
+++ src/clock.cpp Thu Oct 13 12:53:07 2011
@@ -113,7 +113,8 @@ void Clock::Update()
--- src/clock.cpp.orig Sat Mar 17 17:04:48 2012
+++ src/clock.cpp Sun Mar 18 17:49:13 2012
@@ -135,7 +135,8 @@ void Clock::Update()
static timeval past = { 0, 0 };
gettimeofday(&past, 0);

16
audio/ncmpcpp/patches/patch-src_helpers_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_helpers_cpp,v 1.1 2011/11/29 12:07:18 dcoppa Exp $
display more detailed info if connection to MPD couldn't be
estabilished (upstream git commit 62157909d5d2008b90bef74a21fdab164f391728)
--- src/helpers.cpp.orig Tue Oct 11 21:27:41 2011
+++ src/helpers.cpp Tue Nov 29 12:31:42 2011
@@ -42,7 +42,7 @@ bool ConnectToMPD()
{
if (!Mpd.Connect())
{
- std::cout << "Cannot connect to mpd: " << Mpd.GetErrorMessage() << std::endl;
+ std::cout << "Couldn't connect to MPD (host = " << Mpd.GetHostname() << ", port = " << Mpd.GetPort() << "): " << Mpd.GetErrorMessage() << std::endl;
return false;
}
return true;

28
audio/ncmpcpp/patches/patch-src_status_cpp
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_status_cpp,v 1.1 2011/12/30 10:10:16 dcoppa Exp $
Bugfix: dollar sign in song title changes interface text colors
(upstream git commit e8f08ea8844ca878cc159babb68c033278d5b270)
cf. http://musicpd.org/mantis/view.php?id=3409
--- src/status.cpp.orig Tue Oct 11 21:27:41 2011
+++ src/status.cpp Fri Dec 30 10:45:05 2011
@@ -445,8 +445,8 @@ void NcmpcppStatusChanged(MPD::Connection *, MPD::Stat
}
basic_buffer<my_char_t> first, second;
- String2Buffer(TO_WSTRING(utf_to_locale_cpy(np.toString(Config.new_header_first_line))), first);
- String2Buffer(TO_WSTRING(utf_to_locale_cpy(np.toString(Config.new_header_second_line))), second);
+ String2Buffer(TO_WSTRING(utf_to_locale_cpy(np.toString(Config.new_header_first_line, "$"))), first);
+ String2Buffer(TO_WSTRING(utf_to_locale_cpy(np.toString(Config.new_header_second_line, "$"))), second);
size_t first_len = Window::Length(first.Str());
size_t first_margin = (std::max(tracklength.length()+1, VolumeState.length()))*2;
@@ -497,7 +497,7 @@ void NcmpcppStatusChanged(MPD::Connection *, MPD::Stat
tracklength += "]";
}
basic_buffer<my_char_t> np_song;
- String2Buffer(TO_WSTRING(utf_to_locale_cpy(np.toString(Config.song_status_format))), np_song);
+ String2Buffer(TO_WSTRING(utf_to_locale_cpy(np.toString(Config.song_status_format, "$"))), np_song);
*wFooter << XY(0, 1) << wclrtoeol << player_state << fmtBoldEnd;
np_song.Write(*wFooter, playing_song_scroll_begin, wFooter->GetWidth()-player_state.length()-tracklength.length(), U(" ** "));
*wFooter << fmtBold << XY(wFooter->GetWidth()-tracklength.length(), 1) << tracklength;

62
audio/ncmpcpp/patches/patch-src_tag_editor_cpp
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-src_tag_editor_cpp,v 1.2 2012/02/03 11:48:52 dcoppa Exp $
fix segfault if LocateSong is used in tag editor
(upstream git commit 70e9ebe7a309229825d157a8dd567cd4b4774a45)
fix going to right column when filename is highlighted in middle
one (upstream git commit 8e3b0620f0f7f00af76405c1ac5001dd8eb5885b)
fix going to wrong directory in tag editor
(upstream git commit 78cd46b7568e92bbecaa358bae21f3079ecf11ae)
--- src/tag_editor.cpp.orig Tue Oct 11 21:27:41 2011
+++ src/tag_editor.cpp Fri Feb 3 11:24:39 2012
@@ -39,6 +39,7 @@
#include "song_info.h"
#include "playlist.h"
+using Global::myScreen;
using Global::MainHeight;
using Global::MainStartY;
@@ -185,8 +186,6 @@ std::basic_string<my_char_t> TagEditor::Title()
void TagEditor::SwitchTo()
{
- using Global::myScreen;
-
if (myScreen == this)
return;
@@ -809,7 +808,7 @@ void TagEditor::NextColumn()
w = TagTypes;
TagTypes->HighlightColor(Config.active_column_color);
}
- else if (w == TagTypes && TagTypes->Choice() < 12 && !Tags->ReallyEmpty())
+ else if (w == TagTypes && TagTypes->Choice() < 13 && !Tags->ReallyEmpty())
{
TagTypes->HighlightColor(Config.main_highlight_color);
w->Refresh();
@@ -854,6 +853,9 @@ void TagEditor::PrevColumn()
void TagEditor::LocateSong(const MPD::Song &s)
{
+ if (myScreen == this)
+ return;
+
if (s.GetDirectory().empty())
return;
@@ -872,7 +874,11 @@ void TagEditor::LocateSong(const MPD::Song &s)
if (itsBrowsedDir != s.GetDirectory())
{
itsBrowsedDir = s.GetDirectory();
- itsBrowsedDir = itsBrowsedDir.substr(0, itsBrowsedDir.rfind('/'));
+ size_t last_slash = itsBrowsedDir.rfind('/');
+ if (last_slash != std::string::npos)
+ itsBrowsedDir = itsBrowsedDir.substr(0, last_slash);
+ else
+ itsBrowsedDir = "/";
if (itsBrowsedDir.empty())
itsBrowsedDir = "/";
Dirs->Clear();