* [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18.
@ 2023-11-04 20:03 Kaelyn Takata via Guix-patches via
2023-11-05 9:06 ` Liliana Marie Prikler
2023-12-09 18:11 ` [bug#66936] [PATCH v2] " Kaelyn Takata via Guix-patches via
0 siblings, 2 replies; 6+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-11-04 20:03 UTC (permalink / raw)
To: 66936; +Cc: Kaelyn Takata
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18.
2023-11-04 20:03 [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18 Kaelyn Takata via Guix-patches via
@ 2023-11-05 9:06 ` Liliana Marie Prikler
2023-12-09 18:11 ` Kaelyn via Guix-patches via
2023-12-09 18:11 ` [bug#66936] [PATCH v2] " Kaelyn Takata via Guix-patches via
1 sibling, 1 reply; 6+ messages in thread
From: Liliana Marie Prikler @ 2023-11-05 9:06 UTC (permalink / raw)
To: Kaelyn Takata, 66936
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18.
2023-11-05 9:06 ` Liliana Marie Prikler
@ 2023-12-09 18:11 ` Kaelyn via Guix-patches via
2023-12-31 11:34 ` bug#66936: " Liliana Marie Prikler
0 siblings, 1 reply; 6+ messages in thread
From: Kaelyn via Guix-patches via @ 2023-12-09 18:11 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 66936
On Sunday, November 5th, 2023 at 1:06 AM, Liliana Marie Prikler <liliana.prikler@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#66936] [PATCH v2] gnu: wine-staging: Update to 8.18.
2023-11-04 20:03 [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18 Kaelyn Takata via Guix-patches via
2023-11-05 9:06 ` Liliana Marie Prikler
@ 2023-12-09 18:11 ` Kaelyn Takata via Guix-patches via
1 sibling, 0 replies; 6+ messages in thread
From: Kaelyn Takata via Guix-patches via @ 2023-12-09 18:11 UTC (permalink / raw)
To: 66936; +Cc: Kaelyn Takata
* 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#66936: [PATCH] gnu: wine-staging: Update to 8.18.
2023-12-09 18:11 ` Kaelyn via Guix-patches via
@ 2023-12-31 11:34 ` Liliana Marie Prikler
2023-12-31 16:47 ` [bug#66936] " Kaelyn via Guix-patches via
0 siblings, 1 reply; 6+ messages in thread
From: Liliana Marie Prikler @ 2023-12-31 11:34 UTC (permalink / raw)
To: Kaelyn; +Cc: 68005-done, 66936-done
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18.
2023-12-31 11:34 ` bug#66936: " Liliana Marie Prikler
@ 2023-12-31 16:47 ` Kaelyn via Guix-patches via
0 siblings, 0 replies; 6+ messages in thread
From: Kaelyn via Guix-patches via @ 2023-12-31 16:47 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 68005-done, 66936-done
Hi Liliana,
On Sunday, December 31st, 2023 at 3:34 AM, Liliana Marie Prikler <liliana.prikler@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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-31 16:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-04 20:03 [bug#66936] [PATCH] gnu: wine-staging: Update to 8.18 Kaelyn Takata via Guix-patches via
2023-11-05 9:06 ` Liliana Marie Prikler
2023-12-09 18:11 ` Kaelyn via Guix-patches via
2023-12-31 11:34 ` bug#66936: " Liliana Marie Prikler
2023-12-31 16:47 ` [bug#66936] " Kaelyn via Guix-patches via
2023-12-09 18:11 ` [bug#66936] [PATCH v2] " Kaelyn Takata via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).