[bug#44761] PATCH [0/2] Update wine to 5.21

[bug#44761] PATCH [0/2] Update wine to 5.21

[Leo Prikler]

Hi Guix,

the following patch updates wine to version 5.21.  An attempt is also
made to fix #42342 by copying wine32 libraries into wine64.

Regards, Leo

[bug#44761] [PATCH 1/2] gnu: wine: Update to 5.21.

[Leo Prikler]

* gnu/packages/wine.scm (wine): Update to 5.21.
---
 gnu/packages/wine.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index c38936d55a..7b72fb3c28 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -76,7 +76,7 @@
 (define-public wine
   (package
     (name "wine")
-    (version "5.12")
+    (version "5.21")
     (source
      (origin
        (method url-fetch)
@@ -88,7 +88,7 @@
               (string-append "https://dl.winehq.org/wine/source/" dir
                              "wine-" version ".tar.xz")))
        (sha256
-        (base32 "0bl4ii4h1w4z8kb6dpdc1pgwk0wrhm61c2q2nzpcckkrqra75wc7"))))
+        (base32 "0h185lfpid6cw1sz8rmkpky2l11izpb0w8j0cq6ww6yi94jmq6js"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("bison" ,bison)
-- 
2.29.2

[bug#44761] [PATCH 2/2] gnu: wine64: Copy wine32 libraries.

[Leo Prikler]

Fixes the linkage of binaries copied over from wine32.  See also #42342.

* gnu/packages/wine.scm (wine64)[#:phases]: Add copy-wine32-libraries.
---
 gnu/packages/wine.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 7b72fb3c28..492eea0587 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -267,6 +267,13 @@ integrate Windows applications into your desktop.")
                (copy-file (string-append wine32 "/bin/.wine-preloader-real")
                           (string-append out "/bin/wine-preloader"))
                #t)))
+         (add-after 'install 'copy-wine32-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((wine32 (assoc-ref %build-inputs "wine"))
+                    (out (assoc-ref %outputs "out")))
+               (copy-recursively (string-append wine32 "/lib/wine32")
+                                 (string-append out "/lib/wine32"))
+               #t)))
          (add-after 'compress-documentation 'copy-wine32-manpage
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((wine32 (assoc-ref %build-inputs "wine"))
-- 
2.29.2

bug#44761: PATCH [0/2] Update wine to 5.21

[Christopher Baines]

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


Leo Prikler <leo.prikler@student.tugraz.at> writes:

> the following patch updates wine to version 5.21.  An attempt is also
> made to fix #42342 by copying wine32 libraries into wine64.

Looks good to me, I tried starting winecfg with these changes, and it
worked.

I've pushed to master, along with some unrelated formatting fixes in
e2b4450d188320783a35086d52c14ac9d47cf7f0.

Thanks again!

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]