From 3d0f9eb43c4875a8e513fc418534a3f83605d2bd Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sun, 24 Oct 2021 23:13:29 -0400 Subject: [PATCH] ncmpcpp: fix support for non-inode sockets --- srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ++++++++++++++++ srcpkgs/ncmpcpp/template | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch new file mode 100644 index 000000000000..6bf92146ea09 --- /dev/null +++ b/srcpkgs/ncmpcpp/patches/socket-inode.patch @@ -0,0 +1,16 @@ +# Support sockets without a socket inode +# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea +diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp +index ccdee31d..9a92e5df 100644 +--- a/src/mpdpp.cpp ++++ b/src/mpdpp.cpp +@@ -147,7 +147,7 @@ unsigned Connection::Version() const + void Connection::SetHostname(const std::string &host) + { + size_t at = host.find("@"); +- if (at != std::string::npos) ++ if (at != 0 && at != std::string::npos) + { + m_password = host.substr(0, at); + m_host = host.substr(at+1); + diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template index 7c7fbade75f2..482d2154c0f7 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -1,7 +1,7 @@ # Template file for 'ncmpcpp' pkgname=ncmpcpp version=0.9.2 -revision=2 +revision=3 build_style=gnu-configure configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config" makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel readline-devel taglib-devel" short_desc="Ncurses mpd client inspired by ncmpc" -maintainer="Orphaned " +maintainer="cinerea0 " license="GPL-2.0-or-later" homepage="https://rybczak.net/ncmpcpp" distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2" @@ -19,7 +19,7 @@ checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b CXXFLAGS="-D_XOPEN_SOURCE=600" pre_configure() { - vsed -i '/^docdir/d' {,doc/}Makefile.in + vsed -e '/^docdir/d' -i {,doc/}Makefile.in } post_install() {