From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id SFh4BRukRmXzuwAAG6o9tA:P1 (envelope-from ) for ; Sat, 04 Nov 2023 21:05:47 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id SFh4BRukRmXzuwAAG6o9tA (envelope-from ) for ; Sat, 04 Nov 2023 21:05:47 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C87A546B71 for ; Sat, 4 Nov 2023 21:05:46 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=AyHjKIVl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699128347; a=rsa-sha256; cv=none; b=cU26QOw8agI5vA7yDz7ICtH6kYlqbwfmFnIydxb0PtPJHATwe3kXgdW9W0XVNKW5Dr5/hR eB++jHCwqTPXlOoV+1+y4bt99GVREvS//1zy0lS5t06bG10g2bv4q6xf86Jr7fEE2ar5+h ATqmkSkw2LtVTjPnw7IXBudXOHLNa4uRlNmXdb58QEHC0inzYFDvjkRuW0DZw9cTguevsY Cmr2UQ09Qg270rq+FEprlAebrB9Vdoz/OMUWgPg/SMbxYKfDfLTyo8lkXk6WoyyQukRYLr ZQCw0YulPBj3R9bsYZtV3ZU+4OD06jOBowD1v+IRdGp8LC21VrriycXLn0WOrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699128347; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ROMBlJtbo++pwmHLys+xnQBC/ywCTXW1ajoFocOqicI=; b=S4Q7CLDR0vdA8QODa+srwBOayIPg9odZ9etrVW3Uq3tt1BqXgfe9zZGV7J/iaSazsIwmd9 MtoGaPMzAF1WLYP+lgE4rQn934MG7mu8cERPiwFjsgcO2navuRHy4hNKpQ1QWsYBcNMohw rZSdH2IYU2Da2NqW685OudCPDnRWlfZkhqDgo9vO7rnaLjPU7Jn2Se+B4UMjdC4iTmuNSC +zH6jZBhcVxrmjq/vgH3GwMsHae2u/zWKi8EpKFDCuNGe+ayyRoItKXMdggMa6O5ZJhXaE IBwh+U6XPlGOhkuOUlecd1DHhDfm5eiAYOw9L0Zh5XaDsr3uQg7ivH4SgDmRlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=AyHjKIVl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.11 X-Migadu-Queue-Id: C87A546B71 X-Migadu-Spam-Score: -5.11 X-TUID: Km9C+SELAlB4 * 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=3D." "--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=3D." "--all"))) (add-after 'apply-wine-staging-patches 'patch-SHELL base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd --=20 2.41.0