From patchwork Sat Dec 9 18:11:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 57444 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B68D827BBEA; Sat, 9 Dec 2023 18:13:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B87B227BBE2 for ; Sat, 9 Dec 2023 18:12:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rC1on-0008SV-JB; Sat, 09 Dec 2023 13:12:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rC1om-0008SM-Fe for guix-patches@gnu.org; Sat, 09 Dec 2023 13:12:48 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rC1om-00036J-7D for guix-patches@gnu.org; Sat, 09 Dec 2023 13:12:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rC1oz-0001pL-Rh for guix-patches@gnu.org; Sat, 09 Dec 2023 13:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66936] [PATCH v2] gnu: wine-staging: Update to 8.18. References: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> In-Reply-To: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Dec 2023 18:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66936 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66936@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 66936-submit@debbugs.gnu.org id=B66936.17021455386971 (code B ref 66936); Sat, 09 Dec 2023 18:13:01 +0000 Received: (at 66936) by debbugs.gnu.org; 9 Dec 2023 18:12:18 +0000 Received: from localhost ([127.0.0.1]:48892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC1oI-0001oM-Cx for submit@debbugs.gnu.org; Sat, 09 Dec 2023 13:12:18 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:58355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC1oG-0001o9-Co for 66936@debbugs.gnu.org; Sat, 09 Dec 2023 13:12:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1702145516; x=1702404716; bh=XDFvx5TFYcB+4CgEfgKJPmOZGzxkVfgdc7qSPpdZDYw=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=agammH/T+by1hY/l9G841C2Y0Fz0Zi6QgbOhI6Yp8bsncVKZTD76YDNrw1Kkyd9Dq HteX1wGgiD8ozG7T5OO4S4nHE0mdn5492gK9BMrD7pdO1h0CGD51LDZqMtJpH57/Xn b+joPmr+jCoKMILzLva+GWfb3ipH5/jW4IoET6I9V3a6WBJxP3ZdzOi9886y7TRwT6 eFknMTBe2uUPhSw8aalIU5lwb3Odfeitv1yH8bzIyGTL6Y9KnUnTgzmgbm1GnV5oez BbxD4WeV2kdaiM5KAk1mcxr+twHZSaF0B3CGWC0YmDYh+oKnU10JKXXFcj6cJBbvsO cTOfRainMp02A== Date: Sat, 09 Dec 2023 18:11:44 +0000 Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wine.scm (wine-staging): Update to 8.18. (wine-staging-patchset-data)[#:builder]: Adjust accordingly. [native-inputs]: Drop bash. (wine-staging)[native-inputs]: Add python-3. [#:phases]: Adjust path to patch script. (wine64-staging)[#:phases]: Likewise. Change-Id: Ie71ed785c1e821b1d1752e46b3da11809b4331e5 --- gnu/packages/wine.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) base-commit: 61f2d84e75c340c2ba528d392f522c51b8843f34 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 400f0e7607..48f7499ba2 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,10 +313,10 @@ (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)) + (list coreutils)) (arguments `(#:modules ((guix build utils)) #:builder @@ -324,16 +324,12 @@ (define-public wine-staging-patchset-data (use-modules (guix build utils)) (let* ((build-directory ,(string-append name "-" version)) (source (assoc-ref %build-inputs "source")) - (bash (assoc-ref %build-inputs "bash")) (coreutils (assoc-ref %build-inputs "coreutils")) (out (assoc-ref %outputs "out")) (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 +359,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 +369,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 +381,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 +416,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