all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18.
@ 2023-11-04 20:03 Kaelyn Takata via Guix-patches via
  2023-11-05  9:06 ` Liliana Marie Prikler
  2023-12-09 18:11 ` [bug#66936] [PATCH v2] " Kaelyn Takata via Guix-patches via
  0 siblings, 2 replies; 7+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-11-04 20:03 UTC (permalink / raw)
  To: 66936; +Cc: Kaelyn Takata

* gnu/packages/wine.scm (wine-staging): Update to 8.18.

Change-Id: Ie71ed785c1e821b1d1752e46b3da11809b4331e5
---
 gnu/packages/wine.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 400f0e7607..ca06e264dc 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -304,7 +304,7 @@ (define-public wine64
 (define-public wine-staging-patchset-data
   (package
     (name "wine-staging-patchset-data")
-    (version "8.0")
+    (version "8.18")
     (source
      (origin
        (method git-fetch)
@@ -313,7 +313,7 @@ (define-public wine-staging-patchset-data
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581"))))
+        (base32 "0qabyw5139xdfsvzbwbrn1nnqssgwk8mn88mxnq2cdkk9gbjvq56"))))
     (build-system trivial-build-system)
     (native-inputs
      (list bash coreutils))
@@ -330,10 +330,7 @@ (define-public wine-staging-patchset-data
                 (wine-staging (string-append out "/share/wine-staging")))
            (copy-recursively source build-directory)
            (with-directory-excursion build-directory
-             (substitute* "patches/patchinstall.sh"
-               (("/bin/sh")
-                (string-append bash "/bin/sh")))
-             (substitute* "patches/gitapply.sh"
+             (substitute* '("patches/gitapply.sh" "staging/patchinstall.py")
                (("/usr/bin/env")
                 (string-append coreutils "/bin/env"))))
            (copy-recursively build-directory wine-staging)
@@ -363,7 +360,7 @@ (define-public wine-staging
                              "wine-" wine-version ".tar.xz"))
          (file-name (string-append name "-" wine-version ".tar.xz"))
          (sha256
-          (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))))
+          (base32 "1nv06awb3hv26v64nqnks9yiz7w368scxznj77vxa3zpmhafzyih")))))
     (inputs (modify-inputs (package-inputs wine)
               (prepend autoconf ; for autoreconf
                        ffmpeg
@@ -373,6 +370,9 @@ (define-public wine-staging
                        python
                        util-linux ; for hexdump
                        wine-staging-patchset-data)))
+    (native-inputs
+     (modify-inputs (package-native-inputs wine)
+       (prepend python-3)))
     (arguments
      (substitute-keyword-arguments (package-arguments wine)
        ((#:phases phases)
@@ -382,7 +382,7 @@ (define-public wine-staging
               (lambda* (#:key inputs #:allow-other-keys)
                 (invoke (search-input-file
                          inputs
-                         "/share/wine-staging/patches/patchinstall.sh")
+                         "/share/wine-staging/staging/patchinstall.py")
                         "DESTDIR=."
                         "--all")))
             (add-after 'apply-wine-staging-patches 'patch-SHELL
@@ -417,7 +417,7 @@ (define-public wine64-staging
               (lambda* (#:key inputs #:allow-other-keys)
                 (invoke (search-input-file
                          inputs
-                         "/share/wine-staging/patches/patchinstall.sh")
+                         "/share/wine-staging/staging/patchinstall.py")
                         "DESTDIR=."
                         "--all")))
             (add-after 'apply-wine-staging-patches 'patch-SHELL

base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd
-- 
2.41.0






^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-12-31 16:48 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-04 20:03 [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18 Kaelyn Takata via Guix-patches via
2023-11-05  9:06 ` Liliana Marie Prikler
2023-12-09 18:11   ` Kaelyn via Guix-patches via
2023-12-31 11:34     ` bug#66936: " Liliana Marie Prikler
2023-12-31 16:47       ` [bug#66936] " Kaelyn via Guix-patches via
2023-12-09 18:11 ` [bug#66936] [PATCH v2] " Kaelyn Takata via Guix-patches via
2023-12-24 15:47   ` Kaelyn

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.