From a329654c83cf8035720d11789ed0ccb9b57c8195 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 12 Jul 2025 10:20:56 +0200 Subject: [PATCH] Adapt to WOW64 Wine transition --- .SRCINFO | 2 +- PKGBUILD | 2 +- mingw-msiexec.sh | 11 +---------- mingw-wine.sh | 11 +---------- mingw-winepath.sh | 11 +---------- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3d47d1f..fa7090e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = mingw-w64-wine pkgdesc = Wine wrapper for MinGW (mingw-w64) pkgver = 1 - pkgrel = 10 + pkgrel = 11 url = http://fedoraproject.org/wiki/MinGW arch = any license = MIT diff --git a/PKGBUILD b/PKGBUILD index 3bc518d..44b4b7b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mingw-w64-wine pkgver=1 -pkgrel=10 +pkgrel=11 arch=('any') pkgdesc="Wine wrapper for MinGW (mingw-w64)" # https://bugs.archlinux.org/task/77413 diff --git a/mingw-msiexec.sh b/mingw-msiexec.sh index ca15837..ff75337 100644 --- a/mingw-msiexec.sh +++ b/mingw-msiexec.sh @@ -2,19 +2,10 @@ set -e -mingw_prefix=/usr/@TRIPLE@ - # run it in a custom WINEPREFIX to not mess with default ~/.wine -# also default prefix might be a 32 bits prefix, which will fail to run x86_64 exes +mingw_prefix=/usr/@TRIPLE@ export WINEPREFIX=${HOME}/.wine-@TRIPLE@ -if test "@TRIPLE@" = "x86_64-w64-mingw32" -then - export WINEARCH=win64 -else - export WINEARCH=win32 -fi - if test -z ${WINEDLLOVERRIDES+x} then export WINEDLLOVERRIDES="mscoree,mshtml=" diff --git a/mingw-wine.sh b/mingw-wine.sh index 5809c71..1c7d6bd 100644 --- a/mingw-wine.sh +++ b/mingw-wine.sh @@ -2,10 +2,8 @@ set -e -mingw_prefix=/usr/@TRIPLE@ - # run it in a custom WINEPREFIX to not mess with default ~/.wine -# also default prefix might be a 32 bits prefix, which will fail to run x86_64 exes +mingw_prefix=/usr/@TRIPLE@ export WINEPREFIX=${HOME}/.wine-@TRIPLE@ # WINEPATH is used to find dlls, otherwise they should lie next to the exe @@ -14,13 +12,6 @@ then export WINEPATH=${mingw_prefix}/bin fi -if test "@TRIPLE@" = "x86_64-w64-mingw32" -then - export WINEARCH=win64 -else - export WINEARCH=win32 -fi - if test -z ${WINEDLLOVERRIDES+x} then export WINEDLLOVERRIDES="mscoree,mshtml=" diff --git a/mingw-winepath.sh b/mingw-winepath.sh index ebbaa3b..b593f12 100644 --- a/mingw-winepath.sh +++ b/mingw-winepath.sh @@ -2,10 +2,8 @@ set -e -mingw_prefix=/usr/@TRIPLE@ - # run it in a custom WINEPREFIX to not mess with default ~/.wine -# also default prefix might be a 32 bits prefix, which will fail to run x86_64 exes +mingw_prefix=/usr/@TRIPLE@ export WINEPREFIX=${HOME}/.wine-@TRIPLE@ # WINEPATH is used to find dlls, otherwise they should lie next to the exe @@ -14,13 +12,6 @@ then export WINEPATH=${mingw_prefix}/bin fi -if test "@TRIPLE@" = "x86_64-w64-mingw32" -then - export WINEARCH=win64 -else - export WINEARCH=win32 -fi - if test -z ${WINEDLLOVERRIDES+x} then export WINEDLLOVERRIDES="mscoree,mshtml=" -- 2.50.1