git: 21a122d5c9e6 - main - emulators/wine-devel: Update to Wine 6.13

[Gerald Pfeifer]

The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=21a122d5c9e6dcd9df1c91bb3b2d41515cae6a0a

commit 21a122d5c9e6dcd9df1c91bb3b2d41515cae6a0a
Author:     Gerald Pfeifer <gerald at FreeBSD.org>
AuthorDate: 2021-07-22 17:02:21 +0000
Commit:     Gerald Pfeifer <gerald at FreeBSD.org>
CommitDate: 2021-07-22 17:03:00 +0000

    emulators/wine-devel: Update to Wine 6.13
    
    This includes the following changes:
     - Proper scrollbar theming.
     - More work towards WinSock PE conversion.
     - Preparation work for the GDI syscall interface.
     - Some progress on the IPHLPAPI PE conversion.
     - Various bug fixes.
    
    My patch from files/patch-nsiproxy.sys has been included upstream,
    alas new breakage has been introduced in dlls/nsiproxy.sys, so
    "refresh" that with another patch.
    
    The STAGING option now patches again; no longer mark it as broken.
---
 emulators/wine-devel/Makefile                 |  3 +--
 emulators/wine-devel/distinfo                 | 10 +++++-----
 emulators/wine-devel/files/patch-nsiproxy.sys | 28 +++++++++++++--------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 21837f23aeb5..0af6a06f0343 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Gerald Pfeifer <gerald at FreeBSD.org>
 
 PORTNAME=	wine
-DISTVERSION=	6.12
+DISTVERSION=	6.13
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -100,7 +100,6 @@ SDL_CONFIGURE_WITH=	sdl
 SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 
-STAGING_BROKEN=		fails to patch
 STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
 STAGING_DIST=		v${DISTVERSION}.tar.gz
 STAGING_DISTFILES=	${STAGING_DIST}:staging
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 1ff7572cb8d4..2f1f61cc6eb4 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1625401429
-SHA256 (wine-6.12.tar.xz) = fb92be300edf8039623f138383cb3908c95b2d4b9a490e2a0823b24c56b7cea8
-SIZE (wine-6.12.tar.xz) = 24666960
-SHA256 (v6.12.tar.gz) = 2a1db3a4ffaed01a523f1409da0dcedb8059c33d9b6835efd97b0fb3c8b657c7
-SIZE (v6.12.tar.gz) = 9658338
+TIMESTAMP = 1626945429
+SHA256 (wine-6.13.tar.xz) = e03a21a011d45d2ae9f222040fb7690b97156376e7431f861f20073eaf24f28a
+SIZE (wine-6.13.tar.xz) = 24704408
+SHA256 (v6.13.tar.gz) = 884e698cc07ba11f7189145508941a6400384d53005e148655f321070ee1e8c4
+SIZE (v6.13.tar.gz) = 9658122
diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys b/emulators/wine-devel/files/patch-nsiproxy.sys
index fa837bc5d5e5..6d21bb33bf37 100644
--- a/emulators/wine-devel/files/patch-nsiproxy.sys
+++ b/emulators/wine-devel/files/patch-nsiproxy.sys
@@ -1,22 +1,22 @@
-This patch of mine has been included upstream in the meantime.
+Submitted this upstream and should be in the next release.
 
-commit 1fc3d75a17b025bcdb818714db47a37c309ea186
+commit a89016726656776c42643a021c09ce139b0c196e
 Author: Gerald Pfeifer <gerald at pfeifer.com>
-Date:   Sat Jul 3 06:55:06 2021 +0000
+Date:   Thu Jul 22 09:51:02 2021 +0000
 
-    nsiproxy: Include netinet/in.h before if_ether.h
+    nsiproxy: Include sys/socket.h
 
-index 647fd650cd3..7a0e7ec6f6c 100644
---- dlls/nsiproxy.sys/ndis.c
-+++ dlls/nsiproxy.sys/ndis.c
-@@ -38,6 +38,10 @@
- #include <net/if_arp.h>
- #endif
+index ab1b6294bea..93fdefa24cc 100644
+--- dlls/nsiproxy.sys/ip.c
++++ dlls/nsiproxy.sys/ip.c
+@@ -21,6 +21,10 @@
+ #include "config.h"
+ #include <stdarg.h>
  
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
 +#endif
 +
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <netinet/if_ether.h>
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
  #endif