From patchwork Sat Nov 4 20:03:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 55942 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 99C3527BBEA; Sat, 4 Nov 2023 20:05:49 +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 D2AE527BBE9 for ; Sat, 4 Nov 2023 20:05:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzMtm-0001xi-1l; Sat, 04 Nov 2023 16:05:38 -0400 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 1qzMta-0001wn-5G for guix-patches@gnu.org; Sat, 04 Nov 2023 16:05:26 -0400 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 1qzMtZ-0005Cn-IG for guix-patches@gnu.org; Sat, 04 Nov 2023 16:05:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzMu9-0005CJ-Rv for guix-patches@gnu.org; Sat, 04 Nov 2023 16:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Nov 2023 20:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66936 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66936@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169912830319897 (code B ref -1); Sat, 04 Nov 2023 20:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2023 20:05:03 +0000 Received: from localhost ([127.0.0.1]:35801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzMtC-0005Ar-Vh for submit@debbugs.gnu.org; Sat, 04 Nov 2023 16:05:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzMtB-0005AG-9Y for submit@debbugs.gnu.org; Sat, 04 Nov 2023 16:05:02 -0400 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 1qzMsV-0001pO-Dn for guix-patches@gnu.org; Sat, 04 Nov 2023 16:04:19 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qzMsT-0003gV-81 for guix-patches@gnu.org; Sat, 04 Nov 2023 16:04:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1699128252; x=1699387452; bh=ROMBlJtbo++pwmHLys+xnQBC/ywCTXW1ajoFocOqicI=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=AyHjKIVlshhnHFh1yGpZJO890rN3rvgi1GHBk1RUleB1d15fbqoVmuGUbJIOjrkJt pFw7HsyLrWFobHqdCa23FFK892xULT+zwyEuJhKHiFZ/PmeaC21PFlZlOGaTdDx2xK HU0yViWud3VkNwl5UzKbocjZYKJIWDfFh6+puxWdYZ51PJ2I3+qn6w+iwVkvOV9nvL 4qDW4737tXMgonSgOq1WWY5LBngqMpSBsiHydGmzHXmEWa6LXkhlYwaoVXZol0y+UK iWP92KJ5XkaF5vltInqsifNKxuVzpz9lkDPiDBqzDFaN3yL8/1rczSk0VMCJe/8QmX p4YQJHrPV7BdQ== Date: Sat, 04 Nov 2023 20:03:54 +0000 Message-ID: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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. Change-Id: Ie71ed785c1e821b1d1752e46b3da11809b4331e5 --- gnu/packages/wine.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd 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