diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-09-16 21:54:47 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-09-16 21:57:50 +0000 |
| commit | a02e3c6686d68350132a88379fc3d99445b9b80d (patch) | |
| tree | 8e4f9dd021045358f5cf2ca7d9b68b3bbc44d20a /emulators/wine-devel/files | |
| parent | graphics/libcdr01: remove staled patch after 7e9b8f8afae0 (diff) | |
emulators/wine-devel: Update to Wine 6.17
This includes the following changes:
- WineCfg program converted to PE.
- Better high-DPI support in builtin applications.
- More preparation work for the GDI syscall interface.
- Improved debugger support in Wow64 mode.
- Various bug fixes.
My patch files/patch-dlls-nsiproxy.sys has been accepted upstream,
so remove it on our end.
Work around FreeBSD calling x86-64 by the name of amd64 and the
Ports Collection using this in a variable ARCH, which interferes
with Wine's variable of the same name and messes things up badly.
I have hope to be able to upstream files/patch-amd64-vs-x86-64. [1]
PR: 257020 [1]
Inspired by: Ivan Rozhuk <rozhuk.im@gmail.com> [1]
Diffstat (limited to 'emulators/wine-devel/files')
| -rw-r--r-- | emulators/wine-devel/files/patch-amd64-vs-x86-64 | 17 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls-nsiproxy.sys | 31 |
2 files changed, 17 insertions, 31 deletions
diff --git a/emulators/wine-devel/files/patch-amd64-vs-x86-64 b/emulators/wine-devel/files/patch-amd64-vs-x86-64 new file mode 100644 index 000000000000..d20d34baca1b --- /dev/null +++ b/emulators/wine-devel/files/patch-amd64-vs-x86-64 @@ -0,0 +1,17 @@ +index 59857762edd..ed7a58ed1f9 100644 +--- tools/makedep.c ++++ tools/makedep.c +@@ -4446,6 +4446,13 @@ int main( int argc, char *argv[] ) + if (!man_ext) man_ext = "3w"; + if (arch) + { ++ /* For historic reasons FreeBSD calls x86-64 by the name of amd64 ++ * and features a variable ARCH with that value in the environment ++ * when building ports. This breaks Wine in interesting ways, so ++ * revert to the industry standard name when we enouncter amd64. ++ */ ++ if ( !strcmp(arch,"amd64") ) ++ arch = "x86-64"; + so_dir = strmake( "$(dlldir)/%s-unix", arch ); + pe_dir = strmake( "$(dlldir)/%s-windows", arch ); + } diff --git a/emulators/wine-devel/files/patch-dlls-nsiproxy.sys b/emulators/wine-devel/files/patch-dlls-nsiproxy.sys deleted file mode 100644 index 73c77e1aee35..000000000000 --- a/emulators/wine-devel/files/patch-dlls-nsiproxy.sys +++ /dev/null @@ -1,31 +0,0 @@ -Yet another recent breakage in dlls/nsiproxy.sys, yet another patch -submitted upstream. - -Plus I've adjusted my autobuilders to focus on newer versions of FreeBSD. - - -commit cd10f9b73cdae715e4a1ef32ade50c65a097ebf1 -Author: Gerald Pfeifer <gerald@FreeBSD.org> -Date: Mon Sep 6 17:54:53 2021 +0000 - - nsiproxy: Include sys/param.h from udp.c. - - udp.c features specific code to handle versions of FreeBSD past early - 12.0 snapshots. This is guarded by a check on __FreeBSD_version which - is defined in sys/param.h. Actually including that, like tcp.c already - does, activates that check and adjusted code and unbreaks the build. - ---- UTC ---- dlls/nsiproxy.sys/udp.c -+++ dlls/nsiproxy.sys/udp.c -@@ -22,6 +22,10 @@ - #include <stdarg.h> - #include <stddef.h> - -+#ifdef HAVE_SYS_PARAM_H -+#include <sys/param.h> -+#endif -+ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif |