From 944803b7338535e78a4088671aa20270d3c13236 Mon Sep 17 00:00:00 2001
From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com>
Date: Tue, 2 Feb 2021 23:04:56 +0200
Subject: [PATCH 1/4] small update/fix to wine install script

---
 apps/Wine (x86)/install-32 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/Wine (x86)/install-32 b/apps/Wine (x86)/install-32
index 08268bb..097af28 100755
--- a/apps/Wine (x86)/install-32	
+++ b/apps/Wine (x86)/install-32	
@@ -181,3 +181,5 @@ Categories=System;" > ~/.local/share/applications/wine-explorer.desktop
 # Boot wine (make fresh wineprefix in ~/.wine
 BOX86_NOBANNER=1
 setarch linux32 -L box86 ~/wine/bin/wine wineboot
+#update the wine prefix (~/.wine) to fix the issue that causes wine to not know its system drive
+wine wineboot -u

From f8193034e1bafe644d34fa01d63a29a144982963 Mon Sep 17 00:00:00 2001
From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com>
Date: Wed, 3 Feb 2021 11:52:34 +0200
Subject: [PATCH 2/4] Update install-32

---
 apps/Wine (x86)/install-32 | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/apps/Wine (x86)/install-32 b/apps/Wine (x86)/install-32
index 097af28..6dbe750 100755
--- a/apps/Wine (x86)/install-32	
+++ b/apps/Wine (x86)/install-32	
@@ -50,7 +50,8 @@ elif echo "$vmsplit_output" | grep -q "^CONFIG_VMSPLIT_2G=y" || echo "$vmsplit_o
     echo -e "You are using a kernel with a 2G/2G memory split.\nWine will not work on such systems. What would you like to do?
 1. Switch to the 64-bit kernel (about 2 minutes)
 2. Compile a 3G/1G kernel (several hours)
-3. Exit"
+3. Install a precompiled 3g/1g kernel (might be outdated)
+4. Exit"
     read -n1 answer
     echo ''
     if [ "$answer" == 1 ];then
@@ -93,10 +94,35 @@ elif echo "$vmsplit_output" | grep -q "^CONFIG_VMSPLIT_2G=y" || echo "$vmsplit_o
       #message
       echo -e "It appears the 3G/1G kernel has been built and installed successfully.\nPlease reboot and install the Wine app again."
       sleep infinity
-    elif [ "$answer" == 3 ];then
+    elif [ "$answer" == 3 ];then 
+      #install precompiled 3g/1g kernel
+      
+      #backup ~/linux if it exists
+      rm -rf ~/linux.bak
+      [ -e ~/linux ] && (echo "$HOME/linux already exists, moving it to $HOME/linux.bak" ; mv -f ~/linux ~/linux.bak)
+      #download precompiled kernel
+      echo "Downloading precompiled kernel..."
+      wget https://github.com/Itai-Nelken/RPi-3g-1g-kernel-wine/releases/download/1/linux_rpi23_kernel_3g1g.tar.xz -O ~/3g1g-rpi-kernel.tar.xz || error "Failed to download prebuilt kernel!"
+      #extract precompiled kernel
+      echo "Extracting prebuilt kernel..."
+      tar -xf ~/3g1g-rpi-kernel.tar.xz || error "Failed to extract kernel!"
+      cd linux || error "Failed to change folder to ~/linux!"
+      #install the precompiled kernel
+      export KERNEL=kernel7
+      sudo make modules_install || error "sudo make modules_install failed!"
+      sudo cp arch/arm/boot/dts/*.dtb /boot/ || error "Failed to copy dtb files to /boot!"
+      sudo cp arch/arm/boot/dts/overlays/*.dtb* /boot/overlays/ || error "Failed to copy overlays to /boot/overlays!"
+      sudo cp arch/arm/boot/dts/overlays/README /boot/overlays/
+      sudo cp arch/arm/boot/zImage /boot/$KERNEL.img || error "Failed to copy kernel to /boot/$KERNEL.img!"
+      cd
+      rm -rf linux
+      #message
+      echo -e "It appears the precompiled 3G/1G kernel has been installed successfully.\nPlease reboot and install the Wine app again."
+      sleep infinity
+    elif [ "$answer" == 4 ];then
       exit 1
     else
-      echo "Invalid response. Must be '1', '2', or '3'."
+      echo "Invalid response. Must be '1', '2', '3' or '4'."
     fi
   done
 else

From 043ce07c3ff1e5c581466f665fc835a8a6981c73 Mon Sep 17 00:00:00 2001
From: Botspot <54716352+Botspot@users.noreply.github.com>
Date: Wed, 3 Feb 2021 09:01:36 -0600
Subject: [PATCH 3/4] slight improvement on option 3

---
 apps/Wine (x86)/install-32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/Wine (x86)/install-32 b/apps/Wine (x86)/install-32
index 6dbe750..649742f 100755
--- a/apps/Wine (x86)/install-32	
+++ b/apps/Wine (x86)/install-32	
@@ -50,7 +50,7 @@ elif echo "$vmsplit_output" | grep -q "^CONFIG_VMSPLIT_2G=y" || echo "$vmsplit_o
     echo -e "You are using a kernel with a 2G/2G memory split.\nWine will not work on such systems. What would you like to do?
 1. Switch to the 64-bit kernel (about 2 minutes)
 2. Compile a 3G/1G kernel (several hours)
-3. Install a precompiled 3g/1g kernel (might be outdated)
+3. Install a precompiled 3G/1G kernel (about 2 minutes but might be outdated)
 4. Exit"
     read -n1 answer
     echo ''

From 13791e07601bd9845974b1f4cd96e60a4ccce297 Mon Sep 17 00:00:00 2001
From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com>
Date: Wed, 3 Feb 2021 17:15:45 +0200
Subject: [PATCH 4/4] update to newer prebuilt kernel download link

---
 apps/Wine (x86)/install-32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/Wine (x86)/install-32 b/apps/Wine (x86)/install-32
index 649742f..c68c98f 100755
--- a/apps/Wine (x86)/install-32	
+++ b/apps/Wine (x86)/install-32	
@@ -102,7 +102,7 @@ elif echo "$vmsplit_output" | grep -q "^CONFIG_VMSPLIT_2G=y" || echo "$vmsplit_o
       [ -e ~/linux ] && (echo "$HOME/linux already exists, moving it to $HOME/linux.bak" ; mv -f ~/linux ~/linux.bak)
       #download precompiled kernel
       echo "Downloading precompiled kernel..."
-      wget https://github.com/Itai-Nelken/RPi-3g-1g-kernel-wine/releases/download/1/linux_rpi23_kernel_3g1g.tar.xz -O ~/3g1g-rpi-kernel.tar.xz || error "Failed to download prebuilt kernel!"
+      wget https://github.com/Itai-Nelken/RPi-3g-1g-kernel-wine/releases/download/2/rpi23_3g1g_kernel.tar.xz -O ~/3g1g-rpi-kernel.tar.xz || error "Failed to download prebuilt kernel!"
       #extract precompiled kernel
       echo "Extracting prebuilt kernel..."
       tar -xf ~/3g1g-rpi-kernel.tar.xz || error "Failed to extract kernel!"