ieure pushed a commit to branch master
in repository guix.
commit 1674d40454e3c02f51238da9c29f6b37c6b98c3c
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Fri Jan 24 12:23:19 2025 +0100
gnu: wine-staging: Update to 10.0.
* gnu/packages/wine.scm (wine-staging-patchset-data): Update to 10.0.
(wine-staging)[source]: Update hash.
[#:phases]<apply-wine-staging-patches>: Exclude “server-Stored_ACLs”.
(wine64-staging): Likewise.
Signed-off-by: Ian Eure <[email protected]>
---
gnu/packages/wine.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 6dbe384e59..df1796f780 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -310,7 +310,7 @@ integrate Windows applications into your desktop.")
(define-public wine-staging-patchset-data
(package
(name "wine-staging-patchset-data")
- (version "9.0")
+ (version "10.0")
(source
(origin
(method git-fetch)
@@ -319,7 +319,7 @@ integrate Windows applications into your desktop.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0xdinbj9byihy8snv6h1mcb79rh35zwhhld4g7mjg0k2wvjgskwl"))))
+ (base32 "17lslhmad0z5im0xlan5xwsnfvnxzi6iaj8bc51sc9sslfhwlv6j"))))
(build-system trivial-build-system)
(native-inputs
(list coreutils))
@@ -365,7 +365,7 @@ integrate Windows applications into your desktop.")
"wine-" wine-version ".tar.xz"))
(file-name (string-append name "-" wine-version ".tar.xz"))
(sha256
- (base32 "1vm61hrkinjqicxidhbhq3j8sb1iianfypdvjmnvgxcmac50kzbw")))))
+ (base32 "009nmi0z60ilrlrxjj9msdqk2n2wp0jcdnflkh7b7bzgyzsv7q65")))))
(inputs (modify-inputs (package-inputs wine)
(prepend autoconf ; for autoreconf
ffmpeg
@@ -389,6 +389,9 @@ integrate Windows applications into your desktop.")
inputs
"/share/wine-staging/staging/patchinstall.py")
"DESTDIR=."
+ ;; Broken upstream, does not apply.
+ ;; TODO: Remove once fixed.
+ "-W" "server-Stored_ACLs"
"--all")))
(add-after 'apply-wine-staging-patches 'patch-SHELL
(assoc-ref #$phases 'patch-SHELL))))))
@@ -424,6 +427,8 @@ integrated into the main branch.")
inputs
"/share/wine-staging/staging/patchinstall.py")
"DESTDIR=."
+ ;; Note: Keep in sync with wine-staging.
+ "-W" "server-Stored_ACLs"
"--all")))
(add-after 'apply-wine-staging-patches 'patch-SHELL
(assoc-ref #$phases 'patch-SHELL))))))
