From unknown Tue Jun 17 22:10:59 2025 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 From: Kaelyn Takata 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-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kaelyn.alexi[at]protonmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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 From unknown Tue Jun 17 22:10:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Nov 2023 09:08: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: Kaelyn Takata , 66936@debbugs.gnu.org Received: via spool by 66936-submit@debbugs.gnu.org id=B66936.169917523319014 (code B ref 66936); Sun, 05 Nov 2023 09:08:02 +0000 Received: (at 66936) by debbugs.gnu.org; 5 Nov 2023 09:07:13 +0000 Received: from localhost ([127.0.0.1]:36125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzZ68-0004wc-SA for submit@debbugs.gnu.org; Sun, 05 Nov 2023 04:07:13 -0500 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:48606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzZ67-0004wO-4u for 66936@debbugs.gnu.org; Sun, 05 Nov 2023 04:07:12 -0500 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-5079f3f3d7aso4615403e87.1 for <66936@debbugs.gnu.org>; Sun, 05 Nov 2023 01:06:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699175188; x=1699779988; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=iC65v28ZSKKpRE2MPmj+yQ15U+Aa+yej9Z/d6jlk1xI=; b=T4BRI2AscDDeXgG2ckL6HWMQmybp3BNB3bJDqDCxuuJqPeHNvU9S0TlofL3ocAsfXN UOCXqNnOSltNs8iAaf3c4f/c0mLaZJcAcqsRF9I2gyUV9lnerXSHol9UKnEbrDO1H4ac KNaGzMBs+Yr7DP03J1BZ619qXW/eIWcP4wHulKEoBpK4GA3Cf8yGVuGTmV9gm5jpIOzY cOMl1ou32e/oW43N+UIq+FaP+39f7sveX0yurwZ4BKWrq18CNL0Ilr927v+zEa/IFAVp xJy37Cwtb2K2OtCUXYG1dnhvSiz1J3UEmkPxSp66mmGFn5oLe6F69swzhj1ZgegHRH5V QZOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699175188; x=1699779988; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iC65v28ZSKKpRE2MPmj+yQ15U+Aa+yej9Z/d6jlk1xI=; b=akQOHLdOv3x6IBc82UJeqDvMZF83tR7myuvKfZX5KPi3Pdni0UNVPEJ9t578bY10Fc Ves2zVtJybdQxr4PnQo3LYhKsQDoxjXq9RIESbc1hXxTEjatnCDwd457l9neess1u5IO F6JJJlKQv8Qcyy6c2cmnIJjEWWN4p84EsgBWNwst0rN6NJwzCSF8ipY21x0OwV/wiZIM 0F2pDB7mec6UFYxK2J/Tlkj/jhS5iatlJ2lCfzs98/nMcqsNQq8EKlrRABphKTwAeXtU sFNiNparzLaTB8zK2Wg/57pIYYGih05fUMbwNP/cwRtxjui41qki8rjFsXwbGeX0Fb/n 7uqQ== X-Gm-Message-State: AOJu0YzLQvEZEs5ApxzeVYPQhcvho8+845RVFgOqk7A8jBpvJfOUVcmK C3EnlAQUwUuG3EM6yZeOVOE= X-Google-Smtp-Source: AGHT+IEzvXl5pl7eLHWGRcy7bQpWPWKzXWC0/h9bIhY8ejZxT082l0pOGaX5x78PEnO/8Zlh4XF5ow== X-Received: by 2002:ac2:5e85:0:b0:509:451f:72f with SMTP id b5-20020ac25e85000000b00509451f072fmr7980735lfq.48.1699175187759; Sun, 05 Nov 2023 01:06:27 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f16-20020adff450000000b0032fb7b4f191sm5970729wrp.91.2023.11.05.01.06.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 01:06:26 -0800 (PST) Message-ID: <752670b2c89e20e2044c7182f9f6a8779f40e215.camel@gmail.com> From: Liliana Marie Prikler Date: Sun, 05 Nov 2023 10:06:22 +0100 In-Reply-To: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> References: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU2Ftc3RhZywgZGVtIDA0LjExLjIwMjMgdW0gMjA6MDMgKzAwMDAgc2NocmllYiBLYWVseW4g VGFrYXRhOgo+ICogZ251L3BhY2thZ2VzL3dpbmUuc2NtICh3aW5lLXN0YWdpbmcpOiBVcGRhdGUg dG8gOC4xOC4KVGhpcyBDaGFuZ2VMb2cgZmFsbHMgc2hvcnQgb2Ygb3RoZXIgY2hhbmdlcyB5b3Ug bWFrZSwgcHJlc3VtYWJseSB0bwprZWVwIHRoZSBwYWNrYWdlIGJ1aWxkaW5nLiAgSW4gcGFydGlj dWxhcjoKCj4gQ2hhbmdlLUlkOiBJZTcxZWQ3ODVjMWU4MjFiMWQxNzUyZTQ2YjNkYTExODA5YjQz MzFlNQo+IC0tLQo+IMKgZ251L3BhY2thZ2VzL3dpbmUuc2NtIHwgMTggKysrKysrKysrLS0tLS0t LS0tCj4gwqAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQo+ IAo+IGRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvd2luZS5zY20gYi9nbnUvcGFja2FnZXMvd2lu ZS5zY20KPiBpbmRleCA0MDBmMGU3NjA3Li5jYTA2ZTI2NGRjIDEwMDY0NAo+IC0tLSBhL2dudS9w YWNrYWdlcy93aW5lLnNjbQo+ICsrKyBiL2dudS9wYWNrYWdlcy93aW5lLnNjbQo+IEBAIC0zMDQs NyArMzA0LDcgQEAgKGRlZmluZS1wdWJsaWMgd2luZTY0Cj4gwqAoZGVmaW5lLXB1YmxpYyB3aW5l LXN0YWdpbmctcGF0Y2hzZXQtZGF0YQo+IMKgwqAgKHBhY2thZ2UKPiDCoMKgwqDCoCAobmFtZSAi d2luZS1zdGFnaW5nLXBhdGNoc2V0LWRhdGEiKQo+IC3CoMKgwqAgKHZlcnNpb24gIjguMCIpCj4g K8KgwqDCoCAodmVyc2lvbiAiOC4xOCIpCj4gwqDCoMKgwqAgKHNvdXJjZQo+IMKgwqDCoMKgwqAg KG9yaWdpbgo+IMKgwqDCoMKgwqDCoMKgIChtZXRob2QgZ2l0LWZldGNoKQo+IEBAIC0zMTMsNyAr MzEzLDcgQEAgKGRlZmluZS1wdWJsaWMgd2luZS1zdGFnaW5nLXBhdGNoc2V0LWRhdGEKPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29tbWl0IChzdHJpbmctYXBwZW5kICJ2IiB2ZXJzaW9u KSkpKQo+IMKgwqDCoMKgwqDCoMKgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJz aW9uKSkKPiDCoMKgwqDCoMKgwqDCoCAoc2hhMjU2Cj4gLcKgwqDCoMKgwqDCoMKgIChiYXNlMzIK PiAiMTFxOWZhMWpkcnYxcGQ5cGlhaWNncXZpZHExYzA4aW1rd3BxaHl6Y2o1cjcxMXJsNzU4MSIp KSkpCj4gK8KgwqDCoMKgwqDCoMKgIChiYXNlMzIKPiAiMHFhYnl3NTEzOXhkZnN2emJ3YnJuMW5u cXNzZ3drOG1uODhteG5xMmNka2s5Z2JqdnE1NiIpKSkpCj4gwqDCoMKgwqAgKGJ1aWxkLXN5c3Rl bSB0cml2aWFsLWJ1aWxkLXN5c3RlbSkKPiDCoMKgwqDCoCAobmF0aXZlLWlucHV0cwo+IMKgwqDC oMKgwqAgKGxpc3QgYmFzaCBjb3JldXRpbHMpKQo+IEBAIC0zMzAsMTAgKzMzMCw3IEBAIChkZWZp bmUtcHVibGljIHdpbmUtc3RhZ2luZy1wYXRjaHNldC1kYXRhCj4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKHdpbmUtc3RhZ2luZyAoc3RyaW5nLWFwcGVuZCBvdXQgIi9zaGFyZS93 aW5lLQo+IHN0YWdpbmciKSkpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29weS1yZWN1cnNp dmVseSBzb3VyY2UgYnVpbGQtZGlyZWN0b3J5KQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHdp dGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiBidWlsZC1kaXJlY3RvcnkKPiAtwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzdWJzdGl0dXRlKiAicGF0Y2hlcy9wYXRjaGluc3RhbGwuc2giCj4gLcKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiL2Jpbi9zaCIpCj4gLcKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoc3RyaW5nLWFwcGVuZCBiYXNoICIvYmluL3NoIikpKQo+IC3CoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJwYXRjaGVzL2dpdGFwcGx5LnNoIgo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICcoInBhdGNoZXMvZ2l0YXBwbHku c2giCj4gInN0YWdpbmcvcGF0Y2hpbnN0YWxsLnB5IikKKHdpbmUtc3RhZ2luZy1wYXRjaHNldC1k YXRhKVsjOmJ1aWxkZXJdOiBBZGp1c3QgYWNjb3JkaW5nbHkuCgpOb3RlLCBpdCBhcHBlYXJzIHlv dSBubyBsb25nZXIgbmVlZCBiYXNoIGZvciB0aGlzIHBhY2thZ2UsIHNvIHlvdSBtaWdodAp0byBl dmVuIG1vcmUgY2hhbmdlcy4KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiL3Vz ci9iaW4vZW52IikKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLWFw cGVuZCBjb3JldXRpbHMgIi9iaW4vZW52IikpKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChj b3B5LXJlY3Vyc2l2ZWx5IGJ1aWxkLWRpcmVjdG9yeSB3aW5lLXN0YWdpbmcpCj4gQEAgLTM2Myw3 ICszNjAsNyBAQCAoZGVmaW5lLXB1YmxpYyB3aW5lLXN0YWdpbmcKPiDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJ3aW5lLSIgd2luZS12 ZXJzaW9uICIudGFyLnh6IikpCj4gwqDCoMKgwqDCoMKgwqDCoMKgIChmaWxlLW5hbWUgKHN0cmlu Zy1hcHBlbmQgbmFtZSAiLSIgd2luZS12ZXJzaW9uICIudGFyLnh6IikpCj4gwqDCoMKgwqDCoMKg wqDCoMKgIChzaGEyNTYKPiAtwqDCoMKgwqDCoMKgwqDCoMKgIChiYXNlMzIKPiAiMGJrcjNrbHZq eThoNGRqZGRyMzFmdmFwc2k5cGMycnNpeWhhYTdqMWx3cHE3MDR3NHdoMiIpKSkpKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqAgKGJhc2UzMgo+ICIxbnYwNmF3YjNodjI2djY0bnFua3M5eWl6N3czNjhz Y3h6bmo3N3Z4YTN6cG1oYWZ6eWloIikpKSkpCj4gwqDCoMKgwqAgKGlucHV0cyAobW9kaWZ5LWlu cHV0cyAocGFja2FnZS1pbnB1dHMgd2luZSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChwcmVwZW5kIGF1dG9jb25mIDsgZm9yIGF1dG9yZWNvbmYKPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGZmbXBlZwo+IEBAIC0zNzMsNiArMzcwLDkgQEAg KGRlZmluZS1wdWJsaWMgd2luZS1zdGFnaW5nCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCBweXRob24KPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIHV0aWwtbGludXggOyBmb3IgaGV4ZHVtcAo+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgd2luZS1zdGFnaW5nLXBhdGNoc2V0 LWRhdGEpKSkKPiArwqDCoMKgIChuYXRpdmUtaW5wdXRzCj4gK8KgwqDCoMKgIChtb2RpZnktaW5w dXRzIChwYWNrYWdlLW5hdGl2ZS1pbnB1dHMgd2luZSkKPiArwqDCoMKgwqDCoMKgIChwcmVwZW5k IHB5dGhvbi0zKSkpCih3aW5lLXN0YWdpbmcpW25hdGl2ZS1pbnB1dHNdOiBBZGQgcHl0aG9uLTMu Cj4gwqDCoMKgwqAgKGFyZ3VtZW50cwo+IMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUta2V5d29yZC1h cmd1bWVudHMgKHBhY2thZ2UtYXJndW1lbnRzIHdpbmUpCj4gwqDCoMKgwqDCoMKgwqAgKCgjOnBo YXNlcyBwaGFzZXMpCj4gQEAgLTM4Miw3ICszODIsNyBAQCAoZGVmaW5lLXB1YmxpYyB3aW5lLXN0 YWdpbmcKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEqICgjOmtleSBpbnB1 dHMgIzphbGxvdy1vdGhlci1rZXlzKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChpbnZva2UgKHNlYXJjaC1pbnB1dC1maWxlCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgaW5wdXRzCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiL3NoYXJlL3dpbmUtCj4gc3RhZ2luZy9wYXRjaGVz L3BhdGNoaW5zdGFsbC5zaCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAiL3NoYXJlL3dpbmUtCj4gc3RhZ2luZy9zdGFnaW5nL3BhdGNoaW5zdGFs bC5weSIpClsjOnBoYXNlc108YXBwbHktd2luZS1zdGFnaW5nLXBhdGNoZXM+OiBBZGp1c3QgcGF0 aCB0byBwYXRjaCBzY3JpcHQuCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICJERVNURElSPS4iCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICItLWFsbCIpKSkKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGFkZC1hZnRlciAnYXBwbHktd2luZS1zdGFnaW5nLXBhdGNoZXMgJ3BhdGNoLVNIRUxMCj4gQEAg LTQxNyw3ICs0MTcsNyBAQCAoZGVmaW5lLXB1YmxpYyB3aW5lNjQtc3RhZ2luZwo+IMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVy LWtleXMpCj4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGludm9rZSAoc2VhcmNo LWlucHV0LWZpbGUKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCBpbnB1dHMKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgICIvc2hhcmUvd2luZS0KPiBzdGFnaW5nL3BhdGNoZXMvcGF0Y2hpbnN0YWxsLnNo IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIv c2hhcmUvd2luZS0KPiBzdGFnaW5nL3N0YWdpbmcvcGF0Y2hpbnN0YWxsLnB5IikKKHdpbmU2NC1z dGFnaW5nKVsjOnBoYXNlc108YXBwbHktd2luZS1zdGFnaW5nLXBhdGNoZXM+OiBMaWtld2lzZS4K PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIkRFU1RE SVI9LiIKPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg Ii0tYWxsIikpKQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICdhcHBseS13 aW5lLXN0YWdpbmctcGF0Y2hlcyAncGF0Y2gtU0hFTEwKPiAKPiBiYXNlLWNvbW1pdDogZTNmMzE4 ZjA0ODkzMjJjNGM5YjU5NjRmMDNhOGIwNjNhN2JmYmViZAoKQ2hlZXJzCg== From unknown Tue Jun 17 22:10:59 2025 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 From: Kaelyn 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-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Tue Jun 17 22:10:59 2025 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 From: Kaelyn Takata Message-ID: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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(-) 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=3D." "--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=3D." "--all"))) (add-after 'apply-wine-staging-patches 'patch-SHELL base-commit: 61f2d84e75c340c2ba528d392f522c51b8843f34 --=20 2.41.0 From unknown Tue Jun 17 22:10:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66936] [PATCH v2] gnu: wine-staging: Update to 8.18. Resent-From: Kaelyn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Dec 2023 15:49: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: 66936@debbugs.gnu.org, guix-devel Received: via spool by 66936-submit@debbugs.gnu.org id=B66936.170343289523853 (code B ref 66936); Sun, 24 Dec 2023 15:49:02 +0000 Received: (at 66936) by debbugs.gnu.org; 24 Dec 2023 15:48:15 +0000 Received: from localhost ([127.0.0.1]:53370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHQi6-0006Ce-2J for submit@debbugs.gnu.org; Sun, 24 Dec 2023 10:48:14 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:64755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHQi3-0006Bn-Oj for 66936@debbugs.gnu.org; Sun, 24 Dec 2023 10:48:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1703432878; x=1703692078; bh=44VUbrHxUo7cifNwzyCGu55mXxaOV5RAq3isPep424o=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=bMCyXQ9IKYj3Fk3/JaGnMvFK5b5eJfnhthCu+wyUaGM6GJxhhUmUdVLjz2Cq+fYBj nBHdRocFK7lFF9qNVhVuvASzI/ek/58X8sqGf/5ssbCH7y2gyMkV0K92DulUqe6HDF jsEiRmMkx8XQRLGaO3yIXmVnadxumjHPyl6FN06b+dqDlphrH8X6q7qPgXCcfsKQum xQZdKPmMu+UZnzcW8JEt57yguLfFeaXMI6vkw4i/07OO+OOayLVPQSM4QclM0td5Wy ia/CQtx68AjrATqJHtg7v3o3RQZeJDIWxbFkf6vWSx/zJVj0fCxpYEKdVhJKD36Nox 3BqKB1ITaFEmQ== Date: Sun, 24 Dec 2023 15:47:50 +0000 From: Kaelyn Message-ID: In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi guix-devel, I just sent out https://issues.guix.gnu.org/68005 to remove dxvk 1.5.5, whi= ch as far as I can tell has been broken for a few years now (IIRC I tested = as far back in guix history as wine-staging 5.13 or 5.22 from 2-3 years ago= and still encountered the same errors building dxvk). I wanted to bump thi= s 2+ week old update to wine-staging since dxvk is the only dependent on wi= ne-staging and it does not currently build (and the QA status of bug #66936= is still "Pending"). Cheers, Kaelyn On Saturday, December 9th, 2023 at 10:11 AM, Kaelyn Takata wrote: >=20 > * 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. >=20 > (wine64-staging)[#:phases]: Likewise. >=20 >=20 > Change-Id: Ie71ed785c1e821b1d1752e46b3da11809b4331e5 > --- > gnu/packages/wine.scm | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) >=20 > 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=3D." > "--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=3D." > "--all"))) > (add-after 'apply-wine-staging-patches 'patch-SHELL >=20 > base-commit: 61f2d84e75c340c2ba528d392f522c51b8843f34 > -- > 2.41.0 From unknown Tue Jun 17 22:10:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kaelyn Takata Subject: bug#66936: closed (Re: [PATCH] gnu: wine-staging: Update to 8.18.) Message-ID: References: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> X-Gnu-PR-Message: they-closed 66936 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 66936@debbugs.gnu.org Date: Sun, 31 Dec 2023 11:35:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1704022503-16470-1" This is a multi-part message in MIME format... ------------=_1704022503-16470-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #66936: [PATCH] gnu: wine-staging: Update to 8.18. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 66936@debbugs.gnu.org. --=20 66936: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66936 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1704022503-16470-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 66936-done) by debbugs.gnu.org; 31 Dec 2023 11:34:17 +0000 Received: from localhost ([127.0.0.1]:45691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJu5B-0004Fk-4q for submit@debbugs.gnu.org; Sun, 31 Dec 2023 06:34:17 -0500 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:53705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJu57-0004FQ-DV; Sun, 31 Dec 2023 06:34:15 -0500 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a27c6c88694so56131066b.3; Sun, 31 Dec 2023 03:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704022446; x=1704627246; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=oergiNP8TQi6EaArcWnHusXDYafrBZzMWWG8HR190c4=; b=LT4MOrcp8WLblLYtLGXoP4YOgv0LKyawvUxCCJqaHeTmx8mdzMCt4kTIEMxmRDdD0m jnT03Rg9n8nlQNJ6YvE6AWq2Zs+sLDhflYjoK4piQrkDeFJ47qDmuXYTet+g9OTa1J6g TexTFdfSsN85WSE3MpLBM7xa+qW4QlvzvhK3Gcq8i+w00FrUSrMJ9KyzywFdIl+T5j3i Ws1ttjOXhx5WbTqYT1ry9Jxlfj6restYeu1T7njprtBYwM44FRcXQmSOuddtGq+hAQGa qE/X5wJTq9+npjffISO58umWChaZQ4v44pG+TQbkBUqwYen/U3U/dJhyO7A4Tw0PoMbL DMBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704022446; x=1704627246; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=oergiNP8TQi6EaArcWnHusXDYafrBZzMWWG8HR190c4=; b=beDQ1Zdf5tEFKw9UXzqfADBdWNrlyny3H5FO+lEwGKgV0YieZbTxtgZAAX9KuKoy+A du6PhidxNpIrqdpfeTgLl8oKdLXppOq36tEay3QGpidh6Ua5kSsJWXLaAjRw1Qtg07YJ I1AP/KLpIsIa5KKI/dwr+zBRTSHJ5JYg4QhFwIduilYo3NgRGvDim0oJH6m15pl9hbpX lca7HWPp8FytKVbWE04opPBHmdu/nDazq2HreN5XiB66JXy++dC7Oyg6BZ0BJJRnaE/C mN5XESW7Bf1w0z6fjFsW1GkXxgbtbFB03pptKkJvF1yodadbEaY7cTZ0GPOkwMle/zD6 6inw== X-Gm-Message-State: AOJu0YwrdyMlrcymXlrr/t7bD/uQ2DM8K4HS/d12rPEGxBpL67Z862Uv tVNw2vtHcqbg/tpcgMGeVugMFxld5uk= X-Google-Smtp-Source: AGHT+IFbiiP7YTwPS8AiM2vrlDZeI7qa4cs/JeLux6CyxTt+C6sA4u6WfKi4RS5p/ZI9bnRz1bhwxA== X-Received: by 2002:a17:907:28c1:b0:a23:43c5:3077 with SMTP id en1-20020a17090728c100b00a2343c53077mr6756346ejc.27.1704022446148; Sun, 31 Dec 2023 03:34:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id vz10-20020a17090704ca00b00a269b230c0esm9996427ejb.34.2023.12.31.03.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 03:34:05 -0800 (PST) Message-ID: Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18. From: Liliana Marie Prikler To: Kaelyn Date: Sun, 31 Dec 2023 12:34:03 +0100 In-Reply-To: References: <0c40b27e0ae5c9d46aae0c578485e520d85bcea8.1699128205.git.kaelyn.alexi@protonmail.com> <752670b2c89e20e2044c7182f9f6a8779f40e215.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 66936-done Cc: 68005-done@debbugs.gnu.org, 66936-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 09.12.2023 um 18:11 +0000 schrieb Kaelyn: > 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 removal). I sadly didn't receive the v2, so I'm commenting here instead. I've pushed both this and the removal of dxvk now. Thanks ------------=_1704022503-16470-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org From: Kaelyn Takata Subject: [PATCH] gnu: wine-staging: Update to 8.18. 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-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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(-) Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (kaelyn.alexi[at]protonmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit Cc: Kaelyn Takata X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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 ------------=_1704022503-16470-1-- From unknown Tue Jun 17 22:10:59 2025 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: Sun, 31 Dec 2023 16:48: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: Liliana Marie Prikler Cc: 68005-done@debbugs.gnu.org, 66936-done@debbugs.gnu.org Received: via spool by 66936-done@debbugs.gnu.org id=D66936.170404124832622 (code D ref 66936); Sun, 31 Dec 2023 16:48:01 +0000 Received: (at 66936-done) by debbugs.gnu.org; 31 Dec 2023 16:47:28 +0000 Received: from localhost ([127.0.0.1]:46928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJyyG-0008U4-E5 for submit@debbugs.gnu.org; Sun, 31 Dec 2023 11:47:28 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:22599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJyyE-0008Tl-06; Sun, 31 Dec 2023 11:47:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1704041238; x=1704300438; bh=XUiBy0rVZ1yzh6dDV+yD8Ff48v5Z9QX/EEf5mD0RONY=; 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=jRIl5werypOqNKhzvIFnHWUzFfJCzNO2Vk18bcegp/eTBaX4Mk/9WzpIm2YGRxkku UwTVKnl0pJfeAKMOyeiboMadwXUkHxpRociBIMaGCj+ac2eEn2MZzkM55Q6Nxejxax cs8XA7/N/5MBBr0MTgqHNiaXHSc7QHxV3Z9QiAF5E0xDlyvUFvY61TeZfYltLGKxaC d1GC4bm4Cw0np07geTa+7UqesGBXtEHXpQ1femJg/I2Z1piwytjWUbKEvljaK2ls+F ObexfIRkg/IYe61wtI98tEOeeUPK6c+PlqK8PSSZSLbJz3EtAD4JmzvWKnldKkL1z6 CktXoMHPaxONg== Date: Sun, 31 Dec 2023 16:47:00 +0000 From: Kaelyn Message-ID: In-Reply-To: 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-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Liliana, On Sunday, December 31st, 2023 at 3:34 AM, Liliana Marie Prikler wrote: >=20 > Am Samstag, dem 09.12.2023 um 18:11 +0000 schrieb Kaelyn: >=20 > > 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 removal). >=20 > I sadly didn't receive the v2, so I'm commenting here instead. >=20 > I've pushed both this and the removal of dxvk now. Thank you for pushing these changes! Cheers, Kaelyn > Thanks