[update] mpd/ncmpc/ncmpcpp

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[update] mpd/ncmpc/ncmpcpp

Landry Breuil-5
Hi,

found those were a bit outdated, changelogs at
https://rybczak.net/ncmpcpp/
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.6/NEWS
https://github.com/MusicPlayerDaemon/ncmpc/blob/v0.45/NEWS

mpd updates from 0.21 to 0.22 because of some additions to the protocol,
added BDEP on sphinx because the manpage isnt in the src tarball so
needs to be generated from the rst file.

Please test !

Landry

mpd-0.22.6.diff (6K) Download Attachment
ncmpc-0.45.diff (6K) Download Attachment
ncmpcpp-0.9.2.diff (3K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [update] mpd/ncmpc/ncmpcpp

Bjorn Ketelaars
On Sat 20/02/2021 08:37, Landry Breuil wrote:

> Hi,
>
> found those were a bit outdated, changelogs at
> https://rybczak.net/ncmpcpp/
> https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.22.6/NEWS
> https://github.com/MusicPlayerDaemon/ncmpc/blob/v0.45/NEWS
>
> mpd updates from 0.21 to 0.22 because of some additions to the protocol,
> added BDEP on sphinx because the manpage isnt in the src tarball so
> needs to be generated from the rst file.
>
> Please test !

Build and (lightly) run tested on amd64. OK mpd and ncmpc

It seems that ncmpcpp does not depend on libiconv, as such remove it
from LDEP and sync WANTLIB. While here sync patches. Based on your diff:


diff --git Makefile Makefile
index 5216990772e..168e25b4b0d 100644
--- Makefile
+++ Makefile
@@ -5,8 +5,7 @@ BROKEN-hppa = bindings.h:85:4: error: type 'Binding' is not a direct base of 'B
 
 COMMENT = ncurses mpd client inspired by ncmpc
 
-DISTNAME = ncmpcpp-0.8.2
-REVISION = 1
+DISTNAME = ncmpcpp-0.9.2
 
 EXTRACT_SUFX = .tar.bz2
 
@@ -17,17 +16,16 @@ HOMEPAGE = https://rybczak.net/ncmpcpp/
 # GPLv2
 PERMIT_PACKAGE = Yes
 
-WANTLIB += boost_date_time-mt boost_filesystem-mt boost_locale-mt
-WANTLIB += boost_program_options-mt boost_regex-mt boost_system-mt
-WANTLIB += boost_thread-mt c crypto curl ereadline iconv m mpdclient
-WANTLIB += curses nghttp2 pthread ssl ${LIBCXX} tag z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} boost_chrono-mt boost_date_time-mt
+WANTLIB += boost_filesystem-mt boost_locale-mt boost_program_options-mt
+WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c crypto
+WANTLIB += curl curses ereadline icudata icui18n icuuc m mpdclient
+WANTLIB += nghttp2 ssl tag z
 
 MASTER_SITES = ${HOMEPAGE}stable/
 
 LIB_DEPENDS = audio/libmpdclient>=2.4 \
  audio/taglib \
- converters/libiconv \
  devel/boost \
  devel/readline \
  net/curl
diff --git distinfo distinfo
index fd53b891b20..f1807f24c59 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpcpp-0.8.2.tar.bz2) = ZQuj6AiWJLetnkzBm8GsYCjtt1I8wRH6FobqRMCSFVQ=
-SIZE (ncmpcpp-0.8.2.tar.bz2) = 465713
+SHA256 (ncmpcpp-0.9.2.tar.bz2) = +qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs=
+SIZE (ncmpcpp-0.9.2.tar.bz2) = 486266
diff --git patches/patch-configure patches/patch-configure
index 8b99053d03a..b3c1b09f417 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.11 2018/02/11 10:37:51 dcoppa Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -19500,7 +19500,7 @@ CPPFLAGS=$boost_thread_save_CPPFLAGS
+@@ -20542,7 +20542,7 @@ CPPFLAGS=$boost_thread_save_CPPFLAGS
 
 
 
diff --git patches/patch-doc_ncmpcpp_1 patches/patch-doc_ncmpcpp_1
index 68e41d9c40e..949c7934e1a 100644
--- patches/patch-doc_ncmpcpp_1
+++ patches/patch-doc_ncmpcpp_1
@@ -8,7 +8,7 @@ Index: doc/ncmpcpp.1
  .SH "NAME"
  ncmpcpp \- An ncurses Music Player Daemon (MPD) client.
  .SH "SYNOPSIS"
-@@ -298,7 +298,7 @@ Slave screen that has to be displayed at start (nothin
+@@ -325,7 +325,7 @@ Slave screen that has to be displayed at start (nothin
  .TP
  .B startup_slave_screen_focus = yes/no
  If set to yes, slave screen will be the active one after startup. Otherwise master screen will be.
@@ -17,11 +17,11 @@ Index: doc/ncmpcpp.1
  .B locked_screen_width_part = 20-80
  If you want to lock a screen, ncmpcpp asks for % of locked screen's width to be reserved before that and provides a default value, which is the one you can set here.
  .TP
-@@ -415,7 +415,6 @@ Border color of pop-up windows. If set to 'none', no b
+@@ -445,7 +445,6 @@ Border color of pop-up windows. If set to 'none', no b
  .TP
  .B active_window_border = COLOR
  Color of active window's border.
 -.TP
  .SH "BINDINGS"
- When ncmpcpp starts, it tries to read user's bindings from ~/.ncmpcpp/bindings and $XDG_CONFIG_HOME/ncmpcpp/bindings files. If no bindings file is found, ncmpcpp uses the defaults. An example bindings file with the default values can be found usually in /usr/share/doc/ncmpcpp (exact location may depend on used distribution or configure prefix).
-
+ When ncmpcpp starts, it tries to read bindings from
+ $XDG_CONFIG_HOME/ncmpcpp/bindings and ~/.ncmpcpp/bindings files. If no bindings
diff --git patches/patch-src_ncmpcpp_cpp patches/patch-src_ncmpcpp_cpp
deleted file mode 100644
index ee24f3c24c3..00000000000
--- patches/patch-src_ncmpcpp_cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_ncmpcpp_cpp,v 1.13 2017/06/09 15:09:51 dcoppa Exp $
-
-OpenBSD lacks sigignore(), use the one from NetBSD
-
-Index: src/ncmpcpp.cpp
---- src/ncmpcpp.cpp.orig
-+++ src/ncmpcpp.cpp
-@@ -68,6 +68,18 @@ void sighandler(int sig)
- #endif // __sun && __SVR4
- }
-
-+int n_sigignore(int sig)
-+{
-+ struct sigaction sa;
-+
-+ sa.sa_handler = SIG_IGN;
-+ if (sigemptyset(&sa.sa_mask) != 0)
-+ return (-1);
-+ sa.sa_flags = 0;
-+
-+ return (sigaction(sig, &sa, NULL));
-+}
-+
- void do_at_exit()
- {
- // restore old cerr & clog buffers
-@@ -108,7 +120,7 @@ int main(int argc, char **argv)
- cerr_buffer = std::cerr.rdbuf();
- std::cerr.rdbuf(errorlog.rdbuf());
-
-- sigignore(SIGPIPE);
-+ n_sigignore(SIGPIPE);
- signal(SIGWINCH, sighandler);
-
- Mpd.setNoidleCallback(Status::update);
diff --git pkg/PLIST pkg/PLIST
index ac104a614ee..51c619d0966 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -2,8 +2,9 @@
 @bin bin/ncmpcpp
 @man man/man1/ncmpcpp.1
 share/examples/ncmpcpp/
+@comment share/examples/ncmpcpp/NEWS
 @comment share/examples/ncmpcpp/AUTHORS
+share/examples/ncmpcpp/CHANGELOG.md
 @comment share/examples/ncmpcpp/COPYING
-@comment share/examples/ncmpcpp/NEWS
 share/examples/ncmpcpp/bindings
 share/examples/ncmpcpp/config