summaryrefslogtreecommitdiff
path: root/emulators/wine-devel/files
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan.jov@gmail.org>2022-11-16 08:59:10 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2022-11-16 08:59:10 +0000
commitaeaeb81611c8ae553ab3ca3dece0c857b5746051 (patch)
treebff7320572f35cdaa5de15f0df0434b0c31cd1ab /emulators/wine-devel/files
parentgraphics/sciplot: Move to science/sciplot (diff)
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.
Diffstat (limited to 'emulators/wine-devel/files')
-rw-r--r--emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c49
1 files changed, 0 insertions, 49 deletions
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;
- }
-