mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-19 00:13:33 +00:00
Code Issues Releases Activity

emulators/wine: Unbreak WoW64 again

Browse Source 
Restore files/patch-dlls_ntdll_unix_loader.c which we "lost" with the
update to Wine 9.0 by means of an updated version based on a version
for emulators/wine-devel by Alex S <iwtcex@gmail.com> in PR 278525.

PR:		278427
This commit is contained in:
Gerald Pfeifer 2024-05-10 07:54:52 +00:00
parent aa5d7efa8a
commit 3bde6b5aee
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emulators/wine/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= wine
DISTVERSION= 9.0
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/9.0/

25
emulators/wine/files/patch-dlls_ntdll_unix_loader.c Normal file
View File

@ -0,0 +1,25 @@
--- UTC
--- dlls/ntdll/unix/loader.c.orig 2024-01-16 20:55:47
+++ dlls/ntdll/unix/loader.c 2024-05-10 07:03:04
@@ -480,6 +480,21 @@
if (machine == current_machine) return NULL;
+ char* wineserver_path = getenv("WINESERVER");
+ if (wineserver_path != NULL && wineserver_path[0] == '/') {
+ char* s = remove_tail(wineserver_path, "server");
+ if (s != NULL) {
+ if (machine == IMAGE_FILE_MACHINE_AMD64) {
+ ret = malloc(strlen(s) + 3);
+ strcpy(ret, s);
+ strcat(ret, "64");
+ } else {
+ ret = s;
+ }
+ return ret;
+ }
+ }
+
if (machine == IMAGE_FILE_MACHINE_AMD64) /* try the 64-bit loader */
{
size_t len = strlen(wineloader);