From 2118cb740c998883ba5f3ea78fc51622f261ec39 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.dev>
Date: Fri, 6 Jan 2023 21:40:45 +0100
Subject: [PATCH] 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.
---
 packages/libmpdclient/build.sh   |  3 ++-
 packages/mpc/build.sh            |  2 +-
 packages/mpc/src-options.c.patch | 15 ---------------
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 packages/mpc/src-options.c.patch

diff --git a/packages/libmpdclient/build.sh b/packages/libmpdclient/build.sh
index a25e7f436e..580ff6b5e7 100644
--- a/packages/libmpdclient/build.sh
+++ b/packages/libmpdclient/build.sh
@@ -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"
diff --git a/packages/mpc/build.sh b/packages/mpc/build.sh
index 6b7229ce87..755545b1a4 100644
--- a/packages/mpc/build.sh
+++ b/packages/mpc/build.sh
@@ -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"
diff --git a/packages/mpc/src-options.c.patch b/packages/mpc/src-options.c.patch
deleted file mode 100644
index 47b711a696..0000000000
--- a/packages/mpc/src-options.c.patch
+++ /dev/null
@@ -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 */