GNU bug report logs - #44761
PATCH [0/2] Update wine to 5.21

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 44761 in the body.
You can then email your comments to 44761 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: guix-patches <at> gnu.org
Cc: 42342 <at> debbugs.gnu.org
Subject: PATCH [0/2] Update wine to 5.21
Date: Fri, 20 Nov 2020 13:54:39 +0100

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

Message #8 received at 44761 <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: 44761 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: wine: Update to 5.21.
Date: Fri, 20 Nov 2020 13:55:47 +0100

* 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

Message #11 received at 44761 <at> debbugs.gnu.org (full text, mbox):

From: Leo Prikler <leo.prikler <at> student.tugraz.at>
To: 44761 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: wine64: Copy wine32 libraries.
Date: Fri, 20 Nov 2020 13:55:48 +0100

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

Message #16 received at 44761-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Leo Prikler <leo.prikler <at> student.tugraz.at>
Cc: 44761-done <at> debbugs.gnu.org
Subject: Re: [bug#44761] PATCH [0/2] Update wine to 5.21
Date: Sat, 28 Nov 2020 14:40:27 +0000

[Message part 1 (text/plain, inline)]

Leo Prikler <leo.prikler <at> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.