[PR PATCH] ncmpcpp: fix support for non-inode sockets

[PR PATCH] ncmpcpp: fix support for non-inode sockets

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages ncm
https://github.com/void-linux/void-packages/pull/33739

ncmpcpp: fix support for non-inode sockets
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33739.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ncm-33739.patch --]
[-- Type: text/x-diff, Size: 2605 bytes --]

From 751123383d818bfba135d81e07aa3e72eece4b22 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 24 Oct 2021 22:06:45 -0400
Subject: [PATCH] ncmpcpp: fix support for non-inode sockets

---
 srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ++++++++++++++++
 srcpkgs/ncmpcpp/template                   | 13 +++++++------
 2 files changed, 23 insertions(+), 6 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..4fdcb28d3b25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,26 @@
 # 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"
-hostmakedepends="pkg-config"
+hostmakedepends="automake libtool 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 <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=9321275e26ad4308448e661bb879b96d446b203cf57b3591db17b186387a7847
 
 # Required by waddwstr() with ncurses on musl
 CXXFLAGS="-D_XOPEN_SOURCE=600"
 
 pre_configure() {
-	vsed -i '/^docdir/d' {,doc/}Makefile.in
+	vsed -e '/^docdir/d' -i {,doc/}Makefile.am
+	./autogen.sh
 }
 
 post_install() {

Re: [PR REVIEW] ncmpcpp: fix support for non-inode sockets

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33739#discussion_r735224541

Comment:
Can you explain why this is being done? Switching to the git archive instead of the pre-configured one?

Re: [PR PATCH] [Updated] ncmpcpp: fix support for non-inode sockets

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages ncm
https://github.com/void-linux/void-packages/pull/33739

ncmpcpp: fix support for non-inode sockets
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33739.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ncm-33739.patch --]
[-- Type: text/x-diff, Size: 2358 bytes --]

From 3d0f9eb43c4875a8e513fc418534a3f83605d2bd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
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 <orphan@voidlinux.org>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 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() {

Re: [PR REVIEW] ncmpcpp: fix support for non-inode sockets

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

New review comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/33739#discussion_r735230839

Comment:
Honestly I changed the distfile to the GitHub one without thinking about it and then changed the rest of the template accordingly; I didn't know the one being used originally was pre-configured. I've switched it back in the latest push.

Re: [PR PATCH] [Merged]: ncmpcpp: fix support for non-inode sockets

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]

There's a merged pull request on the void-packages repository

ncmpcpp: fix support for non-inode sockets
https://github.com/void-linux/void-packages/pull/33739

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->