From e1acdbf6501eba2c28dc2754d4e2f3b4736a94f7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 25 Aug 2023 11:25:18 +0200 Subject: [PATCH] gnutls: build fix for conflicting `gettext()` declaration/definition The symptom is: src/benchmark.h:38:20: error: static declaration of 'gettime' follows non-static declaration inline static void gettime(struct timespec *ts) ^ src/gl/timespec.h:93:6: note: previous declaration is here void gettime (struct timespec *) _GL_ARG_NONNULL ((1)); ^ This only affects the clang build, not the gcc build. This fix is a GNU TLS patch, backported to MSYS2, then borrowed from https://github.com/msys2/MINGW-packages/pull/18258. Signed-off-by: Johannes Schindelin --- mingw-w64-gnutls/PKGBUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw-w64-gnutls/PKGBUILD b/mingw-w64-gnutls/PKGBUILD index ef56b81a1f9f6..1cff677d943ad 100644 --- a/mingw-w64-gnutls/PKGBUILD +++ b/mingw-w64-gnutls/PKGBUILD @@ -31,12 +31,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v${_pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig} 0003-gnutls-fix-external-libtasn1-detection.patch 0004-disable-broken-examples.patch - 0005-remove-coverage-rules.patch) + 0005-remove-coverage-rules.patch + https://gitlab.com/gnutls/gnutls/-/merge_requests/1770.patch) sha256sums=('ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c' 'SKIP' '6493f69e782d60fe04de4b0040987e99851c522d0baf2fe25d10b85b63e97863' 'cbf9e59fb2432d4ac1edcb70734023e074b8058fa4c010a036a40de8449f67fb' - '10ea5a84459af8d848788cc8871decd3b3cdd542b829883ebe4f6ec28d60578f') + '10ea5a84459af8d848788cc8871decd3b3cdd542b829883ebe4f6ec28d60578f' + 'b12b3f987389518dbd65c82b41c99bf50ac5a7dcee74ef96f7076dce1d351f52') validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F') # "Simon Josefsson " validpgpkeys+=('1F42418905D8206AA754CCDC29EE58B996865171') # "Nikos Mavrogiannopoulos validpgpkeys+=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno " @@ -47,6 +49,7 @@ prepare() { patch -p1 -i ${srcdir}/0003-gnutls-fix-external-libtasn1-detection.patch patch -p1 -i ${srcdir}/0004-disable-broken-examples.patch patch -p1 -i ${srcdir}/0005-remove-coverage-rules.patch + patch -p1 -i ${srcdir}/1770.patch WANT_AUTOMAKE=latest autoreconf -fiv -I m4 }