From 56510d6f4e2fd1a0b07a16bd9d6ce07831484653 Mon Sep 17 00:00:00 2001
From: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:03:01 -0400
Subject: [PATCH] Wine (x86/x64): update to 8.18 (reland)

box64 bug that caused wineboot to hang has been fixed with https://github.com/ptitSeb/box64/commit/d9a4fed2f81a5880d732ee99e846ed284f190366
---
 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 ca6b18ba24..a383285f45 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.17 (WOW64 mode enabled).
+Run x86 and x64 Windows apps with a box64-emulated version x86/x64 wine-8.18 (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 0484c07afd..811d8991bc 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.17
+version=8.18
 
 # https://github.com/raspberrypi/bookworm-feedback/issues/107
 PAGE_SIZE="$(getconf PAGE_SIZE)"
diff --git a/apps/Wine (x64)/uninstall b/apps/Wine (x64)/uninstall
index e5fae64b6e..d9041eff7c 100755
--- a/apps/Wine (x64)/uninstall	
+++ b/apps/Wine (x64)/uninstall	
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=8.17
+version=8.18
 
 pkill -9 wine
 command -v wineserver >/dev/null && wineserver -k
diff --git a/apps/Wine (x86)/description b/apps/Wine (x86)/description
index 688c3dd210..5998e760b6 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.17.
+Run x86 Windows apps with a box86-emulated version of x86 wine-8.18.
 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 3733285fa5..a719df0ce6 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.17
+version=8.18
 
 #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 5bc9e91820..72365ffe99 100755
--- a/apps/Wine (x86)/uninstall	
+++ b/apps/Wine (x86)/uninstall	
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=8.17
+version=8.18
 
 pkill -9 wine
 command -v wineserver >/dev/null && wineserver -k