[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
232/377: gnu: wine: Update to 6.14.
From: |
guix-commits |
Subject: |
232/377: gnu: wine: Update to 6.14. |
Date: |
Thu, 2 Sep 2021 17:55:41 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit 07328706313bc52a1ad5842e02bd0c50e5312833
Author: Leo Prikler <leo.prikler@student.tugraz.at>
AuthorDate: Thu Aug 5 21:10:05 2021 +0200
gnu: wine: Update to 6.14.
* gnu/packages/wine.scm (wine): Update to 6.14.
[#:phases]: Patch Makefile to correctly locate ntdll.so.
(wine64)[#:phases]: Likewise.
---
gnu/packages/wine.scm | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 5c6d02e..fccdc18 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -75,7 +75,7 @@
(define-public wine
(package
(name "wine")
- (version "6.8")
+ (version "6.14")
(source
(origin
(method url-fetch)
@@ -87,7 +87,7 @@
(string-append "https://dl.winehq.org/wine/source/" dir
"wine-" version ".tar.xz")))
(sha256
- (base32 "1n7bd6kkhfgi23bz981qml3lajgvbs3ibqrc2mqjhhfqczg2shjv"))))
+ (base32 "00jjqbl0xzsp2swzxgx3a2b16p26qbxvcz82a7ihig23k69p3d34"))))
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
@@ -194,7 +194,16 @@
(substitute* "include/config.h"
(("(#define SONAME_.* )\"(.*)\"" _ defso soname)
(format #f "~a\"~a\"" defso (find-so soname))))
- #t))))))
+ #t)))
+ (add-after 'patch-generated-file-shebangs 'patch-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "make" "Makefile") ; Makefile is first regenerated
+ (substitute* "Makefile"
+ (("-lntdll" id)
+ (string-append id
+ " -Wl,-rpath=" (assoc-ref outputs "out")
+ "/lib/wine32/wine/$(ARCH)-unix")))
+ #t)))))
(home-page "https://www.winehq.org/")
(synopsis "Implementation of the Windows API (32-bit only)")
(description
@@ -254,6 +263,15 @@ integrate Windows applications into your desktop.")
#t)))))
(_
`()))
+ (add-after 'patch-generated-file-shebangs 'patch-makefile
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "make" "Makefile") ; Makefile is first regenerated
+ (substitute* "Makefile"
+ (("-lntdll" id)
+ (string-append id
+ " -Wl,-rpath=" (assoc-ref outputs "out")
+ "/lib/wine64/wine/$(ARCH)-unix")))
+ #t))
(add-after 'install 'copy-wine32-binaries
(lambda* (#:key outputs #:allow-other-keys)
(let* ((wine32 (assoc-ref %build-inputs "wine"))
- 206/377: gnu: python-pytest-asyncio: Enable tests and patch for Python 3.8., (continued)
- 206/377: gnu: python-pytest-asyncio: Enable tests and patch for Python 3.8., guix-commits, 2021/09/02
- 203/377: gnu: python-mock: Update description., guix-commits, 2021/09/02
- 208/377: gnu: python-pytest-xdist: Fix by downgrading to 1.34.0, run test suite., guix-commits, 2021/09/02
- 229/377: gnu: scrot: Update to 1.6., guix-commits, 2021/09/02
- 221/377: gnu: Add emacs-helm-xref., guix-commits, 2021/09/02
- 233/377: gnu: Add h-client., guix-commits, 2021/09/02
- 223/377: services: xorg: Delay the xorg-configuration-modules field evaluation., guix-commits, 2021/09/02
- 238/377: gnu: Add python-pytest-console-scripts., guix-commits, 2021/09/02
- 227/377: services: hurd-vm: Use the new 'targets' field of <bootloader-configuration>., guix-commits, 2021/09/02
- 210/377: gnu: Add ansible-core., guix-commits, 2021/09/02
- 232/377: gnu: wine: Update to 6.14.,
guix-commits <=
- 212/377: gnu: python-django: Update to 3.2.6., guix-commits, 2021/09/02
- 234/377: gnu: wine: Update to 6.16., guix-commits, 2021/09/02
- 239/377: gnu: Add python-pytest-tornasync., guix-commits, 2021/09/02
- 237/377: gnu: Add python-dna-features-viewer., guix-commits, 2021/09/02
- 219/377: gnu: shadow: Use the cross-compiled shell at runtime., guix-commits, 2021/09/02
- 230/377: build-system: chicken: Add 'egg-uri' procedure., guix-commits, 2021/09/02
- 218/377: gnu: Add emacs-hideshowvis., guix-commits, 2021/09/02
- 231/377: gnu: Add ocaml-odoc-parser., guix-commits, 2021/09/02
- 216/377: isc-dhcp: Fix dhclient-script wrapper when cross-compiling., guix-commits, 2021/09/02
- 215/377: services: Remove i486 qemu target., guix-commits, 2021/09/02