From a7bc34a1bb3e39cec70e6feb1720daad6fefbd12 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 24 May 2021 17:49:04 -0700 Subject: [PATCH] libnfs: fix compilation with clang Remove faulty patch Signed-off-by: Rosen Penev --- mingw-w64-libnfs/2.0.0-using-gnu-print.patch | 22 -------------------- mingw-w64-libnfs/PKGBUILD | 5 +---- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 mingw-w64-libnfs/2.0.0-using-gnu-print.patch diff --git a/mingw-w64-libnfs/2.0.0-using-gnu-print.patch b/mingw-w64-libnfs/2.0.0-using-gnu-print.patch deleted file mode 100644 index 2d2c5bb06c..0000000000 --- a/mingw-w64-libnfs/2.0.0-using-gnu-print.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libnfs-libnfs-2.0.0/include/libnfs-private.h.orig 2018-05-29 12:17:18.089075800 +0300 -+++ libnfs-libnfs-2.0.0/include/libnfs-private.h 2018-05-29 12:20:11.296180000 +0300 -@@ -191,13 +191,17 @@ - void rpc_error_all_pdus(struct rpc_context *rpc, const char *error); - - void rpc_set_error(struct rpc_context *rpc, const char *error_string, ...) --#ifdef __GNUC__ -+#if defined(__MINGW32__) && defined(__USE_MINGW_ANSI_STDIO) -+ __attribute__((format(gnu_printf, 2, 3))) -+#elif defined __GNUC__ - __attribute__((format(printf, 2, 3))) - #endif - ; - - void nfs_set_error(struct nfs_context *nfs, char *error_string, ...) --#ifdef __GNUC__ -+#if defined(__MINGW32__) && defined(__USE_MINGW_ANSI_STDIO) -+ __attribute__((format(gnu_printf, 2, 3))) -+#elif defined __GNUC__ - __attribute__((format(printf, 2, 3))) - #endif - ; diff --git a/mingw-w64-libnfs/PKGBUILD b/mingw-w64-libnfs/PKGBUILD index ff114fe6a7..d0ee65cda2 100644 --- a/mingw-w64-libnfs/PKGBUILD +++ b/mingw-w64-libnfs/PKGBUILD @@ -4,7 +4,7 @@ _realname=libnfs pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Client library for accessing NFS shares over a network (mingw-w64)" arch=(any) mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -13,17 +13,14 @@ license=('BSD' 'GPL3' 'LGPL2.1') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") source=("https://github.com/sahlberg/libnfs/archive/${_realname}-${pkgver}.tar.gz" 2.0.0-win32.patch - 2.0.0-using-gnu-print.patch 2.0.0-no-unefined.patch) sha256sums=('6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d' '57375b4a8743c74613b77193035e77adb86386d5a84937f6f4b8e761f172f4a8' - 'b8a3e14cf3be0212c8678ad610c34450a3a908424d1baf8eb43e414b4be783b5' '2ff5c413351e822d862d9c467b19f097e3d93a23de1a1511abfbb51268f21c25') prepare() { cd ${_realname}-${_realname}-${pkgver} patch -p1 -i ${srcdir}/2.0.0-win32.patch - patch -p1 -i ${srcdir}/2.0.0-using-gnu-print.patch patch -p1 -i ${srcdir}/2.0.0-no-unefined.patch autoreconf -fiv }