[PR PATCH] wine: update to 8.13.

[PR PATCH] wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

There is a new pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/45202

wine: update to 8.13.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/45202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-45202.patch --]
[-- Type: text/x-diff, Size: 1185 bytes --]

From 6108596d1f64fc8bd1d683f868a5d4ab2f322ebc Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sun, 23 Jul 2023 14:45:59 +0300
Subject: [PATCH] wine: update to 8.13.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 83c50e54a7cd7..45a709c7b30ad 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.11
+version=8.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="0b5f2c8085352332590f076410174c486f7773da5727337745b1c1dcfe897fc9
- 3405ef0fa99fb92b39bb7a5480774b837cb929e35e3675b33c1c260eebfcbb85"
+checksum="26e5d3a83d25c5418c6c0f5448e443d208763a2643aab4b0f1ad352922a4c275
+ 8e6a1ebff2cae6b0815fa5b7fa4fcbec2d96dc8301196518d2cdc716ef3ae8ea"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

Re: wine: update to 8.13.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1646920379

Comment:
Works fine for me on x86_64-glibc.

Re: wine: update to 8.13.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1647890932

Comment:
cc @Hoshpak 

Re: wine: update to 8.13.

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1648239409

Comment:
It fails to build on x86_64-musl:
https://github.com/void-linux/void-packages/actions/runs/5636252950/job/15268168529?pr=45202

This needs to be solved before the package can  be updated.

Re: wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1648272463

Comment:
@Hoshpak Reading the logs I suspect this is a case of a missing include.

An undefined macro next to a variable declaration with a forward-declared struct.

I will look into it.

Re: wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 1785 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1649490737

Comment:
After some digging I found the commit that broke musl support

```
commit 41cc117b3f37ab4b9b4ac8a815cd2a496d38fb4b (HEAD)
Author: Billy Laws <blaws05@gmail.com>
Date:   Sat Jun 3 21:57:42 2023 +0100

commit 41cc117b3f37ab4b9b4ac8a815cd2a496d38fb4b (HEAD)
Author: Billy Laws <blaws05@gmail.com>
Date:   Sat Jun 3 21:57:42 2023 +0100

    server: Avoid using SOL_IPX to detect whether IPX is supported.

diff --git a/server/sock.c b/server/sock.c
index 088e6d63079..34be6ea22ef 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -62,6 +62,7 @@
 
 #ifdef HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
+# define HAS_IPX
 #elif defined(HAVE_LINUX_IPX_H)
 # ifdef HAVE_ASM_TYPES_H
 #  include <asm/types.h>
@@ -70,8 +71,6 @@
 #  include <linux/types.h>
 # endif
 # include <linux/ipx.h>
-#endif
-#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS)
 # define HAS_IPX
 #endif
```

the problem with it is at the following code:
```
#ifdef HAS_IPX
        int ipx_type = protocol - WS_NSPROTO_IPX;

#ifdef SOL_IPX
        setsockopt( sockfd, SOL_IPX, IPX_TYPE, &ipx_type, sizeof(ipx_type) );
#else
        struct ipx val;
        /* Should we retrieve val using a getsockopt call and then
         * set the modified one? */
        val.ipx_pt = ipx_type;
        setsockopt( sockfd, 0, SO_DEFAULT_HEADERS, &val, sizeof(val) );
#endif
#endif
```

previously `HAS_IPX` wasn't defined at all, now it is defined while `SOL_IPX` isn't and so we branch to #else without checking for the existence of `SO_DEFAULT_HEADERS` as the macro originally did.

I will consider reverting the commit to upstream wine.

Re: wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1649542408

Comment:
Relevant PR: https://gitlab.winehq.org/wine/wine/-/merge_requests/3403

Re: wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1650188105

Comment:
Update: The pull request was approved, wine on musl is back! Probably will be included with the next wine version, 8.14

@Hoshpak Until then, do we apply the patch to the package and ship it, or do we wait until wine does?

Re: wine: update to 8.13.

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1651399525

Comment:
Thanks for the great work! Feel free to include the patch and let's get this update merged.

Re: [PR PATCH] [Updated] wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

There is an updated pull request by fvalasiad against master on the void-packages repository

https://github.com/fvalasiad/void-packages wine
https://github.com/void-linux/void-packages/pull/45202

wine: update to 8.13.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/45202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-45202.patch --]
[-- Type: text/x-diff, Size: 2096 bytes --]

From 62c7d8b72b6d2e023e9e14c55be3feb2bc9d3d44 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sun, 23 Jul 2023 14:45:59 +0300
Subject: [PATCH] wine: update to 8.13.

also includes a patch to fix compatibility issues with musl.
---
 srcpkgs/wine/patches/musl-ipx.patch | 13 +++++++++++++
 srcpkgs/wine/template               |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-ipx.patch

diff --git a/srcpkgs/wine/patches/musl-ipx.patch b/srcpkgs/wine/patches/musl-ipx.patch
new file mode 100644
index 0000000000000..3e4e8323d0c57
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-ipx.patch
@@ -0,0 +1,13 @@
+diff --git a/server/sock.c b/server/sock.c
+index 550fe61e477..591876aab33 100644
+--- a/server/sock.c
++++ b/server/sock.c
+@@ -1880,7 +1880,7 @@ static int init_socket( struct sock *sock, int family, int type, int protocol )
+ 
+ #ifdef SOL_IPX
+         setsockopt( sockfd, SOL_IPX, IPX_TYPE, &ipx_type, sizeof(ipx_type) );
+-#else
++#elif defined(SO_DEFAULT_HEADERS)
+         struct ipx val;
+         /* Should we retrieve val using a getsockopt call and then
+          * set the modified one? */
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 83c50e54a7cd7..45a709c7b30ad 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.11
+version=8.13
 revision=1
 _pkgver=${version/r/-r}
 create_wrksrc=yes
@@ -13,8 +13,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.winehq.org/"
 distfiles="https://dl.winehq.org/wine/source/${version%.*}.x/wine-${_pkgver}.tar.xz
  https://github.com/wine-staging/wine-staging/archive/v${_pkgver}.tar.gz"
-checksum="0b5f2c8085352332590f076410174c486f7773da5727337745b1c1dcfe897fc9
- 3405ef0fa99fb92b39bb7a5480774b837cb929e35e3675b33c1c260eebfcbb85"
+checksum="26e5d3a83d25c5418c6c0f5448e443d208763a2643aab4b0f1ad352922a4c275
+ 8e6a1ebff2cae6b0815fa5b7fa4fcbec2d96dc8301196518d2cdc716ef3ae8ea"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

Re: wine: update to 8.13.

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45202#issuecomment-1651928576

Comment:
@Hoshpak Tested it on musl, works as expected, feel free to merge.

Gotta remember to remove the patch when they merge upstream!

Re: [PR PATCH] [Merged]: wine: update to 8.13.

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There's a merged pull request on the void-packages repository

wine: update to 8.13.
https://github.com/void-linux/void-packages/pull/45202

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)