[PR PATCH] wine: remove musl-ntdll.patch since it was patched upstream

[PR PATCH] wine: remove musl-ntdll.patch since it was patched upstream

[fvalasiad]

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

wine: remove musl-ntdll.patch since it was patched upstream
@Hoshpak 


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

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

From 48683d2ac5f04ab98bf8e30d1bbe6b8e433c3c21 Mon Sep 17 00:00:00 2001
From: Fotios Valasiadis <fvalasiad@gmail.com>
Date: Sun, 19 May 2024 00:04:38 +0300
Subject: [PATCH] wine: remove musl-ntdll.patch since it was patched upstream

Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
---
 srcpkgs/wine/patches/musl-ntdll.patch | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 srcpkgs/wine/patches/musl-ntdll.patch

diff --git a/srcpkgs/wine/patches/musl-ntdll.patch b/srcpkgs/wine/patches/musl-ntdll.patch
deleted file mode 100644
index 651b42148a4243..00000000000000
--- a/srcpkgs/wine/patches/musl-ntdll.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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

Re: wine: remove musl-ntdll.patch since it was patched upstream

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/50421#issuecomment-2119003750

Comment:
The exact same patch was applied upstream, they merged my PR, so it's already included in the source code, should I still change revision to 2?

Re: wine: remove musl-ntdll.patch since it was patched upstream

[fvalasiad]

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

New comment by fvalasiad on void-packages repository

https://github.com/void-linux/void-packages/pull/50421#issuecomment-2119004158

Comment:
We could just postpone the removal for patch 9.10 to avoid shipping a second wine update in an hour, uncertain how void-packages are linked to the packages in the repos(aka if it's automatically or if you manually do it), but just throwing suggestions!

Re: wine: remove musl-ntdll.patch since it was patched upstream

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/50421#issuecomment-2119026939

Comment:
just do it with the next update, the patch will fail to apply and will be removed then

Re: [PR PATCH] [Closed]: wine: remove musl-ntdll.patch since it was patched upstream

[classabbyamp]

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

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

wine: remove musl-ntdll.patch since it was patched upstream
https://github.com/void-linux/void-packages/pull/50421

Description:
@Hoshpak