git: c6eb7a488057 - main - emulators/wine-devel: Update to Wine 6.14

[Gerald Pfeifer]

The branch main has been updated by gerald:

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

commit c6eb7a4880576471a6c76f43e197a27036f37e75
Author:     Gerald Pfeifer <gerald at FreeBSD.org>
AuthorDate: 2021-08-01 09:17:43 +0000
Commit:     Gerald Pfeifer <gerald at FreeBSD.org>
CommitDate: 2021-08-01 09:18:12 +0000

    emulators/wine-devel: Update to Wine 6.14
    
    This includes the following changes:
     - 32->64-bit thunks implemented in WOW64 dll.
     - More preparation work for the GDI syscall interface.
     - Various bug fixes.
    
    My patch files/patch-nsiproxy.sys has been accepted upstream, so
    remove our local version.
---
 emulators/wine-devel/Makefile                 |  2 +-
 emulators/wine-devel/distinfo                 | 10 +++++-----
 emulators/wine-devel/files/patch-nsiproxy.sys | 22 ----------------------
 emulators/wine-devel/pkg-plist                |  1 +
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index e660cec01861..184b526a4df8 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.13
+DISTVERSION=	6.14
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 2f1f61cc6eb4..ebf8d4d111d3 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1627722537
+SHA256 (wine-6.14.tar.xz) = 64b471939943bc08e351027db6fbc2465c139650a3bffeb91657ff0ee8c25202
+SIZE (wine-6.14.tar.xz) = 24721316
+SHA256 (v6.14.tar.gz) = 4792d3d083af6f9b9b9239df7c3b0e344ebe0cf947b689bde97a67bf37d116e4
+SIZE (v6.14.tar.gz) = 9658088
diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys b/emulators/wine-devel/files/patch-nsiproxy.sys
deleted file mode 100644
index 6d21bb33bf37..000000000000
--- a/emulators/wine-devel/files/patch-nsiproxy.sys
+++ /dev/null
@@ -1,22 +0,0 @@
-Submitted this upstream and should be in the next release.
-
-commit a89016726656776c42643a021c09ce139b0c196e
-Author: Gerald Pfeifer <gerald at pfeifer.com>
-Date:   Thu Jul 22 09:51:02 2021 +0000
-
-    nsiproxy: Include sys/socket.h
-
-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_SYS_SOCKET_H
-+#include <sys/socket.h>
-+#endif
-+
- #ifdef HAVE_NETINET_IN_H
- #include <netinet/in.h>
- #endif
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index cd3d7148c7d5..70ff3a84ec28 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -186,6 +186,7 @@ include/wine/windows/codecapi.h
 include/wine/windows/colinf.idl
 include/wine/windows/colordlg.h
 include/wine/windows/colrst.idl
+include/wine/windows/combaseapi.h
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
 include/wine/windows/commctrl.h