From cd1d45170bc1db4ac9af3550f23bd636355df948 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike@cchtml.com>
Date: Sun, 15 Oct 2023 14:47:10 -0500
Subject: [PATCH] Update to 8.18

---
 sources   |  6 +++---
 wine.spec | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/sources b/sources
index 4914460..0102728 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-8.17.tar.xz) = 3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
-SHA512 (wine-8.17.tar.xz.sign) = 37b34ac554fa614f28199b65d2ec6798d7e87f45ad1c7dee22af27ec8c13c2fadea56ca2b94a888ad3b5ec1d9b796c367a9ebcff60dc9f233a69b7a94edde2d7
-SHA512 (wine-staging-8.17.tar.gz) = 699d3caec080686986a3b66a6c905d4542a3f06a12def3f30ad9d97484c9a0c2ba00ab81ae75a8ec83eaad0ef8029fcc702ac2c1f0a46c60118b9e451afe7613
+SHA512 (wine-8.18.tar.xz) = 0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
+SHA512 (wine-8.18.tar.xz.sign) = a474013e2ebe8643670421b047c26829238a274bd30ca4bcd3cd07c530afb3e50956e186c25a01e03986345299d664bd9a2fa0e790b0a14d2a6acb3cdd5187d9
+SHA512 (wine-staging-8.18.tar.gz) = 1016849b3381a3ac039c2376517a5c7857f632eb1e49e9e3d6feedbc8c4e182da1a7117e89a1a1e4798121176e04b8f91cf3f3c001abf767398a3c3cd38850fb
diff --git a/wine.spec b/wine.spec
index de46309..28ce66d 100644
--- a/wine.spec
+++ b/wine.spec
@@ -40,7 +40,7 @@
 %endif
 
 Name:           wine
-Version:        8.17
+Version:        8.18
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -688,9 +688,7 @@ gzip -dc %{SOURCE900} | tar -xf - --strip-components=1
 
 # https://bugs.winehq.org/show_bug.cgi?id=54868
 sed -i 's/DWORD pitch_in, DWORD pitch_out/unsigned int pitch_in, unsigned int pitch_out/' patches/wined3d-WINED3DFMT_B8G8R8X8_UNORM/0001-wined3d-Implement-WINED3DFMT_B8G8R8X8_UNORM-to-WINED.patch
-# https://bugs.winehq.org/show_bug.cgi?id=55695
-staging/patchinstall.py DESTDIR="`pwd`" --all \
-  -W eventfd_synchronization
+staging/patchinstall.py DESTDIR="`pwd`" --all
 
 %endif
 # 0%%{?wine_staging}
@@ -767,10 +765,7 @@ unset PKG_CONFIG_PATH
 
 %install
 
-%makeinstall \
-        includedir=%{buildroot}%{_includedir} \
-        sysconfdir=%{buildroot}%{_sysconfdir}/wine \
-        dlldir=%{buildroot}%{_libdir}/wine \
+%make_install \
         LDCONFIG=/bin/true \
         UPDATE_DESKTOP_DATABASE=/bin/true
 
@@ -1694,15 +1689,18 @@ fi
 %{_libdir}/wine/%{winepedir}/windows.gaming.ui.gamebar.dll
 %{_libdir}/wine/%{winepedir}/windows.gaming.input.dll
 %{_libdir}/wine/%{winepedir}/windows.globalization.dll
-%{_libdir}/wine/%{winepedir}/windows.media.speech.dll
 %{_libdir}/wine/%{winepedir}/windows.media.dll
 %{_libdir}/wine/%{winepedir}/windows.media.devices.dll
+%{_libdir}/wine/%{winepedir}/windows.media.mediacontrol.dll
+%{_libdir}/wine/%{winepedir}/windows.media.speech.dll
 %if 0%{?wine_staging}
 %{_libdir}/wine/%{winepedir}/windows.networking.connectivity
 %endif
 %{_libdir}/wine/%{winepedir}/windows.networking.dll
 %{_libdir}/wine/%{winepedir}/windows.networking.hostname.dll
 %{_libdir}/wine/%{winepedir}/windows.perception.stub.dll
+%{_libdir}/wine/%{winepedir}/windows.security.credentials.ui.userconsentverifier.dll
+%{_libdir}/wine/%{winepedir}/windows.storage.applicationdata.dll
 %{_libdir}/wine/%{winepedir}/windows.system.profile.systemmanufacturers.dll
 %{_libdir}/wine/%{winepedir}/windows.ui.dll
 %{_libdir}/wine/%{winepedir}/windowscodecs.dll
@@ -2471,13 +2469,16 @@ fi
 %{_libdir}/wine/%{winesodir}/windows.gaming.ui.gamebar.dll.so
 %{_libdir}/wine/%{winesodir}/windows.gaming.input.dll.so
 %{_libdir}/wine/%{winesodir}/windows.globalization.dll.so
-%{_libdir}/wine/%{winesodir}/windows.media.speech.dll.so
 %{_libdir}/wine/%{winesodir}/windows.media.dll.so
 %{_libdir}/wine/%{winesodir}/windows.media.devices.dll.so
+%{_libdir}/wine/%{winesodir}/windows.media.media.mediacontrol.dll.so
+%{_libdir}/wine/%{winesodir}/windows.media.speech.dll.so
 %{_libdir}/wine/%{winesodir}/windows.networking.connectivity.so
 %{_libdir}/wine/%{winesodir}/windows.networking.dll.so
 %{_libdir}/wine/%{winesodir}/windows.networking.hostname.dll.so
 %{_libdir}/wine/%{winesodir}/windows.perception.stub.dll.so
+%{_libdir}/wine/%{winesodir}/windows.security.credentials.ui.userconsentverifier.dll.so
+%{_libdir}/wine/%{winesodir}/windows.storage.applicationdata.dll.so
 %{_libdir}/wine/%{winesodir}/windows.system.profile.systemmanufacturers.dll.so
 %{_libdir}/wine/%{winesodir}/windows.ui.so
 %{_libdir}/wine/%{winesodir}/windowscodecs.dll.so
@@ -2806,6 +2807,9 @@ fi
 %endif
 
 %changelog
+* Sun Oct 15 2023 Michael Cronenworth <mike@cchtml.com> - 8.18-1
+- version update
+
 * Sun Oct 01 2023 Michael Cronenworth <mike@cchtml.com> - 8.17-1
 - version update