[PR PATCH] wine: update to 9.8

[PR PATCH] wine: update to 9.8

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 309 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/50190

wine: update to 9.8
None

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

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

From f58b7b6739aff56a93e68378bdae5e39e59dce01 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sat, 4 May 2024 21:18:28 +0300
Subject: [PATCH] wine: update to 9.8

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..2d9801401787ca 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=9.7
+version=9.8
 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="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
- e104de4fcca4cabd0f21e7eba674b0c329dd6056e8f57e7ca945e04caf2caabe"
+checksum="86943c838eda8fad9a7940d4099703394bf1d1be9a1014342fed879c7dc3b993
+ eba01cd743fd317319053e0a58be562dd1d10b67748abb005196066e83610c9e"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine

Re: wine: update to 9.8

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/50190#issuecomment-2094339987

Comment:
Does not build on musl once again? Ha! Here goes part two of debugging wine on musl.

Maybe I will end up sending patches to upstream again! I will try and allocate some time to get it to work!

Re: [PR PATCH] [Updated] wine: update to 9.8

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 319 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/50190

wine: update to 9.8
@Hoshpak 

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

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

From eb2cacf8404c24eadc9eea81ab5e3693debc6e29 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sat, 4 May 2024 21:18:28 +0300
Subject: [PATCH] wine: update to 9.8

Upstream wine broke musl, added patch to fix.

Opened a PR with respective patch to upstream wine https://gitlab.winehq.org/wine/wine/-/merge_requests/5580

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/patches/musl-ntdll.patch | 12 ++++++++++++
 srcpkgs/wine/template                 |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-ntdll.patch

diff --git a/srcpkgs/wine/patches/musl-ntdll.patch b/srcpkgs/wine/patches/musl-ntdll.patch
new file mode 100644
index 00000000000000..651b42148a4243
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-ntdll.patch
@@ -0,0 +1,12 @@
+diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c
+index d48c49c87f6..951ed5d9386 100644
+--- a/dlls/ntdll/unix/serial.c
++++ b/dlls/ntdll/unix/serial.c
+@@ -41,6 +41,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
++#include <asm/ioctls.h>
+ #ifdef HAVE_SYS_FILIO_H
+ # include <sys/filio.h>
+ #endif
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..2d9801401787ca 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=9.7
+version=9.8
 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="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
- e104de4fcca4cabd0f21e7eba674b0c329dd6056e8f57e7ca945e04caf2caabe"
+checksum="86943c838eda8fad9a7940d4099703394bf1d1be9a1014342fed879c7dc3b993
+ eba01cd743fd317319053e0a58be562dd1d10b67748abb005196066e83610c9e"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine

Re: wine: update to 9.8

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/50190#issuecomment-2094541914

Comment:
@Hoshpak dealt with the bug, opened a PR in upstream https://gitlab.winehq.org/wine/wine/-/merge_requests/5580 .

Regardless of any changes that might be requested, the patch currently works so let's merge for now! In the meantime I will work with the wine devs for a fix in upstream for the next release 9.9 :).

Thanks for your attention!

Re: [PR PATCH] [Updated] wine: update to 9.8

[fvalasiad]

[-- Attachment #1: Type: text/plain, Size: 319 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/50190

wine: update to 9.8
@Hoshpak 

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

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

From 5287e4cae18473d30ad9437f3d43e0f7929c02ad Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sat, 4 May 2024 21:18:28 +0300
Subject: [PATCH] wine: update to 9.8

Upstream wine broke musl, added patch to fix.

Opened a PR with respective patch to upstream wine #5580

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/patches/musl-ntdll.patch | 12 ++++++++++++
 srcpkgs/wine/template                 |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/wine/patches/musl-ntdll.patch

diff --git a/srcpkgs/wine/patches/musl-ntdll.patch b/srcpkgs/wine/patches/musl-ntdll.patch
new file mode 100644
index 00000000000000..651b42148a4243
--- /dev/null
+++ b/srcpkgs/wine/patches/musl-ntdll.patch
@@ -0,0 +1,12 @@
+diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c
+index d48c49c87f6..951ed5d9386 100644
+--- a/dlls/ntdll/unix/serial.c
++++ b/dlls/ntdll/unix/serial.c
+@@ -41,6 +41,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
++#include <asm/ioctls.h>
+ #ifdef HAVE_SYS_FILIO_H
+ # include <sys/filio.h>
+ #endif
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index cbe0d1c0fc2ed9..2d9801401787ca 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=9.7
+version=9.8
 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="d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
- e104de4fcca4cabd0f21e7eba674b0c329dd6056e8f57e7ca945e04caf2caabe"
+checksum="86943c838eda8fad9a7940d4099703394bf1d1be9a1014342fed879c7dc3b993
+ eba01cd743fd317319053e0a58be562dd1d10b67748abb005196066e83610c9e"
 
 # NOTE: wine depends on specific versions of wine-mono and wine-gecko,
 # check for updates to these packages when updating wine

Re: [PR PATCH] [Merged]: wine: update to 9.8

[Hoshpak]

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

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

wine: update to 9.8
https://github.com/void-linux/void-packages/pull/50190

Description:
@Hoshpak