From 1d60d3cd2b959e1be487a7c757724c84bea3049e Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 22 Dec 2023 12:07:20 +0100 Subject: [PATCH] subprojects: update libmpdclient to 2.22 2.22 fixes the "version.h" conflict. Closes https://github.com/MusicPlayerDaemon/MPD/pull/1927 --- subprojects/libmpdclient.wrap | 4 +-- .../packagefiles/libmpdclient_unicode.patch | 27 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 subprojects/packagefiles/libmpdclient_unicode.patch diff --git a/subprojects/libmpdclient.wrap b/subprojects/libmpdclient.wrap index 9f999ad8a..2610fb5df 100644 --- a/subprojects/libmpdclient.wrap +++ b/subprojects/libmpdclient.wrap @@ -1,8 +1,6 @@ [wrap-git] url = https://github.com/MusicPlayerDaemon/libmpdclient -revision = v2.21 - -diff_files = libmpdclient_unicode.patch +revision = v2.22 [provide] libmpdclient = libmpdclient_dep diff --git a/subprojects/packagefiles/libmpdclient_unicode.patch b/subprojects/packagefiles/libmpdclient_unicode.patch deleted file mode 100644 index 2a66a09e7..000000000 --- a/subprojects/packagefiles/libmpdclient_unicode.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 14e9b3be33a7b7e94bb6504a519e03072bae033d -Author: Max Kellermann -Date: Wed Dec 20 17:13:54 2023 +0100 - - ierror: use FormatMessageA() instead of FormatMessage() - - Just in case _UNICODE is defined. - -diff --git a/src/ierror.c b/src/ierror.c -index 1642dbd2..e068dc8c 100644 ---- a/src/ierror.c -+++ b/src/ierror.c -@@ -103,10 +103,10 @@ mpd_error_system_message(struct mpd_error_info *error, int code) - mpd_error_system(error, code); - - #ifdef _WIN32 -- nbytes = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | -- FORMAT_MESSAGE_IGNORE_INSERTS | -- FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, code, 0, -- (LPSTR)buffer, sizeof(buffer), NULL); -+ nbytes = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | -+ FORMAT_MESSAGE_IGNORE_INSERTS | -+ FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, code, 0, -+ (LPSTR)buffer, sizeof(buffer), NULL); - mpd_error_message(error, nbytes > 0 ? buffer : "Unknown error"); - #else - mpd_error_message(error, strerror(code));