From d3ee89755dcc370976c6a938cf9a1d4f2d1cfdbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 20 May 2021 21:43:29 +0200
Subject: [PATCH] mpd: update to 0.22.7.

---
 .../patches/dont-use-glibc-extension.patch    | 36 -------------------
 srcpkgs/mpd/patches/fix-musl-tests.patch      | 24 -------------
 srcpkgs/mpd/template                          |  5 ++-
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/mpd/patches/dont-use-glibc-extension.patch
 delete mode 100644 srcpkgs/mpd/patches/fix-musl-tests.patch

diff --git a/srcpkgs/mpd/patches/dont-use-glibc-extension.patch b/srcpkgs/mpd/patches/dont-use-glibc-extension.patch
deleted file mode 100644
index edb22981b3bc..000000000000
--- a/srcpkgs/mpd/patches/dont-use-glibc-extension.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 18f6e76a07245b9cc8d87cd9b582d4e7252494d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
-Date: Thu, 25 Feb 2021 14:21:36 -0300
-Subject: [PATCH] storage/plugins/CurlStorage: don't use glibc extension in
- ParseTimePoint.
-
-%Z is a glibc extension to strptime, and is a no-op there, due to the
-mapping between timezone names and their definition (especially when the
-name comes from a different machine) being ambiguous / impossible.  Time
-in HTTP headers is guaranteed to be UTC.
-
-Passing an unknown format to strptime() implementations that don't
-support it will generally cause them to return NULL, which will lead to
-ParseTimePoint throwing an exception and ParseTimeStamp using an
-unnecessary fallback.
-
-Since the timezone name goes at the end of the string, we don't need to
-use %Z to skip it (could be an issue in a different time stamp format),
-so simply removing %Z works best.
----
- src/storage/plugins/CurlStorage.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/plugins/CurlStorage.cxx b/src/storage/plugins/CurlStorage.cxx
-index d05b90a31..9d862eb32 100644
---- a/src/storage/plugins/CurlStorage.cxx
-+++ b/src/storage/plugins/CurlStorage.cxx
-@@ -193,7 +193,7 @@ ParseTimeStamp(const char *s)
- {
- 	try {
- 		// TODO: make this more robust
--		return ParseTimePoint(s, "%a, %d %b %Y %T %Z");
-+		return ParseTimePoint(s, "%a, %d %b %Y %T");
- 	} catch (...) {
- 		return std::chrono::system_clock::time_point::min();
- 	}
diff --git a/srcpkgs/mpd/patches/fix-musl-tests.patch b/srcpkgs/mpd/patches/fix-musl-tests.patch
deleted file mode 100644
index a1b450988ed0..000000000000
--- a/srcpkgs/mpd/patches/fix-musl-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 634bd4798c4dab00f0a0869fed9a4f31bfbd53fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
-Date: Thu, 25 Feb 2021 13:53:31 -0300
-Subject: [PATCH] time/ISO8601: don't use glibc extension in strptime.
-
-Per the manual for strptime, %F is equivalent %Y-%m-%d, so use that
-directly.
----
- src/time/ISO8601.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/time/ISO8601.cxx b/src/time/ISO8601.cxx
-index e2197e3ad..be20ee803 100644
---- a/src/time/ISO8601.cxx
-+++ b/src/time/ISO8601.cxx
-@@ -202,7 +202,7 @@ ParseISO8601(const char *s)
- 	}
- 
- 	/* parse the date */
--	const char *end = strptime(s, "%F", &tm);
-+	const char *end = strptime(s, "%Y-%m-%d", &tm);
- 	if (end == nullptr) {
- 		/* try without field separators */
- 		end = strptime(s, "%Y%m%d", &tm);
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 9fb76d5e0a4a..d556c19cc888 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.22.6
+version=0.22.7
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -37,9 +37,8 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v${version}/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=2be149a4895c3cb613477f8cf1193593e3d8a1d38a75ffa7d32da8c8316a4d5e
+checksum=498668c408cece8469dfcda6dd59a471d5ee9ba2c365a7eca3165a8ac831fc41
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
-patch_args="-Np1"
 
 system_accounts="mpd"
 mpd_homedir="/var/lib/mpd"