.gitignore

@@ -1,3 +1,2 @@
-/wine-*.tar.xz
+SOURCES/wine-9.1.tar.xz
-/wine-*.tar.xz.sign
+SOURCES/wine-staging-9.1.tar.gz
-/wine-staging-*.tar.gz

.wine.metadata

@@ -0,0 +1,2 @@
+811b7d27631edc909eff1df980b59eaf7eeab710  SOURCES/wine-9.1.tar.xz
+9228aade07c97b3a135bd04a3e7a219031b8bea9  SOURCES/wine-staging-9.1.tar.gz

SOURCES/wine-9.1.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmW0OOkACgkQzvrI6q8X
+UZ1EGQ//YIpys9BBHk1NmBzo8hdcnh493pXe1psNwAzvncs/fX61gBwT6n2H55Zd
+oB0OkO9kXN7w7cYUQUABGMcUaZfoOaAL+7wB94fqxcbVcHiuW4ZeG8LTBz6z2j+a
+EBj3IbzCsr5EzipfHWpqkgfyB+aWMZFrDw26AQTSFCjyEJhAv/UwF+YEUFkw4jg0
+BcImHV32mcxTdV7WblUmnNzDgfFqXvF1YZXkIDg/zxLyMoWr1kIF4OXVNedUHrSi
+DqRPU7T0Wblz+8Lr0sPNnVPniOwLlnSIcbDfu9gJ4iP8Jd3Ng3Cl17oVP/vX3bsc
+so7KUuSrbTwICXqK8V2wZnGUYp1Kh8nZIcj3CmUmkbi3UwKrbwA7CJa8tRVTF39R
+2bvEsQpTtEDXSdF+qOjwIjHb5VyzY5l+UGSBnJT8QYpu3YO/KwX+wqb300yjxFKB
+Swh2rIrWfaPzfGBcI5x/t6HmgkY4piT/Z3rt12AtvXw/n2jVF+6HANjwhiqiv+/6
+VrX/I6Fn4EuC5WNCqEGjxLJVWmPqupDH/W/zf6+YE+yvwgabbboH7BlLsHOPu+sh
+EcVAJGjIcl09klQ/qHPh7AaJxgOZ/mqSbr0qSGaBpyDEUNNlkLnMqV4YyHD/Yb7X
+gmSPsiLLhpG474t3iPmHtoQDw8JWqP23MAJYv2mFqxRVBmj1LEg=
+=TaeR
+-----END PGP SIGNATURE-----

SOURCES/wine-staging-9.0.patch

@@ -0,0 +1,115 @@
+--- patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch	2024-01-17 20:36:36.796186786 -0600
+@@ -197,7 +197,7 @@
+ +        }
+ +    }
+ +
+-+    if (!InterlockedCompareExchange( (int *)&esync_list[entry][idx].type, type, 0 ))
+++    if (!InterlockedCompareExchange( (LONG *)&esync_list[entry][idx].type, type, 0 ))
+ +    {
+ +        esync_list[entry][idx].fd = fd;
+ +        esync_list[entry][idx].shm = shm;
+--- patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0005-ntdll-Implement-NtClose.patch	2024-01-17 20:22:59.170405980 -0600
+@@ -25,7 +25,7 @@
+ +
+ +    if (entry < ESYNC_LIST_ENTRIES && esync_list[entry])
+ +    {
+-+        if (InterlockedExchange((int *)&esync_list[entry][idx].type, 0))
+++        if (InterlockedExchange((LONG *)&esync_list[entry][idx].type, 0))
+ +        {
+ +            close( esync_list[entry][idx].fd );
+ +            return STATUS_SUCCESS;
+--- patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0004-ntdll-Implement-NtReleaseSemaphore.patch	2024-01-17 20:25:51.399420034 -0600
+@@ -60,7 +60,7 @@
+ +
+ +        if (count + current > semaphore->max)
+ +            return STATUS_SEMAPHORE_LIMIT_EXCEEDED;
+-+    } while (InterlockedCompareExchange( &semaphore->count, count + current, current ) != current);
+++    } while (InterlockedCompareExchange( (LONG *) &semaphore->count, count + current, current ) != current);
+ +
+ +    if (prev) *prev = current;
+ +
+--- patches/eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0050-ntdll-server-Try-to-avoid-poll-for-signaled-events.patch	2024-01-17 20:29:39.020112232 -0600
+@@ -90,7 +90,7 @@
+ +    if (obj->type == ESYNC_MANUAL_EVENT)
+ +    {
+ +        /* Acquire the spinlock. */
+-+        while (InterlockedCompareExchange( &event->locked, 1, 0 ))
+++        while (InterlockedCompareExchange( (LONG *) &event->locked, 1, 0 ))
+ +            small_pause();
+ +    }
+ +
+@@ -103,7 +103,7 @@
+ +     * eventfd is unsignaled (i.e. reset shm, set shm, set fd, reset fd), we
+ +     * *must* signal the fd now, or any waiting threads will never wake up. */
+ +
+-+    if (!InterlockedExchange( &event->signaled, 1 ) || obj->type == ESYNC_AUTO_EVENT)
+++    if (!InterlockedExchange( (LONG *) &event->signaled, 1 ) || obj->type == ESYNC_AUTO_EVENT)
+ +    {
+ +        if (write( obj->fd, &value, sizeof(value) ) == -1)
+ +            ERR("write: %s\n", strerror(errno));
+@@ -137,7 +137,7 @@
+ +    if (obj->type == ESYNC_MANUAL_EVENT)
+ +    {
+ +        /* Acquire the spinlock. */
+-+        while (InterlockedCompareExchange( &event->locked, 1, 0 ))
+++        while (InterlockedCompareExchange( (LONG *) &event->locked, 1, 0 ))
+ +            small_pause();
+ +    }
+ +
+@@ -147,7 +147,7 @@
+ +     * For auto-reset events, we have no guarantee that the previous "signaled"
+ +     * state is actually correct. We need to leave both states unsignaled after
+ +     * leaving this function, so we always have to read(). */
+-+    if (InterlockedExchange( &event->signaled, 0 ) || obj->type == ESYNC_AUTO_EVENT)
+++    if (InterlockedExchange( (LONG *) &event->signaled, 0 ) || obj->type == ESYNC_AUTO_EVENT)
+ +    {
+ +        if (read( obj->fd, &value, sizeof(value) ) == -1 && errno != EWOULDBLOCK && errno != EAGAIN)
+ +        {
+--- patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch	2024-01-17 20:31:23.217332813 -0600
+@@ -82,7 +82,7 @@
+ +         * fact that we were able to grab it at all means the count is nonzero,
+ +         * and if someone else grabbed it then the count must have been >= 2,
+ +         * etc. */
+-+        InterlockedExchangeAdd( &semaphore->count, -1 );
+++        InterlockedExchangeAdd( (LONG *) &semaphore->count, -1 );
+ +    }
+ +}
+ +
+--- patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0007-ntdll-server-Implement-NtCreateEvent.patch	2024-01-17 20:31:54.500700144 -0600
+@@ -49,7 +49,7 @@
+  
+ @@ -339,6 +358,14 @@ static void update_grabbed_object( struct esync *obj )
+           * etc. */
+-         InterlockedExchangeAdd( &semaphore->count, -1 );
++         InterlockedExchangeAdd( (LONG *) &semaphore->count, -1 );
+      }
+ +    else if (obj->type == ESYNC_AUTO_EVENT)
+ +    {
+--- patches/eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/eventfd_synchronization/0049-ntdll-Try-to-avoid-poll-for-uncontended-objects.patch	2024-01-17 21:07:47.674962176 -0600
+@@ -68,7 +68,7 @@
+ +                        if ((size = read( obj->fd, &value, sizeof(value) )) == sizeof(value))
+ +                        {
+ +                            TRACE("Woken up by handle %p [%d].\n", handles[i], i);
+-+                            InterlockedDecrement( &semaphore->count );
+++                            InterlockedDecrement( (LONG *) &semaphore->count );
+ +                            return i;
+ +                        }
+ +                    }
+--- patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch.orig	2024-01-16 15:47:35.000000000 -0600
++++ patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch	2024-01-18 08:19:37.882485865 -0600
+@@ -74,7 +74,7 @@
+ +    }
+ +
+ +    if (pdev->brush.style != BS_NULL &&
+-+        !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const UINT *)&count, 1, NtGdiPolyPolygonRgn ))))
+++        !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const ULONG *)&count, 1, NtGdiPolyPolygonRgn ))))
+ +    {
+ +        free( points );
+ +        if (outline) NtGdiDeleteObjectApp( outline );

SPECS/wine.spec

@@ -40,14 +40,14 @@
 %endif
 
 Name:           wine
-Version:        8.19
+Version:        9.1
-Release:        1%{?dist}
+Release:        1%{?dist}.inferit.1
 Summary:        A compatibility layer for windows applications
 
 License:        LGPL-2.1-or-later
 URL:            https://www.winehq.org/
-Source0:        https://dl.winehq.org/wine/source/8.0/wine-%{version}.tar.xz
+Source0:        https://dl.winehq.org/wine/source/9.x/wine-%{version}.tar.xz
-Source10:       https://dl.winehq.org/wine/source/8.0/wine-%{version}.tar.xz.sign
+Source10:       https://dl.winehq.org/wine/source/9.x/wine-%{version}.tar.xz.sign
 
 Source1:        wine.systemd
 Source2:        wine-README-Fedora
@@ -88,6 +88,8 @@ Patch100:       wine-7.22-autoconf-2.72.patch
 
 Patch511:       wine-cjk.patch
 
+Patch900:       wine-staging-9.0.patch
+
 %if 0%{?wine_staging}
 # wine-staging patches
 # pulseaudio-patch is covered by that patch-set, too.
@@ -95,7 +97,7 @@ Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.
 %endif
 
 %if !%{?no64bit}
-%if 0%{?fedora} > 36
+%if 0%{?fedora} > 36 || 0%{?msvsphere}
 ExclusiveArch:  %{ix86} x86_64 aarch64
 %else
 # Fedora 36 Clang doesn't build PE binaries on ARM at the moment
@@ -206,6 +208,15 @@ Requires:       wine-desktop = %{version}-%{release}
 Requires:       wine-fonts = %{version}-%{release}
 
 # x86-32 parts
+%ifarch %{ix86} && 0%{?msvsphere}
+Requires:       wine-core(x86-32) = %{version}-%{release}
+Requires:       wine-cms(x86-32) = %{version}-%{release}
+Requires:       wine-ldap(x86-32) = %{version}-%{release}
+Requires:       wine-twain(x86-32) = %{version}-%{release}
+Requires:       wine-pulseaudio(x86-32) = %{version}-%{release}
+Requires:       wine-mono = %winemono
+%endif
+
 %ifarch %{ix86} x86_64
 %if 0%{?fedora} || 0%{?rhel} <= 6
 Requires:       wine-core(x86-32) = %{version}-%{release}
@@ -688,6 +699,8 @@ 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
+# Fix pointer types for i686 build
+%patch -P 900 -p0 -b.staging
 staging/patchinstall.py DESTDIR="`pwd`" --all
 
 %endif
@@ -1064,13 +1077,13 @@ fi
 # meta package
 
 %files core
-%doc ANNOUNCE
+%doc ANNOUNCE.md
 %doc COPYING.LIB
 %doc LICENSE
 %doc LICENSE.OLD
 %doc AUTHORS
 %doc README-FEDORA
-%doc README
+%doc README.md
 %doc VERSION
 # do not include huge changelogs .OLD .ALPHA .BETA (#204302)
 %doc documentation/README.*
@@ -1126,7 +1139,9 @@ fi
 %{_libdir}/wine/%{winepedir}/dism.exe
 %{_libdir}/wine/%{winepedir}/dllhost.exe
 %{_libdir}/wine/%{winepedir}/dplaysvr.exe
+%ifarch %{ix86} x86_64
 %{_libdir}/wine/%{winepedir}/dpnsvr.exe
+%endif
 %{_libdir}/wine/%{winepedir}/dpvsetup.exe
 %{_libdir}/wine/%{winepedir}/eject.exe
 %{_libdir}/wine/%{winepedir}/expand.exe
@@ -1225,6 +1240,7 @@ fi
 %{_libdir}/wine/%{winepedir}/comcat.dll
 %{_libdir}/wine/%{winepedir}/comctl32.dll
 %{_libdir}/wine/%{winepedir}/comdlg32.dll
+%{_libdir}/wine/%{winepedir}/coml2.dll
 %{_libdir}/wine/%{winepedir}/compstui.dll
 %{_libdir}/wine/%{winepedir}/comsvcs.dll
 %{_libdir}/wine/%{winepedir}/concrt140.dll
@@ -1461,6 +1477,7 @@ fi
 %{_libdir}/wine/%{winepedir}/mssip32.dll
 %{_libdir}/wine/%{winepedir}/msrle32.dll
 %{_libdir}/wine/%{winepedir}/mstask.dll
+%{_libdir}/wine/%{winepedir}/msttsengine.dll
 %{_libdir}/wine/%{winepedir}/msv1_0.dll
 %{_libdir}/wine/%{winesodir}/msv1_0.so
 %{_libdir}/wine/%{winepedir}/msvcirt.dll
@@ -2040,6 +2057,7 @@ fi
 %{_libdir}/wine/%{winesodir}/comcat.dll.so
 %{_libdir}/wine/%{winesodir}/comctl32.dll.so
 %{_libdir}/wine/%{winesodir}/comdlg32.dll.so
+%{_libdir}/wine/%{winesodir}/coml2.dll.so
 %{_libdir}/wine/%{winesodir}/compstui.dll.so
 %{_libdir}/wine/%{winesodir}/comsvcs.dll.so
 %{_libdir}/wine/%{winesodir}/concrt140.dll.so
@@ -2257,6 +2275,7 @@ fi
 %{_libdir}/wine/%{winesodir}/mssip32.dll.so
 %{_libdir}/wine/%{winesodir}/msrle32.dll.so
 %{_libdir}/wine/%{winesodir}/mstask.dll.so
+%{_libdir}/wine/%{winesodir}/msttsengine.dll.so
 %{_libdir}/wine/%{winesodir}/msv1_0.dll.so
 %{_libdir}/wine/%{winesodir}/msvcirt.dll.so
 %{_libdir}/wine/%{winesodir}/msvcm80.dll.so
@@ -2809,6 +2828,25 @@ fi
 %endif
 
 %changelog
+* Tue Nov 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.1-1.inferit.1
+- Bump release to rebuild
+
+* Fri Feb 09 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 9.1-1.inferit
+- Necessary i686 requires have been added
+- Rebuilt for MSVSphere 9.3
+
+* Mon Jan 29 2024 Michael Cronenworth <mike@cchtml.com> - 9.1-1
+- version update
+
+* Thu Jan 25 2024 Michael Cronenworth <mike@cchtml.com> - 9.0-3
+- Revert smartcard subpackage (RHBZ#2259936)
+
+* Fri Jan 19 2024 Michael Cronenworth <mike@cchtml.com> - 9.0-2
+- Add smartcard subpackage (RHBZ#2259198)
+
+* Tue Jan 16 2024 Michael Cronenworth <mike@cchtml.com> - 9.0-1
+- version update
+
 * Mon Oct 30 2023 Michael Cronenworth <mike@cchtml.com> - 8.19-1
 - version update
 

sources

@@ -1,3 +0,0 @@
-SHA512 (wine-8.19.tar.xz) = ad4178c5e9f336eb968f0c378e3819794507447728acd10d642c1d66e0745837e47a70579bc9c7d9bec4510ca47e230bf4ab05ddf39323669ed24a6fce9f8c02
-SHA512 (wine-8.19.tar.xz.sign) = d89e0cc1d6bbee93805906a7071e60044c9d9c3a9d5fedc270d7d85f0f167157afa047183ba1f4a801df11fa879168402097bb8a88e3c88ca77f2e6608046308
-SHA512 (wine-staging-8.19.tar.gz) = 764cb824250aba7390dcede8b5269fc2c58f3bab8e0bef5e7bfb33ba553d1b506e0e5d8e11e6ee960958bd22086127c178e418767e8051c2767949b74df2afb1