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 @@
wine
WINE Is Not An Emulator, which lets you run Microsoft Windows applications
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.
- https://dl.winehq.org/wine/source/7.x/wine-7.17.tar.xz
+ https://dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz
mit-kerberos
lcms2-devel
@@ -221,7 +221,6 @@
glib2-32bit
vkd3d-32bit
lcms2-32bit
- libusb-32bit
libSM-32bit
p11-kit-32bit
giflib-32bit
@@ -296,6 +295,13 @@
+
+ 2022-09-25
+ 7.18
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2022-09-23
7.17