Package: guix-patches;
Reported by: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>
Date: Sat, 4 Nov 2023 20:06:01 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66936 in the body.
You can then email your comments to 66936 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#66936; Package guix-patches.
(Sat, 04 Nov 2023 20:06:01 GMT) Full text and rfc822 format available.Kaelyn Takata <kaelyn.alexi <at> protonmail.com>:guix-patches <at> gnu.org.
(Sat, 04 Nov 2023 20:06:01 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Kaelyn Takata <kaelyn.alexi <at> protonmail.com> To: guix-patches <at> gnu.org Cc: Kaelyn Takata <kaelyn.alexi <at> protonmail.com> Subject: [PATCH] gnu: wine-staging: Update to 8.18. Date: Sat, 04 Nov 2023 20:03:54 +0000
* 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=."
"--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
base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd
--
2.41.0
guix-patches <at> gnu.org:bug#66936; Package guix-patches.
(Sun, 05 Nov 2023 09:08:02 GMT) Full text and rfc822 format available.Message #8 received at 66936 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Kaelyn Takata <kaelyn.alexi <at> protonmail.com>, 66936 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18. Date: Sun, 05 Nov 2023 10:06:22 +0100
Am Samstag, dem 04.11.2023 um 20:03 +0000 schrieb Kaelyn Takata:
> * gnu/packages/wine.scm (wine-staging): Update to 8.18.
This ChangeLog falls short of other changes you make, presumably to
keep the package building. In particular:
> 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")
(wine-staging-patchset-data)[#:builder]: Adjust accordingly.
Note, it appears you no longer need bash for this package, so you might
to even more changes.
> (("/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)))
(wine-staging)[native-inputs]: Add 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")
[#:phases]<apply-wine-staging-patches>: Adjust path to patch script.
> "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")
(wine64-staging)[#:phases]<apply-wine-staging-patches>: Likewise.
> "DESTDIR=."
> "--all")))
> (add-after 'apply-wine-staging-patches 'patch-SHELL
>
> base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd
Cheers
guix-patches <at> gnu.org:bug#66936; Package guix-patches.
(Sat, 09 Dec 2023 18:12:02 GMT) Full text and rfc822 format available.Message #11 received at 66936 <at> debbugs.gnu.org (full text, mbox):
From: Kaelyn <kaelyn.alexi <at> protonmail.com> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: 66936 <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18. Date: Sat, 09 Dec 2023 18:11:17 +0000
On Sunday, November 5th, 2023 at 1:06 AM, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote:
>
>
> Am Samstag, dem 04.11.2023 um 20:03 +0000 schrieb Kaelyn Takata:
>
> > * gnu/packages/wine.scm (wine-staging): Update to 8.18.
>
> 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 complicated patch, I wasn't sure how to word it (the format seems to require breaking 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 for 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 removal).
Thanks,
Kaelyn
> > 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")
>
> (wine-staging-patchset-data)[#:builder]: Adjust accordingly.
>
> Note, it appears you no longer need bash for this package, so you might
> to even more changes.
>
> > (("/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)))
>
> (wine-staging)[native-inputs]: Add 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")
>
> [#:phases]<apply-wine-staging-patches>: Adjust path to patch script.
>
> > "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")
>
> (wine64-staging)[#:phases]<apply-wine-staging-patches>: Likewise.
>
> > "DESTDIR=."
> > "--all")))
> > (add-after 'apply-wine-staging-patches 'patch-SHELL
> >
> > base-commit: e3f318f0489322c4c9b5964f03a8b063a7bfbebd
>
>
> Cheers
guix-patches <at> gnu.org:bug#66936; Package guix-patches.
(Sat, 09 Dec 2023 18:13:01 GMT) Full text and rfc822 format available.Message #14 received at 66936 <at> debbugs.gnu.org (full text, mbox):
From: Kaelyn Takata <kaelyn.alexi <at> protonmail.com> To: 66936 <at> debbugs.gnu.org Cc: Kaelyn Takata <kaelyn.alexi <at> protonmail.com> Subject: [PATCH v2] gnu: wine-staging: Update to 8.18. Date: Sat, 09 Dec 2023 18:11:44 +0000
* 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]<apply-wine-staging-patches>: Adjust path to patch script.
(wine64-staging)[#:phases]<apply-wine-staging-patches>: 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=."
"--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
base-commit: 61f2d84e75c340c2ba528d392f522c51b8843f34
--
2.41.0
guix-patches <at> gnu.org:bug#66936; Package guix-patches.
(Sun, 24 Dec 2023 15:49:02 GMT) Full text and rfc822 format available.Message #17 received at 66936 <at> debbugs.gnu.org (full text, mbox):
From: Kaelyn <kaelyn.alexi <at> protonmail.com> To: 66936 <at> debbugs.gnu.org, guix-devel <guix-devel <at> gnu.org> Subject: Re: [PATCH v2] gnu: wine-staging: Update to 8.18. Date: Sun, 24 Dec 2023 15:47:50 +0000
Hi guix-devel,
I just sent out https://issues.guix.gnu.org/68005 to remove dxvk 1.5.5, which 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 this 2+ week old update to wine-staging since dxvk is the only dependent on wine-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 <kaelyn.alexi <at> protonmail.com> wrote:
>
> * 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]<apply-wine-staging-patches>: Adjust path to patch script.
>
> (wine64-staging)[#:phases]<apply-wine-staging-patches>: 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=."
> "--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
>
> base-commit: 61f2d84e75c340c2ba528d392f522c51b8843f34
> --
> 2.41.0
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:Kaelyn Takata <kaelyn.alexi <at> protonmail.com>:Message #22 received at 66936-done <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Kaelyn <kaelyn.alexi <at> protonmail.com> Cc: 68005-done <at> debbugs.gnu.org, 66936-done <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18. Date: Sun, 31 Dec 2023 12:34:03 +0100
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
guix-patches <at> gnu.org:bug#66936; Package guix-patches.
(Sun, 31 Dec 2023 16:48:01 GMT) Full text and rfc822 format available.Message #25 received at 66936-done <at> debbugs.gnu.org (full text, mbox):
From: Kaelyn <kaelyn.alexi <at> protonmail.com> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: 68005-done <at> debbugs.gnu.org, 66936-done <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: wine-staging: Update to 8.18. Date: Sun, 31 Dec 2023 16:47:00 +0000
Hi Liliana, On Sunday, December 31st, 2023 at 3:34 AM, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote: > > 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. Thank you for pushing these changes! Cheers, Kaelyn > Thanks
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Mon, 29 Jan 2024 12:24:07 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.