unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Alexandros Theodotou <alex@zrythm.org>
Cc: Tobias Geerinckx-Rice <me@tobias.gr>,
	42473-done@debbugs.gnu.org,
	Maxim Cournoyer <maxim.cournoyer@gmail.com>,
	GNU Guix maintainers <guix-maintainers@gnu.org>
Subject: bug#42473: [PATCH] gnu: zrythm: Update to 0.8.694.
Date: Sun, 13 Sep 2020 23:37:36 +0200	[thread overview]
Message-ID: <87mu1t8ijj.fsf@gnu.org> (raw)
In-Reply-To: <5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org> (Alexandros Theodotou's message of "Fri, 11 Sep 2020 17:52:35 +0100")

Hi,

Alexandros Theodotou <alex@zrythm.org> skribis:

> On Fri, 2020-09-11 at 17:36 +0200, Ludovic Courtès wrote:
>> This requires Meson 0.55 so it doesn’t work on master.
>> 
>> Could you add Meson 0.55 and have zrythm use it?
>
> Done. Not sure exactly what you expect but I added an additional
> meson55 package and used it like #:meson ,meson55. Feel free to edit it
> accordingly.
>
>> > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
>> > index b674019b8f..01f8a6bfc2 100644
>> > --- a/gnu/packages/web.scm
>> > +++ b/gnu/packages/web.scm
>> > @@ -5027,6 +5027,7 @@ written in C.  It is developed as part of the
>> > NetSurf project.")
>> >    (package
>> >      (name "libcyaml")
>> >      (version "1.0.1")
>> > +    (version "1.1.0")
>> >      (source
>> >       (origin
>> >         (method git-fetch)
>> > @@ -5036,6 +5037,7 @@ written in C.  It is developed as part of the
>> > NetSurf project.")
>> >         (file-name (git-file-name name version))
>> >         (sha256
>> >          (base32
>> > "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))
>> > +        (base32
>> > "1al5cbild3qimm59rmaj3i8m57qhinwshz7r67p7fqsccijrz71b"))))
>> 
>> This one is obviously broken.  I tried to redo it by hand, but then
>> zrythm would fail to build.
>
> Err, gitg miss, I only selected the additions to stage. Fixed.
>
>> Could you resend the other 3 patches, making sure everything works on
>> master?
>
> Please find them attached.

Applied with the following tweaks:

  • Renamed Meson variable to ‘meson-0.55’.

  • Replaced libcyaml upgrade with my own version since I got a
    different hash than the one your patch had.  If you still have a
    different version, please check whether there are differences.

Thanks!

Ludo’.




      reply	other threads:[~2020-09-13 21:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22  8:34 [bug#42473] [PATCH] gnu: zrythm: Update to 0.8.694 Alexandros Theodotou
2020-07-22 22:16 ` Ludovic Courtès
2020-07-23  3:06   ` Maxim Cournoyer
2020-07-26 10:16     ` Alexandros Theodotou
2020-07-26 17:08       ` Tobias Geerinckx-Rice via Guix-patches via
2020-07-26 19:26         ` Alexandros Theodotou
2020-07-26 22:51           ` Leo Prikler
2020-09-10 10:22           ` Ludovic Courtès
2020-09-10 13:16             ` Alexandros Theodotou
2020-09-11 15:36               ` Ludovic Courtès
2020-09-11 16:52                 ` Alexandros Theodotou
2020-09-13 21:37                   ` Ludovic Courtès [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mu1t8ijj.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=42473-done@debbugs.gnu.org \
    --cc=alex@zrythm.org \
    --cc=guix-maintainers@gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    --cc=me@tobias.gr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).