From 0170fddb578a1cd67e9b79dd47d999206d0a4f13 Mon Sep 17 00:00:00 2001
From: VHSgunzo <wosganzo@gmail.com>
Date: Tue, 2 Jan 2024 15:15:13 +0300
Subject: [PATCH] Fix prefix restore on first run with -init

---
 CHANGELOG.md        |  6 ++++++
 lux-wine            |  3 +--
 lwrap/PKGBUILD      |  2 +-
 lwrap/lwrap.install | 12 ++++++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c01535..3f55e8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.78.2.3
+
+* Update [lwrun](https://huggingface.co/lux-wine/lwrun/tree/main/releases/v0.39.1) packages
+* Revert/replace `mesa-tkg-git` with `mesa` in `lwrun`
+* Fix prefix restore on first run with `-init`
+
 # v0.78.2.2
 
 * Add ability to create config for `msi`, `reg`, `bat` and `lnk`
diff --git a/lux-wine b/lux-wine
index 1ebb4f0..e6e6116 100755
--- a/lux-wine
+++ b/lux-wine
@@ -6205,8 +6205,7 @@ lu_pfxrestore() {
                     [ "$DEFPFXRESTORE" == 1 ] && \
                         PFXRESTORE_MSG="The default prefix is not initialized! \nDo you want to restore the default prefix from the backup?"||\
                         PFXRESTORE_MSG="Are you sure you want to restore this prefix backup image?"
-                    if [[ "$DEFPFXRESTORE" == 1 && "$NETSTATUS" == 0 ]]|| \
-                        [[ "$DEFPFXRESTORE" == 1 && "$FIRST_RUN" == 1 ]]||\
+                    if ([ "$DEFPFXRESTORE" == 1 ] && (is_first_run||[ "$NETSTATUS" == 0 ]))||\
                         print_question "Prefix restore" "${PFXRESTORE_MSG}\n[ $LU_LWPFX ]"
                         then
                             pfxrestore||return 1
diff --git a/lwrap/PKGBUILD b/lwrap/PKGBUILD
index f4287f1..14ca034 100644
--- a/lwrap/PKGBUILD
+++ b/lwrap/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='lwrap'
 pkgver='0.78.2'
-pkgrel='2'
+pkgrel='3'
 pkgdesc='Lux Wine wrapper for RunImage container'
 arch=('x86_64')
 url='https://github.com/VHSgunzo/lux-wine'
diff --git a/lwrap/lwrap.install b/lwrap/lwrap.install
index 6cdc9f9..216cdbd 100644
--- a/lwrap/lwrap.install
+++ b/lwrap/lwrap.install
@@ -37,8 +37,16 @@ post_upgrade() {
     pac -Q zenity 2>/dev/null|grep -q '4.0.0' && \
     pkg_tool 'yes|sudo downgrade zenity=3.44.2'
 
-    pac -Q mesa 2>/dev/null|grep -q '23.3.2' && \
-    pkg_tool 'yes|pac -Sy mesa-tkg-git && yes|pac -S lib32-mesa-tkg-git'
+    if pac -Q lib32-mesa-tkg-git &>/dev/null
+       then
+            pkg_tool 'yes|pac -Rsndd mesa-tkg-git lib32-mesa-tkg-git'
+            pkg_tool 'yes|pac -S mesa vulkan-swrast libva-mesa-driver mesa-vdpau vulkan-mesa-layers \
+                vulkan-intel vulkan-radeon lib32-mesa lib32-vulkan-swrast lib32-libva-mesa-driver \
+                lib32-mesa-vdpau lib32-vulkan-mesa-layers lib32-vulkan-intel lib32-vulkan-radeon'
+    fi
+
+    pac -Q vulkan-virtio &>/dev/null && \
+    pkg_tool 'yes|pac -Rdd vulkan-virtio lib32-vulkan-virtio'
 
     return 0
 }