From e9df248844b1a793b56478bebdc46bc53acd0d80 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Sat, 14 Oct 2023 20:31:55 -0400 Subject: [PATCH] Revert "Wine (x86/x64): update to 8.18" This reverts commit a79287ca3a045e11e9e8d512142a230ac1fe9836. Build hangs on install on arm64. Will investigate later. --- apps/Wine (x64)/description | 2 +- apps/Wine (x64)/install-64 | 2 +- apps/Wine (x64)/uninstall | 2 +- apps/Wine (x86)/description | 2 +- apps/Wine (x86)/install-32 | 2 +- apps/Wine (x86)/uninstall | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/Wine (x64)/description b/apps/Wine (x64)/description index a383285f45..ca6b18ba24 100644 --- a/apps/Wine (x64)/description +++ b/apps/Wine (x64)/description @@ -1,4 +1,4 @@ -Run x86 and x64 Windows apps with a box64-emulated version x86/x64 wine-8.18 (WOW64 mode enabled). +Run x86 and x64 Windows apps with a box64-emulated version x86/x64 wine-8.17 (WOW64 mode enabled). To run: wine path/to/file.exe To configure wine: go to 'Wine configuration' in main menu or type in terminal: wine winecfg Not all Windows applications will work under Wine. It's a good idea to check online if your program can run, or if something can be tweaked to make it work. diff --git a/apps/Wine (x64)/install-64 b/apps/Wine (x64)/install-64 index e3f6a48c5e..7ce86f0af8 100755 --- a/apps/Wine (x64)/install-64 +++ b/apps/Wine (x64)/install-64 @@ -1,7 +1,7 @@ #!/bin/bash #note to maintainer, if you change the below version make sure to update it in the uninstall script as well -version=8.18 +version=8.17 #install box64 "${DIRECTORY}/manage" install-if-not-installed Box64 || error "Box64 failed to install somehow!" diff --git a/apps/Wine (x64)/uninstall b/apps/Wine (x64)/uninstall index d9041eff7c..e5fae64b6e 100755 --- a/apps/Wine (x64)/uninstall +++ b/apps/Wine (x64)/uninstall @@ -1,6 +1,6 @@ #!/bin/bash -version=8.18 +version=8.17 pkill -9 wine command -v wineserver >/dev/null && wineserver -k diff --git a/apps/Wine (x86)/description b/apps/Wine (x86)/description index 5998e760b6..688c3dd210 100644 --- a/apps/Wine (x86)/description +++ b/apps/Wine (x86)/description @@ -1,4 +1,4 @@ -Run x86 Windows apps with a box86-emulated version of x86 wine-8.18. +Run x86 Windows apps with a box86-emulated version of x86 wine-8.17. To run: wine path/to/file.exe To configure wine: go to 'Wine configuration' in main menu or type in terminal: wine winecfg Not all Windows applications will work under Wine. It's a good idea to check online if your program can run, or if something can be tweaked to make it work. diff --git a/apps/Wine (x86)/install-32 b/apps/Wine (x86)/install-32 index a719df0ce6..3733285fa5 100755 --- a/apps/Wine (x86)/install-32 +++ b/apps/Wine (x86)/install-32 @@ -132,7 +132,7 @@ fi #Past this point, the pi is running a Wine-compatible kernel. #note to maintainer, if you change the below version make sure to update it in the uninstall script as well -version=8.18 +version=8.17 #install box86 "${DIRECTORY}/manage" install-if-not-installed Box86 || error "Box86 failed to install somehow!" diff --git a/apps/Wine (x86)/uninstall b/apps/Wine (x86)/uninstall index 72365ffe99..5bc9e91820 100755 --- a/apps/Wine (x86)/uninstall +++ b/apps/Wine (x86)/uninstall @@ -1,6 +1,6 @@ #!/bin/bash -version=8.18 +version=8.17 pkill -9 wine command -v wineserver >/dev/null && wineserver -k