all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kaelyn Takata via Guix-patches via <guix-patches@gnu.org>
To: 61067@debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Subject: [bug#61067] [PATCH v2 1/5] gnu: wine: Update to 8.0.
Date: Fri, 27 Jan 2023 01:08:07 +0000	[thread overview]
Message-ID: <11be5fb96c13b55f8185fcbf8256e9b440187816.1674781160.git.kaelyn.alexi@protonmail.com> (raw)
In-Reply-To: <cover.1674781160.git.kaelyn.alexi@protonmail.com>

* gnu/packages/wine.scm (wine,wine64,wine-minimal): Update to 8.0.
[arguments]: Remove superfluous rpath setting in configure-flags.
---
 gnu/packages/wine.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 6e86add4e3..7ca2ac5bdf 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
+;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -76,7 +77,7 @@ (define-module (gnu packages wine)
 (define-public wine
   (package
     (name "wine")
-    (version "7.19")
+    (version "8.0")
     (source
      (origin
        (method url-fetch)
@@ -88,7 +89,7 @@ (define-public wine
               (string-append "https://dl.winehq.org/wine/source/" dir
                              "wine-" version ".tar.xz")))
        (sha256
-        (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23"))))
+        (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))))
     (build-system gnu-build-system)
     (native-inputs
      (list bison flex gettext-minimal perl pkg-config))
@@ -142,9 +143,6 @@ (define-public wine
        ;; pass.
        #:tests? #f

-       #:configure-flags
-       #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine32"))
-
        #:make-flags
        #~(list "SHELL=bash"
                (string-append "libdir=" #$output "/lib/wine32"))
@@ -197,7 +195,7 @@ (define-public wine
                (substitute* "tools/makedep.c"
                  (("output_filenames\\( unix_libs \\);" all)
                   (string-append all
-                                 "output ( \" -Wl,-rpath=%s \", so_dir );"))))))))
+                                 "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))))))
     (home-page "https://www.winehq.org/")
     (synopsis "Implementation of the Windows API (32-bit only)")
     (description
@@ -260,7 +258,7 @@ (define-public wine64
               (substitute* "tools/makedep.c"
                 (("output_filenames\\( unix_libs \\);" all)
                  (string-append all
-                                "output ( \" -Wl,-rpath=%s \", so_dir );")))))
+                                "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))
           (add-after 'install 'copy-wine32-binaries
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let ((out (assoc-ref %outputs "out")))
@@ -293,8 +291,7 @@ (define-public wine64
                   (("(#define SONAME_.* )\"(.*)\"" _ defso soname)
                    (format #f "~a\"~a\"" defso (find-so soname))))))))
       #:configure-flags
-      #~(list "--enable-win64"
-              (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine64"))
+      #~(list "--enable-win64")
       (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases
                                  #:system)
                                (package-arguments wine))))
--
2.39.1






  reply	other threads:[~2023-01-27  1:09 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-26  0:17 [bug#61067] [PATCH 0/3] Update wine and wine-staging packages to 8.0 Kaelyn Takata via Guix-patches via
2023-01-26  0:23 ` [bug#61067] [PATCH 1/3] gnu: wine: Update " Kaelyn Takata via Guix-patches via
2023-01-26  0:24 ` [bug#61067] [PATCH 2/3] gnu: wine: Build more reproducibly Kaelyn Takata via Guix-patches via
2023-01-26 19:28   ` Liliana Marie Prikler
2023-01-26 20:46     ` Kaelyn via Guix-patches via
2023-01-26 21:09       ` Liliana Marie Prikler
2023-01-27  1:07         ` Kaelyn via Guix-patches via
2023-01-26  0:24 ` [bug#61067] [PATCH 3/3] gnu: wine-staging: Update to 8.0 Kaelyn Takata via Guix-patches via
2023-01-27  1:07 ` [bug#61067] [PATCH v2 0/5] Update wine and wine-staging packages " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` Kaelyn Takata via Guix-patches via [this message]
2023-01-27  1:08   ` [bug#61067] [PATCH v2 2/5] gnu: wine-staging: Update " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` [bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package Kaelyn Takata via Guix-patches via
2023-01-27 18:03     ` Liliana Marie Prikler
2023-01-27 18:15       ` Kaelyn via Guix-patches via
2023-01-30 20:39       ` Kaelyn via Guix-patches via
2023-01-31 19:19         ` Liliana Marie Prikler
2023-01-27  1:08   ` [bug#61067] [PATCH v2 4/5] gnu: wine64: " Kaelyn Takata via Guix-patches via
2023-01-27  1:08   ` [bug#61067] [PATCH v2 5/5] gnu: wine: Build more reproducibly Kaelyn Takata via Guix-patches via
2023-01-30 20:35 ` [bug#61067] [PATCH] gnu: wine: Invert the relationship between wine and wine-minimal Kaelyn Takata via Guix-patches via
2023-02-02 21:23 ` [bug#61067] [PATCH v3 0/5] Update wine and wine-staging packages to 8.0 Kaelyn Takata via Guix-patches via
2023-02-02 21:23   ` [bug#61067] [PATCH v3 1/5] gnu: wine: Update " Kaelyn Takata via Guix-patches via
2023-02-02 21:23   ` [bug#61067] [PATCH v3 2/5] gnu: wine-staging: " Kaelyn Takata via Guix-patches via
2023-02-02 21:23   ` [bug#61067] [PATCH v3 3/5] gnu: wine-minimal: Make the parent of wine so phases can be shared Kaelyn Takata via Guix-patches via
2023-02-02 21:24   ` [bug#61067] [PATCH v3 4/5] gnu: wine64: Share phases with parent wine package Kaelyn Takata via Guix-patches via
2023-02-02 21:24   ` [bug#61067] [PATCH v3 5/5] gnu: wine-minimal: Build more reproducibly Kaelyn Takata via Guix-patches via
2023-02-05  6:13   ` bug#61067: [PATCH v3 0/5] Update wine and wine-staging packages to 8.0 Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11be5fb96c13b55f8185fcbf8256e9b440187816.1674781160.git.kaelyn.alexi@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=61067@debbugs.gnu.org \
    --cc=kaelyn.alexi@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.