From e7243f4f39ec2f5899cf897b30018be2110605b1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 8 Nov 2021 09:10:54 +0100
Subject: [PATCH] wine: update to 6.21.

---
 srcpkgs/wine/patches/musl-limits.patch       |  4 +-
 srcpkgs/wine/patches/musl-ns_name_skip.patch | 48 --------------------
 srcpkgs/wine/patches/musl-uid-t.patch        |  4 +-
 srcpkgs/wine/template                        |  6 +--
 4 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/wine/patches/musl-ns_name_skip.patch

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 525b2615de6..520be713ea0 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-6.20/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-6.20/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-6.21/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-6.21/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-ns_name_skip.patch b/srcpkgs/wine/patches/musl-ns_name_skip.patch
deleted file mode 100644
index 6ab72d412a3..00000000000
--- a/srcpkgs/wine/patches/musl-ns_name_skip.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c
-index ac52147..0f8c2ef 100644
---- a/wine-6.20/dlls/dnsapi/libresolv.c
-+++ b/wine-6.20/dlls/dnsapi/libresolv.c
-@@ -57,6 +57,43 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(dnsapi);
- 
-+/* code from glibc's resolv/ns_name.c, with errno setting removed */
-+/*%
-+ *	Advance *ptrptr to skip over the compressed name it points at.
-+ *
-+ * return:
-+ *\li	0 on success, -1 (with errno set) on failure.
-+ */
-+#ifndef __GLIBC__
-+static int
-+ns_name_skip(const u_char **ptrptr, const u_char *eom)
-+{
-+	const u_char *cp;
-+	u_int n;
-+
-+	cp = *ptrptr;
-+	while (cp < eom && (n = *cp++) != 0) {
-+		/* Check for indirection. */
-+		switch (n & NS_CMPRSFLGS) {
-+		case 0:			/*%< normal case, n == len */
-+			cp += n;
-+			continue;
-+		case NS_CMPRSFLGS:	/*%< indirection */
-+			cp++;
-+			break;
-+		default:		/*%< illegal type */
-+			return (-1);
-+		}
-+		break;
-+	}
-+	if (cp > eom) {
-+		return (-1);
-+	}
-+	*ptrptr = cp;
-+	return (0);
-+}
-+#endif
-+
- static const char *debugstr_type( unsigned short type )
- {
-     const char *str;
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 8e8eaaf5598..9fb95cc03b0 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-6.20/server/security.h	2021-10-12 19:52:55.876645306 +0200
-+++ b/wine-6.20/server/security.h	2021-10-12 19:53:08.605490926 +0200
+--- a/wine-6.21/server/security.h	2021-10-12 19:52:55.876645306 +0200
++++ b/wine-6.21/server/security.h	2021-10-12 19:53:08.605490926 +0200
 @@ -21,6 +21,8 @@
  #ifndef __WINE_SERVER_SECURITY_H
  #define __WINE_SERVER_SECURITY_H
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index b752200cab6..d2b914e1115 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=6.20
+version=6.21
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471
- 360fd304a0f4c12e3aa149dde0bc3ac7a2c8787740e1f228bd13158f855166ea"
+checksum="f7b67572b52a7150f3dcc43318b40cf10425171319edf6368a60274642e079ce
+ df986de7d6ce6536c18bba4dbeab05e2bd199cfa73e3194fd6c805cdc6d51dfd"
 
 build_options="mingw staging"
 build_options_default="mingw"