[PR PATCH] wine: Update to 8.14

[PR PATCH] wine: Update to 8.14

[fvalasiad]

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

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

https://github.com/fvalasiad/void-packages master
https://github.com/void-linux/void-packages/pull/45701

wine: Update to 8.14
Also remove musl-ipx.patch since it has been patched upstream.

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

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

From 860bb011cf86fb1695b8ffb33cf6b44ec6e778f9 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Mon, 21 Aug 2023 16:16:56 +0300
Subject: [PATCH] wine: Update to 8.14

Also remove musl-ipx.patch since it has been patched upstream.

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

diff --git a/srcpkgs/wine/patches/musl-ipx.patch b/srcpkgs/wine/patches/musl-ipx.patch
deleted file mode 100644
index 3e4e8323d0c57..0000000000000
--- a/srcpkgs/wine/patches/musl-ipx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 45a709c7b30ad..1fdcdaee64710 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=8.13
+version=8.14
 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="26e5d3a83d25c5418c6c0f5448e443d208763a2643aab4b0f1ad352922a4c275
- 8e6a1ebff2cae6b0815fa5b7fa4fcbec2d96dc8301196518d2cdc716ef3ae8ea"
+checksum="e1836ef66b1825fa9da042830c0495b2ac394815443643466979ee89fdd7faf4
+ c544541e4b29fd304a875400cad73b4f14d5ce61fb74a909d4a7c62cdfa77047"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

Re: wine: Update to 8.14

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45701#issuecomment-1686779333

Comment:
Should probably tag you for this @Hoshpak

Re: wine: Update to 8.14

[Hoshpak]

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

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/45701#issuecomment-1688672014

Comment:
I updated the package in 525f92abe1a4940da63ced7c75d80b2a14509eac . Could you maybe amend the commit to just remove the patch, incrementing the package revision?

Re: [PR PATCH] [Updated] wine: Update to 8.14

[fvalasiad]

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

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

https://github.com/fvalasiad/void-packages master
https://github.com/void-linux/void-packages/pull/45701

wine: Update to 8.14
Also remove musl-ipx.patch since it has been patched upstream.

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

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

From e7a426145bbcc2237c0d0d3f595b1271e6cf210d Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Wed, 23 Aug 2023 02:07:02 +0300
Subject: [PATCH] wine: Remove unnecessary musl-ipx.patch

It has been patched upstream.

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/patches/musl-ipx.patch | 13 -------------
 srcpkgs/wine/template               |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/wine/patches/musl-ipx.patch

diff --git a/srcpkgs/wine/patches/musl-ipx.patch b/srcpkgs/wine/patches/musl-ipx.patch
deleted file mode 100644
index 3e4e8323d0c57..0000000000000
--- a/srcpkgs/wine/patches/musl-ipx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 1fdcdaee64710..13cffbf5ea3fb 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.14
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}

Re: wine: Update to 8.14

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/45701#issuecomment-1689039535

Comment:
@Hoshpak Done!

Re: [PR PATCH] [Merged]: wine: Remove unnecessary musl-ipx.patch

[Hoshpak]

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

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

wine: Remove unnecessary musl-ipx.patch
https://github.com/void-linux/void-packages/pull/45701

Description:
Also remove musl-ipx.patch since it has been patched upstream.