From f949f9a5b8d0bd50ecb4d60dd7e58c4f72b3b223 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sun, 25 Sep 2022 13:38:07 +0300
Subject: [PATCH] wine-7.18

---
 hardware/emulator/wine/actions.py |  5 +++--
 hardware/emulator/wine/pspec.xml  | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hardware/emulator/wine/actions.py b/hardware/emulator/wine/actions.py
index 561589be88..b266476515 100644
--- a/hardware/emulator/wine/actions.py
+++ b/hardware/emulator/wine/actions.py
@@ -38,6 +38,7 @@ def setup():
                --with-dbus \
                --with-opengl \
                --with-alsa \
+               --prefix=/usr \
                --with-x \
                "
 
@@ -72,9 +73,9 @@ def install():
     shelltools.cd("build-wine")
 
     if get.buildTYPE() == "emul32":
-        autotools.install("UPDATE_DESKTOP_DATABASE=/bin/true libdir=%s/usr/lib32 dlldir=%s/usr/lib32/wine" % (get.installDIR(), get.installDIR()))
+        autotools.install("LDCONFIG=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true prefix=%s/usr libdir=%s/usr/lib32 dlldir=%s/usr/lib32/wine" % (get.installDIR(), get.installDIR(), get.installDIR()))
     else:
-        autotools.install("UPDATE_DESKTOP_DATABASE=/bin/true libdir=%s/usr/lib dlldir=%s/usr/lib/wine" % (get.installDIR(), get.installDIR()))
+        autotools.install("LDCONFIG=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true prefix=%s/usr libdir=%s/usr/lib dlldir=%s/usr/lib/wine" % (get.installDIR(), get.installDIR(), get.installDIR()))
         
     shelltools.cd("..")
 
diff --git a/hardware/emulator/wine/pspec.xml b/hardware/emulator/wine/pspec.xml
index c9230021be..1e7516740c 100755
--- a/hardware/emulator/wine/pspec.xml
+++ b/hardware/emulator/wine/pspec.xml
@@ -13,7 +13,7 @@
         <Icon>wine</Icon>
         <Summary>WINE Is Not An Emulator, which lets you run Microsoft Windows applications</Summary>
         <Description>Wine allows running Windows 3.*, Windows 95/98 and Windows NT programs on a i386 (or compatible) machine running X11. It is still alpha level code; don't expect everything to work.</Description>
-        <Archive sha1sum="290237bdfab3e8130f2a905f60908062ec7eeb28" type="tarxz">https://dl.winehq.org/wine/source/7.x/wine-7.17.tar.xz</Archive>
+        <Archive sha1sum="469a09017a67539773228cb369543e4dd240a30d" type="tarxz">https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>mit-kerberos</Dependency>
             <Dependency>lcms2-devel</Dependency>
@@ -221,7 +221,6 @@
             <Dependency>glib2-32bit</Dependency>
             <Dependency>vkd3d-32bit</Dependency>
             <Dependency>lcms2-32bit</Dependency>
-            <Dependency>libusb-32bit</Dependency>
             <Dependency>libSM-32bit</Dependency>
             <Dependency>p11-kit-32bit</Dependency>
             <Dependency>giflib-32bit</Dependency>
@@ -296,6 +295,13 @@
     </Package>
 
     <History>
+        <Update release="22">
+            <Date>2022-09-25</Date>
+            <Version>7.18</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="21">
             <Date>2022-09-23</Date>
             <Version>7.17</Version>