fix(main/mpc): remove need for socket patch

Patch belongs in libmpdclient, and libmpdclient already has a
configure arg we can use to set default socket.

Fixes issue described in termux/termux-packages#12962.
This commit is contained in:
Henrik Grimler 2023-01-06 21:40:45 +01:00
parent 417d952869
commit 2118cb740c
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
3 changed files with 3 additions and 17 deletions

View File

@ -3,8 +3,9 @@ TERMUX_PKG_DESCRIPTION="Asynchronous API library for interfacing MPD in the C, C
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.20
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/libmpdclient/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=3c5a671e7bc5736c677ef75017eaf008e8838ac03605953410e8d4de6b363b73
TERMUX_PKG_BREAKS="libmpdclient-dev"
TERMUX_PKG_REPLACES="libmpdclient-dev"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -D default_socket==${TERMUX_PREFIX}/var/run/mpd/socket"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Ddefault_socket=${TERMUX_PREFIX}/var/run/mpd.socket"

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Minimalist command line interface for MPD"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.34
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://www.musicpd.org/download/mpc/${TERMUX_PKG_VERSION:0:1}/mpc-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20
TERMUX_PKG_DEPENDS="libiconv, libmpdclient"

View File

@ -1,15 +0,0 @@
--- ../options.c.orig 2022-07-28 21:21:13.150375029 +0200
+++ ./src/options.c 2022-07-28 21:25:59.500403799 +0200
@@ -304,7 +304,11 @@
option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
/* Parse the password from the host */
- if (options.host != NULL &&
+ if (options.host == NULL) {
+ /* Use socket in @TERMUX_$PREFIX@/var/run/mpd.socket
+ if none was specified */
+ options.host = "@TERMUX_PREFIX@/var/run/mpd.socket";
+ } else if (options.host != NULL &&
(tmp = strchr(options.host, '@')) != NULL &&
/* if the host begins with a '@' then it's not an empty
password but an abstract socket */