diff options
| author | Damjan Jovanovic <damjan.jov@gmail.org> | 2022-11-16 08:59:10 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2022-11-16 08:59:10 +0000 |
| commit | aeaeb81611c8ae553ab3ca3dece0c857b5746051 (patch) | |
| tree | bff7320572f35cdaa5de15f0df0434b0c31cd1ab | |
| parent | 2763db8a01fdfcb11b68c4748667f00a1a7f51eb (diff) | |
| download | ports-aeaeb81611c8ae553ab3ca3dece0c857b5746051.tar.gz ports-aeaeb81611c8ae553ab3ca3dece0c857b5746051.zip | |
emulators/wine-devel: update to Wine 7.20
This includes the following changes:
- Font linking improvements.
- A number of fixes for exception unwinding.
- Support for dumping EMF spool files in WineDump.
- Various bug fixes.
files/patch-dlls-ntdll-unix-file.c has been merged upstream; drop it.
| -rw-r--r-- | emulators/wine-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 10 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c | 49 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 1 |
4 files changed, 7 insertions, 55 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index dac92e814d72..02538d4ec65b 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine -DISTVERSION= 7.19 +DISTVERSION= 7.20 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/7.x/ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index f6c2aa68d70f..b5d7d63de6d2 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1666968876 -SHA256 (wine-7.19.tar.xz) = 43ac497e6e1d7fded492c32a68b554c57b76f2be8dc787e7335a0dd4e68b9d21 -SIZE (wine-7.19.tar.xz) = 28502612 -SHA256 (v7.19.tar.gz) = 83347f27a77685f6c4b08a171a432254d93f797b1a9457276bba2ddd21c60840 -SIZE (v7.19.tar.gz) = 9523048 +TIMESTAMP = 1667271216 +SHA256 (wine-7.20.tar.xz) = 751b79f22b5a9f72c9ec15f755b00b13d3ed073e9168c3ef4adabd9db37d0d50 +SIZE (wine-7.20.tar.xz) = 28534920 +SHA256 (v7.20.tar.gz) = d3210cf8e8c75c7dba63dce9af014fae2664078c00baaff85eb878df81e421ed +SIZE (v7.20.tar.gz) = 9521481 diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c b/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c deleted file mode 100644 index 4bb1325af847..000000000000 --- a/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c +++ /dev/null @@ -1,49 +0,0 @@ -commit d7541508936b9ed776e8a39a0bc2a4cc875514d3 -Author: Gerald Pfeifer <gerald@pfeifer.com> -Date: Tue Oct 18 23:41:49 2022 +0200 - - ntdll: Fix build on systems without ENODATA. - - On FreeBSD 12 and 14 ENODATA is not regularly defined. Cater to that - in fd_get_file_info() and get_file_info(). - -diff --git dlls/ntdll/unix/file.c dlls/ntdll/unix/file.c -index c7ba12a5c13..8a599a289f8 100644 ---- dlls/ntdll/unix/file.c -+++ dlls/ntdll/unix/file.c -@@ -1565,10 +1565,15 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON - attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); - if (attr_len != -1) - *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); -- else if (errno != ENODATA && errno != ENOTSUP) -+ else -+ { -+ if (errno == ENOTSUP) return ret; -+#ifdef ENODATA -+ if (errno == ENODATA) return ret; -+#endif - WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", - errno, strerror( errno ) ); -- -+ } - return ret; - } - -@@ -1653,10 +1658,15 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) - attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); - if (attr_len != -1) - *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); -- else if (errno != ENODATA && errno != ENOTSUP) -+ else -+ { -+ if (errno == ENOTSUP) return ret; -+#ifdef ENODATA -+ if (errno == ENODATA) return ret; -+#endif - WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", - path, errno, strerror( errno ) ); -- -+ } - return ret; - } - diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 05ee476fc93c..cefb49c6b102 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -595,6 +595,7 @@ include/wine/windows/mediaobj.h include/wine/windows/mediaobj.idl include/wine/windows/medparam.h include/wine/windows/medparam.idl +include/wine/windows/memoryapi.h include/wine/windows/metahost.h include/wine/windows/metahost.idl include/wine/windows/mfapi.h |