From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 4Gh5BgGudGWZBwAAauVa8A:P1 (envelope-from ) for ; Sat, 09 Dec 2023 19:12:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4Gh5BgGudGWZBwAAauVa8A (envelope-from ) for ; Sat, 09 Dec 2023 19:12:17 +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 98C80477C6 for ; Sat, 9 Dec 2023 19:12:15 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=MEnVcGr5; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702145536; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=eJEzlp6j47rbPIbcAWfQAHHvWxrV5BVUhK4N0lqAiLw=; b=HtJF5h7a712yKEz+L7k/5w2MGtlr+yYnm1DQyfjeXEm85TVf1gATYdTEgQ9TddJukFgmyk HHyygGdZHzeYaguxug6bDeGIN7tLh8yyhz5uwi+RDTcIhudOZKp5gIdwj2Uz2eWaxRr7vV Z5t0HRiMw5nNoElRxI62hEH/v1dpvLRm5Byz1BrITpry9vFLEIv9aKYFei7260bEt35EkG NnCvmHOx85QwPB85vTVqLqLA9svH4A4tfd33lHIZtltp5H/nA1zw35HpkdGkI/tzqDYoeY +lzDMsUm2TsFeSur+dkbQAiRr/C7VwJpKQd7T0Db29jkaxCrPR7F1eON26o+mw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702145536; a=rsa-sha256; cv=none; b=C8j2cPCJiJrvtlYgGMJeC6cUPQCC0SBSG9WfK8KNJyAqDytxm6AHuQ64+Ah0rGO/nC0zuE eGTeApa5LwjY71COVvs+gPK9uKgEpWu7OKI/eY1pV2sc7eM670dqvNvBuad7nWtZ337lTz l0OkofS6YTM8B0wpWprEzqL9ZAaj+vt+gOn8phG9rbGgkTVBkmfONhu+M4rrYdcp5TS7IE 6czUYmqfqVF5XXnjJXIix62C0LGuvEkPNUN6GAqmQE3ZwHX5I26ZAdA+RXhh+jPhI39GNj gslHpchahX+DCbzYWnT31JxLy/93mJziNfO888okahhmupEZG9Mp2uvs9fSvDQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=MEnVcGr5; 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"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rC1nq-0008Jx-U0; Sat, 09 Dec 2023 13:11:50 -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 1rC1np-0008Je-EE for guix-patches@gnu.org; Sat, 09 Dec 2023 13:11:49 -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 1rC1np-0002zb-6P for guix-patches@gnu.org; Sat, 09 Dec 2023 13:11:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rC1o2-0001nj-E5 for guix-patches@gnu.org; Sat, 09 Dec 2023 13:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18. Resent-From: Kaelyn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Dec 2023 18:12:02 +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: Liliana Marie Prikler Cc: 66936@debbugs.gnu.org Received: via spool by 66936-submit@debbugs.gnu.org id=B66936.17021455166912 (code B ref 66936); Sat, 09 Dec 2023 18:12:02 +0000 Received: (at 66936) by debbugs.gnu.org; 9 Dec 2023 18:11:56 +0000 Received: from localhost ([127.0.0.1]:48887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC1nv-0001nP-Sc for submit@debbugs.gnu.org; Sat, 09 Dec 2023 13:11:56 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:35119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rC1ns-0001n9-7q for 66936@debbugs.gnu.org; Sat, 09 Dec 2023 13:11:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1702145491; x=1702404691; bh=eJEzlp6j47rbPIbcAWfQAHHvWxrV5BVUhK4N0lqAiLw=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=MEnVcGr5Y8kWdW2yHY0Ki8eG6NfSMm2cpIWZBvqdx6nbuanq1mq37qsBHEShwsz8r 6Cr6BfyN1z8JUNdc28qyycyX52BU+WcuzR7BA0t7K45cZ3V4cb0K6xGZ9wegeik+B+ FwW8iM+vzAWPxR0G6QihubksOn5bYj3N7Af/rLJ2KAUzoOUdsAADqV6FiTX3IFt70P lypnSsLqrVxYrouVXCZUNuiZPc3Snv7iEju//RVykHNyZo+QvJZ7/NYauZiiHsxwGF iAwHkoJWfV/MN/3tfzNzdGyNMoyA/fI59xhdr+Pe8N0bldNRUZnjdPrhCxkgI7PTeH Ciu4ZCkOJvNDg== Date: Sat, 09 Dec 2023 18:11:17 +0000 Message-ID: In-Reply-To: <752670b2c89e20e2044c7182f9f6a8779f40e215.camel@gmail.com> References: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> <752670b2c89e20e2044c7182f9f6a8779f40e215.camel@gmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 X-ACL-Warn: , Kaelyn via Guix-patches From: Kaelyn 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-Spam-Score: -0.41 X-Spam-Score: -0.41 X-Migadu-Queue-Id: 98C80477C6 X-Migadu-Scanner: mx11.migadu.com X-TUID: we9vP4phZSPg On Sunday, November 5th, 2023 at 1:06 AM, Liliana Marie Prikler wrote: >=20 >=20 > Am Samstag, dem 04.11.2023 um 20:03 +0000 schrieb Kaelyn Takata: >=20 > > * gnu/packages/wine.scm (wine-staging): Update to 8.18. >=20 > This ChangeLog falls short of other changes you make, presumably to > keep the package building. In particular: Thank you for the help in filling out the commit message. For this more com= plicated patch, I wasn't sure how to word it (the format seems to require b= reaking down a logical change into almost tediously self-explanatory parts = and writing a line for each, in a way that gets a bit confusing to gauge fo= r my brain). I'm sending a v2 of the patch rebased against current master, = with bash removed from the wine-staging-patchset-data native-inputs and the= commit message expanded with your suggestions (plus noting the bash remova= l). Thanks, Kaelyn > > Change-Id: Ie71ed785c1e821b1d1752e46b3da11809b4331e5 > > --- > > gnu/packages/wine.scm | 18 +++++++++--------- > > 1 file changed, 9 insertions(+), 9 deletions(-) > >=20 > > 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") >=20 > (wine-staging-patchset-data)[#:builder]: Adjust accordingly. >=20 > Note, it appears you no longer need bash for this package, so you might > to even more changes. >=20 > > (("/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))) >=20 > (wine-staging)[native-inputs]: Add python-3. >=20 > > (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") >=20 > [#:phases]: Adjust path to patch script. >=20 > > "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") >=20 > (wine64-staging)[#:phases]: Likewise. >=20 > > "DESTDIR=3D." > > "--all"))) > > (add-after 'apply-wine-staging-patches 'patch-SHELL > >=20 > > base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd >=20 >=20 > Cheers