[PR PATCH] wine: Update to 9.14

[PR PATCH] wine: Update to 9.14

[fvalasiad]

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

wine: Update to 9.14
@Hoshpak 

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

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

From d22dc9ab00dbdb1023f3791d4492084aac5256e3 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Tue, 30 Jul 2024 10:02:32 +0300
Subject: [PATCH] wine: Update to 9.14

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

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 2ff35a8afa6dc6..4763b7c854b6a8 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=9.13
+version=9.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="d79651d0fe38defe84cbd9e345f001c02ffc125979e29ebf203d6d487abf7348
- c61708f06caf2a6ad4b373624347ae0e74ecb9d8e78675f0fee289a67f993a00"
+checksum="24572f49cf3473fc9ef2a1ad1cddf511ce0ef43daa55413b4720a6c3e3c89ea6
+ 0a7c9ca9f8d137657417495d5445793f89e5681965a6381d7cfafd998d019557"
 
 # 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.14

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2258211715

Comment:
Can you add this to post_patch?

`sed '18,41d' -i ../wine-staging-9.13/patches/server-Stored_ACLs/0004-server-Temporarily-store-the-full-security-descripto.patch`

Someone was trying to build staging and it wasn't getting past this. Seems to be wine staging issue?

Re: wine: Update to 9.14

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2258228657

Comment:
more appropriate replacement...if it builds

```diff
--- ./wine-9.13/dlls/advapi32/tests/security.c	2024-07-30 08:24:06.217640930 -0400
+++ ./wine-9.13/dlls/advapi32/tests/security.c.new	2024-07-30 08:24:29.989188060 -0400
@@ -3658,7 +3658,6 @@
     ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
     bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
     ok(bret, "GetAclInformation failed\n");
-    todo_wine
     ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                acl_size.AceCount);
     LocalFree(pSD);
@@ -3672,7 +3671,6 @@
     {
         bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
         ok(bret, "GetAclInformation failed\n");
-        todo_wine
         ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                    acl_size.AceCount);
         LocalFree(pSD);
@@ -3737,7 +3735,6 @@
     ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
     bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
     ok(bret, "GetAclInformation failed\n");
-    todo_wine
     ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                acl_size.AceCount);
     LocalFree(pSD);
@@ -3751,7 +3748,6 @@
     {
         bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
         ok(bret, "GetAclInformation failed\n");
-        todo_wine
         ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
                                    acl_size.AceCount);
         LocalFree(pSD);
```

Re: wine: Update to 9.14

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2258272372

Comment:
patching from wrksrc to `..` doesnt really work. probably best to do the sed to remove lines and just remove the `todo_wine` with that patch separately (without the `wine-9.13` and `just a/dlls/...`)

Re: [PR PATCH] [Merged]: wine: Update to 9.14

[Hoshpak]

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

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

wine: Update to 9.14
https://github.com/void-linux/void-packages/pull/51541

Description:
@Hoshpak 

Re: wine: Update to 9.14

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259143780

Comment:
@zlice I am kinda confused, wine 9.14 builds, what seems to be the issue, what is that patch for?

Re: wine: Update to 9.14

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259148559

Comment:
staging doesn't build. the base package is fine.

Re: wine: Update to 9.14

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259168510

Comment:
Ah, so the option to apply wine-staging patches on top in the template results in build failure, is that right?

Re: wine: Update to 9.14

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259168510

Comment:
Ah, so the option to apply wine-staging patches on top in the template results in build failure, is that correct?

Re: wine: Update to 9.14

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259175218

Comment:
yes me and a couple people in irc had the same issue. looks like they have a patch that needs updating. made a winehq report https://bugs.winehq.org/show_bug.cgi?id=57016

Re: wine: Update to 9.14

[zlice]

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259175218

Comment:
yes, correct. me and a couple people in irc had the same issue. looks like they have a patch that needs updating. made a winehq report https://bugs.winehq.org/show_bug.cgi?id=57016

Re: wine: Update to 9.14

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/51541#issuecomment-2259195020

Comment:
I see, maybe I will be irresponsible tomorrow and actually try to debug this instead of focusing on my responsibilities. Can't tell, as of now I am fried so can't really help!

You can definitely open a PR since this one was merged though! I will probably try to fix it upstream if I get the chance anyways so yeah.