[PATCH] gnu: zrythm: Update to 0.8.694.

DoneSubmitted by Alexandros Theodotou.
Details
5 participants
  • Alexandros Theodotou
  • Leo Prikler
  • Ludovic Courtès
  • Maxim Cournoyer
  • Tobias Geerinckx-Rice
Owner
unassigned
Severity
normal
A
A
Alexandros Theodotou wrote on 22 Jul 10:34 +0200
(name . Guix patches)(address . guix-patches@gnu.org)
0e6300fea9caa1f9d7645c968a7c5b50d89f7b5c.camel@zrythm.org
Hi,
This is actually 2 patches. The first updates libcyaml and the 2ndZrythm. Note that I (Zrythm author) have added a trademark policy toZrythm that says modified versions that include the trademarks requirepermission (as discussed on IRC with a few people):https://www.zrythm.org/en/trademarks.html
I am not 100% sure if patching the xdg-open path counts as a modifiedversion, but in any case this email is signed using the same key usedto sign the release, so it can be interpreted as "written permission"to redistribute this.
The FSDG allows trademarks from what I understand:```Trademarks are associated with some software. For example, the name ofa program may be trademarked, or its interface may display atrademarked logo. Often, the use of these marks will be controlled insome way; in particular, developers are commonly asked to removereferences to the trademark from the software when they modify it.
In extreme cases, these restrictions may effectively render the programnonfree. It is unfair for someone to ask you to remove a trademark frommodified code if that trademark is scattered all throughout theoriginal source. As long as the practical requirements are reasonable,however, free system distributions may include these programs, eitherwith or without the trademarks.
Similarly, the distribution itself may hold particular trademarks. Itis not a problem if modification requires removal of these trademarks,as long as they can readily be removed without losing functionality.
However, it is unacceptable to use trademarks to restrict verbatimcopying and redistribution of the whole distribution, or any part.```
And Zrythm now has a meson option for easily changing the program name,if you would prefer to rename it to something else (Z-Daw forexample). Changing the logo is also very trivial, and I plan to addfreely licensed replacements in future releases to make it even easierto replace.
So it is up to the maintainers to decide if they want to keep Zrythm asit is or rename it. Either way, I am happy with either decision,although I would prefer if you were OK with keeping the "Zrythm" name(as long as there's no patches to remove/add functionality or links tothe Zrythm website or things like that).
Thanks,Alex
From 56e23c40ccd135d84da51a7dd7131882ef115310 Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Wed, 22 Jul 2020 09:19:26 +0100Subject: [PATCH 2/2] gnu: zrythm: Update to 0.8.694.
* gnu/packages/music.scm (zrythm): Update to 0.8.694.--- gnu/packages/music.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Toggle diff (43 lines)diff --git a/gnu/packages/music.scm b/gnu/packages/music.scmindex 3089a22c7c..bea00c01ba 100644--- a/gnu/packages/music.scm+++ b/gnu/packages/music.scm@@ -5204,7 +5204,7 @@ and as an LV2 plugin.") (define-public zrythm (package (name "zrythm")- (version "0.8.333")+ (version "0.8.694") (source (origin (method url-fetch)@@ -5212,13 +5212,13 @@ and as an LV2 plugin.") version ".tar.xz")) (sha256 (base32- "0x2kxr5zz058jpy6k6ymj0fi2gqfcgrlv4qkwz9443hjy5345iwb"))))+ "17a2g153cyrx0jjgd2ppyraprlnk2zi4ihzr3f7gn0485crlc2g2")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t #:configure-flags- `("-Denable_tests=true" "-Dmanpage=true"- "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")+ `("-Dtests=true" "-Dmanpage=true"+ "-Ddseg_font=false" "-Dffmpeg=enabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-xdg-open@@ -5245,8 +5245,9 @@ and as an LV2 plugin.") ("libsndfile" ,libsndfile) ("libyaml" ,libyaml) ("lilv" ,lilv)+ ("rubberband" ,rubberband) ("xdg-utils" ,xdg-utils)- ("rubberband" ,rubberband)))+ ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("help2man" ,help2man)-- 2.27.0
From d95da9e9b272ac2706946b4c7ef01a99149cbe7d Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Sat, 18 Jul 2020 14:29:32 +0100Subject: [PATCH 1/2] gnu: libcyaml: Update to 1.1.0.
* gnu/packages/web.scm (libcyaml): Update to 1.1.0.--- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scmindex 47162c49de..17ed65595d 100644--- a/gnu/packages/web.scm+++ b/gnu/packages/web.scm@@ -5014,7 +5014,7 @@ written in C. It is developed as part of the NetSurf project.") (define-public libcyaml (package (name "libcyaml")- (version "1.0.1")+ (version "1.1.0") (source (origin (method git-fetch)@@ -5023,7 +5023,7 @@ written in C. It is developed as part of the NetSurf project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256- (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))+ (base32 "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93")))) (build-system gnu-build-system) (arguments `(#:make-flags-- 2.27.0
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl8X+iUACgkQAi6uQjE9cPPsFggArzpIbOKzGjTiglqL8T5qtfSBEDfyIm3g9EOAOoc0PU6gyz0BXSodKcYWBdszRcfJgwgidnOiU/mbmyLBTXY9p15+/BG3OazeHfCXEqM8IsGvDKbPVAuFGdjmyXi/3Rajv3gzJzG56jP8LMQ2pwz8ODuSnn2xQgWmkwFzgOXqZ75s+bOwaSzsQfA9iaZw9uwbZZoFc/3d99mlKjHghrH3I22BL/piZ8puaVUmhz8YDm52ID4Z2jXK5bU75eV7aFUrpHKg1S5T4yBUfNIlrrHG9t0ibdRHuQuVkWDW9YLnjLwCovuvfJUUbS/u6C2HXrW39eu3JOVJ/h6/2wbRlGRPPQ===KyAM-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 23 Jul 00:16 +0200
(name . Alexandros Theodotou)(address . alex@zrythm.org)
87k0yvfb60.fsf@gnu.org
Hi Alexandros,
Alexandros Theodotou <alex@zrythm.org> skribis:
Toggle quote (11 lines)> This is actually 2 patches. The first updates libcyaml and the 2nd> Zrythm. Note that I (Zrythm author) have added a trademark policy to> Zrythm that says modified versions that include the trademarks require> permission (as discussed on IRC with a few people):> https://www.zrythm.org/en/trademarks.html>> I am not 100% sure if patching the xdg-open path counts as a modified> version, but in any case this email is signed using the same key used> to sign the release, so it can be interpreted as "written permission"> to redistribute this.
OK. Perhaps right above the ‘name’ field of the package, you could adda link to the trademark policy above and state that Guix has a writtenpermission to use it, with a link to your message? That way we’ll havean audit trail.
Toggle quote (2 lines)> The FSDG allows trademarks from what I understand:
Your interpretation seems correct to me.
Toggle quote (6 lines)> So it is up to the maintainers to decide if they want to keep Zrythm as> it is or rename it. Either way, I am happy with either decision,> although I would prefer if you were OK with keeping the "Zrythm" name> (as long as there's no patches to remove/add functionality or links to> the Zrythm website or things like that).
I don’t see any reason not to keep “Zrythm” as things stand.
Thoughts anyone? (Cc: maintainers.)
Apart from that, the patches LGTM!
Thank you,Ludo’.
M
M
Maxim Cournoyer wrote on 23 Jul 05:06 +0200
(name . Ludovic Courtès)(address . ludo@gnu.org)
87wo2vdj6d.fsf@gmail.com
Hello,
Ludovic Courtès <ludo@gnu.org> writes:
Toggle quote (20 lines)> Hi Alexandros,>> Alexandros Theodotou <alex@zrythm.org> skribis:>>> This is actually 2 patches. The first updates libcyaml and the 2nd>> Zrythm. Note that I (Zrythm author) have added a trademark policy to>> Zrythm that says modified versions that include the trademarks require>> permission (as discussed on IRC with a few people):>> https://www.zrythm.org/en/trademarks.html>>>> I am not 100% sure if patching the xdg-open path counts as a modified>> version, but in any case this email is signed using the same key used>> to sign the release, so it can be interpreted as "written permission">> to redistribute this.>> OK. Perhaps right above the ‘name’ field of the package, you could add> a link to the trademark policy above and state that Guix has a written> permission to use it, with a link to your message? That way we’ll have> an audit trail.
That's a good idea.
Toggle quote (4 lines)>> The FSDG allows trademarks from what I understand:>> Your interpretation seems correct to me.
To me as well.
Toggle quote (10 lines)>> So it is up to the maintainers to decide if they want to keep Zrythm as>> it is or rename it. Either way, I am happy with either decision,>> although I would prefer if you were OK with keeping the "Zrythm" name>> (as long as there's no patches to remove/add functionality or links to>> the Zrythm website or things like that).>> I don’t see any reason not to keep “Zrythm” as things stand.>> Thoughts anyone? (Cc: maintainers.)
I wish the trademark restrictions were relaxed to include the right formodifications made solely with the goal ofbuilding/packaging/integrating the software with a free softwaredistribution. This would make things hassle free and extra clear.
That said, I'm not opposed to include Zrythm as things stands, if othermaintainers are OK with it.
Maxim
A
A
Alexandros Theodotou wrote on 26 Jul 12:16 +0200
db4aa86c1499e0c191777694e9986612ebfd9162.camel@zrythm.org
Hi,
Thanks for the feedback!
Attaching the updated patch.
Thanks,Alex
On Wed, 2020-07-22 at 23:06 -0400, Maxim Cournoyer wrote:
Toggle quote (65 lines)> Hello,> > Ludovic Courtès <ludo@gnu.org> writes:> > > Hi Alexandros,> > > > Alexandros Theodotou <alex@zrythm.org> skribis:> > > > > This is actually 2 patches. The first updates libcyaml and the> > > 2nd> > > Zrythm. Note that I (Zrythm author) have added a trademark policy> > > to> > > Zrythm that says modified versions that include the trademarks> > > require> > > permission (as discussed on IRC with a few people):> > > https://www.zrythm.org/en/trademarks.html> > > > > > I am not 100% sure if patching the xdg-open path counts as a> > > modified> > > version, but in any case this email is signed using the same key> > > used> > > to sign the release, so it can be interpreted as "written> > > permission"> > > to redistribute this.> > > > OK. Perhaps right above the ‘name’ field of the package, you could> > add> > a link to the trademark policy above and state that Guix has a> > written> > permission to use it, with a link to your message? That way we’ll> > have> > an audit trail.> > That's a good idea.> > > > The FSDG allows trademarks from what I understand:> > > > Your interpretation seems correct to me.> > To me as well.> > > > So it is up to the maintainers to decide if they want to keep> > > Zrythm as> > > it is or rename it. Either way, I am happy with either decision,> > > although I would prefer if you were OK with keeping the "Zrythm"> > > name> > > (as long as there's no patches to remove/add functionality or> > > links to> > > the Zrythm website or things like that).> > > > I don’t see any reason not to keep “Zrythm” as things stand.> > > > Thoughts anyone? (Cc: maintainers.)> > I wish the trademark restrictions were relaxed to include the right> for> modifications made solely with the goal of> building/packaging/integrating the software with a free software> distribution. This would make things hassle free and extra clear.> > That said, I'm not opposed to include Zrythm as things stands, if> other> maintainers are OK with it.> > Maxim
From 93189e429e19246c2039630b871eadd9c10cb73f Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Wed, 22 Jul 2020 09:19:26 +0100Subject: [PATCH 2/2] gnu: zrythm: Update to 0.8.694.
* gnu/packages/music.scm (zrythm): Update to 0.8.694.--- gnu/packages/music.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
Toggle diff (48 lines)diff --git a/gnu/packages/music.scm b/gnu/packages/music.scmindex 3089a22c7c..f1db53ca65 100644--- a/gnu/packages/music.scm+++ b/gnu/packages/music.scm@@ -5203,8 +5203,12 @@ and as an LV2 plugin.") (define-public zrythm (package+ ;; Zrythm contains trademarks and comes with a trademark policy found in+ ;; TRADMARKS.md inside the release distribution. Guix has written+ ;; permission to use the Zrythm trademarks:+ ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42473 (name "zrythm")- (version "0.8.333")+ (version "0.8.694") (source (origin (method url-fetch)@@ -5212,13 +5216,13 @@ and as an LV2 plugin.") version ".tar.xz")) (sha256 (base32- "0x2kxr5zz058jpy6k6ymj0fi2gqfcgrlv4qkwz9443hjy5345iwb"))))+ "17a2g153cyrx0jjgd2ppyraprlnk2zi4ihzr3f7gn0485crlc2g2")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t #:configure-flags- `("-Denable_tests=true" "-Dmanpage=true"- "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")+ `("-Dtests=true" "-Dmanpage=true"+ "-Ddseg_font=false" "-Dffmpeg=enabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-xdg-open@@ -5245,8 +5249,9 @@ and as an LV2 plugin.") ("libsndfile" ,libsndfile) ("libyaml" ,libyaml) ("lilv" ,lilv)+ ("rubberband" ,rubberband) ("xdg-utils" ,xdg-utils)- ("rubberband" ,rubberband)))+ ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("help2man" ,help2man)-- 2.27.0
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl8dV/wACgkQAi6uQjE9cPM1OAf8CG5Np3VBuw26zO3StFs4S8rtm39ehhqU37sF3sgz/CdNkuA5vMPX94nxvlJHhQCYXhEHEXkDtZtSIKiJFkvi34jvfEQ9XnkLn2eA9TTZXYNrYRwmqj0EWyL7tY4FJSjMoyiHRGY7gBwQMye12zX0MYJ1zYsz7xAY6XyErnYJVn0tNqELTBSPnXn6tEhVLq1R/fQmqo6/GDjbD85ImCR0043/prsJQhkXbr0neQ8Z5Ja8HBW3ZpofUEmnuFeMibGyIybxXric7kZ9ZNk+jx/hXTqtkC655PV9hXDjVy1ROLyB1nu1xa2d2BHzRYPiitUUwh3kMgYMAf24S/XPVe4qBQ===+4m1-----END PGP SIGNATURE-----

T
T
Tobias Geerinckx-Rice wrote on 26 Jul 19:08 +0200
(name . Alexandros Theodotou)(address . alex@zrythm.org)
871rkydx1j.fsf@nckx
Alexandros,
Thanks for discussing this!
+ ;; Zrythm contains trademarks and comes with a trademark policy found in+ ;; TRADMARKS.md inside the release distribution. ^^^^^^^^^
Typo.
Guix has written+ ;; permission to use the Zrythm trademarks:+ ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42473
So does everyone else.
This implies that Guix has some special right but AFAICT the linked URL does not grant a single exception to ‘unmodified copies’. What's the intention behind this hunk?
Does the permission to ‘use the […] trademarks’ mean that we can now use them however we want? Presumably not, but then Guix doesn't need any ‘written permission’ at all. Your policy applies to everyone.
I'd love to see a trademark policy that doesn't mention Guix (or *anyone*) by name but gives us (and *anyone*) the freedom to do what we want to do: responsibly but independently maintain & redistribute a well-integrated, CVE-free ZRythm package. I'm aware that I might be hoping for too much :-)
Kind regards,
T G-R
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCXx24eAAKCRANsP+IT1VteRI1AQCIVn7AonaKFPHg/Ky67TQbygVDEdgR1ySojQrTAVtyCQD+L/pgGGbV1zuc31KL2IsrwhMLt63+KM+sZ7oQwjUhywc==guRH-----END PGP SIGNATURE-----
A
A
Alexandros Theodotou wrote on 26 Jul 21:26 +0200
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
0f9e1795910b17cdd4d73f3b4848276f5da09889.camel@zrythm.org
Hi,
On Sun, 2020-07-26 at 19:08 +0200, Tobias Geerinckx-Rice wrote:
Toggle quote (11 lines)> So does everyone else.> > This implies that Guix has some special right but AFAICT the > linked URL does not grant a single exception to ‘unmodified > copies’. What's the intention behind this hunk? > > Does the permission to ‘use the […] trademarks’ mean that we can > now use them however we want? Presumably not, but then Guix > doesn't need any ‘written permission’ at all. Your policy applies > to everyone.
Let me propose this instead, which is much clearer and gives a lot offreedom to Guix for further modifications:
```Guix, as released by the GNU project on http://git.savannah.gnu.org/cgit/guix.git,has permission to includethis Zrythm release (cryptographically signed by Alexandros Theodotou)in its package repositories with any modifications necessary tointegrate Zrythm into Guix, provided that those modifications do notchange any of the intended functionalities of Zrythm or any text ormedia presented to the user by the Zrythm user interface (including,but not limited to URLs, images and message prompts). AlexandrosTheodotou reserves the right to revoke this trademark permission if thecurrent guidelines are not met, subject to Alexandros Theodotou's solediscretion.```
I can add this to the TRADEMARKS.md file (along with permissions forother distros in the future) and re-release in a couple of days, and aslong as this permission notice is present in future releases, Guix willhave permission to make any of the above changes. The last sentence isjust a failsafe/safeguard for me and seems like it's standard in alltrademark permissions.
What do you think?
Toggle quote (7 lines)> > I'd love to see a trademark policy that doesn't mention Guix (or > *anyone*) by name but gives us (and *anyone*) the freedom to do > what we want to do: responsibly but independently maintain & > redistribute a well-integrated, CVE-free ZRythm package. I'm > aware that I might be hoping for too much :-)
While I wish I could do that as well, there are no other similarexamples to follow afaik and IANAL so I don't know how to put thatwording in legal terms that cannot be abused (giving permission to*anyone* to do things with a trademark beyond what basic trademark lawallows does not sound like a good idea), besides giving specificpermission to trusted projects like GNU Guix, so I try to stay on thesafe side.
Thanks,Alex
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl8d2OgACgkQAi6uQjE9cPMs0AgAgOTsTtohhsUmbhnKsLvgAPLUkCjYduIG8xzQUu+fnohNO9oJgRj1TapG3H1/L8pvuVxibFdjre+f9LJUA9ZK5ydrzy23XvYATl2b63HPNiE3bVaM1KXr9YA/ccvr3PQRoXlWTMc+BJwPOwAmbMMY7SRGfmiLoso5PmWTxzzGOZRB5Bxisc+AtITi6p2WlSWjXK0dDhb1w/WkSAsdyr/Zdiv0buSHipUGtSc+70ZMsA/wrJ6XEWnOxBVIuf5IqO2JXASvLtuUfv5bU4M1+jh1zlgoco1tcXXvIA4NwVDvUni5qxb1pa9qKM8SHRFMQg4e5sWOVW8/80h5ofYADeGSPg===vA85-----END PGP SIGNATURE-----

L
L
Leo Prikler wrote on 27 Jul 00:51 +0200
ff27a6e71d304c303df55cf96ed4be100062a208.camel@student.tugraz.at
Am Sonntag, den 26.07.2020, 20:26 +0100 schrieb Alexandros Theodotou:
Toggle quote (14 lines)> > I'd love to see a trademark policy that doesn't mention Guix (or > > *anyone*) by name but gives us (and *anyone*) the freedom to do > > what we want to do: responsibly but independently maintain & > > redistribute a well-integrated, CVE-free ZRythm package. I'm > > aware that I might be hoping for too much :-)> > While I wish I could do that as well, there are no other similar> examples to follow afaik and IANAL so I don't know how to put that> wording in legal terms that cannot be abused (giving permission to> *anyone* to do things with a trademark beyond what basic trademark> law> allows does not sound like a good idea), besides giving specific> permission to trusted projects like GNU Guix, so I try to stay on the> safe side.
IANAL either, but instead of```You may distribute unaltered copies of Zrythm that include the Zrythmtrademarks without express permission from Alexandros Theodotou.```and```However, if you make any changes to Zrythm, you may not redistributethat product using any Zrythm trademark without Alexandros Theodotou’sprior written consent.```you should write something like```You may distribute unaltered copies of Zrythm that include the Zrythmtrademarks without express permission from Alexandros Theodotou.You may further distribute altered copies of Zrythm that include theZrythm trademarks, provided that alterations solely serve the purposesof:- porting Zrythm to a platform or free software distribution notalready supported by Zrythm as-is, OR- fixing a bug in Zrythm, that has already been acknowledged byAlexandros Theodotou or [a bigger authority, e.g. there's a CVE], OR- ...In any case, you must preserve [bla bla bla], also you must provide (alink to)? the original sources. If you make any other changes, you maynot redistribute that product...```
Roughly meaning: If it already works on Ubuntu, you shan't patch it tomake it work on Ubuntu. If it doesn't work on Gentoo, you can patch ituntil it works on Gentoo and no further. If Alexandros Theodotou has abugfix for something already published in Git, but you need to backportthat fix, you can do it. If there's a CVE you can patch it. If any ofthose patches goes beyond integration/bugfixing, that's a violation. Ipersonally believe, that this should be clear enough in most cases, butit needs slightly better legalese.
Regards, Leo
L
L
Ludovic Courtès wrote on 10 Sep 12:22 +0200
(name . Alexandros Theodotou)(address . alex@zrythm.org)
87mu1ygccl.fsf@gnu.org
Hi Alexandros!
AIUI, the FSDG-distro exemption athttps://www.zrythm.org/en/trademarks.html applies to the latestrelease (and presumably foreseeable releases as well):
You may further distribute altered copies of Zrythm that include the Zrythm trademarks, provided that alterations solely serve the purposes of:
• porting Zrythm to a free system distribution currently approved by the Free Software Foundation at https://www.gnu.org/distros/free-distros.html,OR
• fixing a bug in Zrythm that has already been acknowledged by Alexandros Theodotou or CVE (https://cve.mitre.org/)
(I personally think wording that also includes Debian and Fedora, forinstance, would be welcome, but it’s beyond the scope of this issue.)
There haven’t been further comments on this issue from fellowco-maintainers so I would suggest that you post a patch updating to thelatest release and I’ll gladly apply it.
Thanks in advance, and apologies for the delay!
Ludo’.
A
A
Alexandros Theodotou wrote on 10 Sep 15:16 +0200
(name . Ludovic Courtès)(address . ludo@gnu.org)
679bd4b51b68c5d83257618ef9855e7d54a71a94.camel@zrythm.org
Hi Ludo,
Toggle quote (3 lines)> (I personally think wording that also includes Debian and Fedora, for> instance, would be welcome, but it’s beyond the scope of this issue.)
Indeed, would be a good idea to add the "major" distros. Will add themsoon.
Toggle quote (5 lines)> There haven’t been further comments on this issue from fellow> co-maintainers so I would suggest that you post a patch updating to> the> latest release and I’ll gladly apply it.
Attaching the 4 patches required to update zrythm to 0.8.911 (includinga new dependency: reproc, and updated dependencies: libaudec &libcyaml).
For libaudec, mp3 handling is done via the embedded tinymp3 library now(which could perhaps be packaged in the future and add an option to usea system version) so ffmpeg is no longer necessary (same for zrythm).
For zrythm, I moved some dependencies from native-inputs to inputssince they are better suited there (I was initially misunderstandingwhat "native-inputs" meant when I first submitted it). Zstd is now alsoa dependency (used to compress/decompress project files).
There are a few more updates I want to make to add support for optionalfeatures but I will do that in future patches. Let's just get thelatest version working first.
Thanks,Alex
On Thu, 2020-09-10 at 12:22 +0200, Ludovic Courtès wrote:
Toggle quote (31 lines)> Hi Alexandros!> > AIUI, the FSDG-distro exemption at> <https://www.zrythm.org/en/trademarks.html> applies to the latest> release (and presumably foreseeable releases as well):> > You may further distribute altered copies of Zrythm that include> the> Zrythm trademarks, provided that alterations solely serve the> purposes> of:> > • porting Zrythm to a free system distribution currently approved> by> the Free Software Foundation at> https://www.gnu.org/distros/free-distros.html, OR> > • fixing a bug in Zrythm that has already been acknowledged by> Alexandros Theodotou or CVE (https://cve.mitre.org/)> > (I personally think wording that also includes Debian and Fedora, for> instance, would be welcome, but it’s beyond the scope of this issue.)> > There haven’t been further comments on this issue from fellow> co-maintainers so I would suggest that you post a patch updating to> the> latest release and I’ll gladly apply it.> > Thanks in advance, and apologies for the delay!> > Ludo’.
From 315b2618d2a95a950790d2a0bba05747b880505a Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Thu, 10 Sep 2020 14:03:20 +0100Subject: [PATCH 4/4] gnu: zrythm: Update to 0.8.911.
* gnu/packages/music.scm (zrythm): Update to 0.8.911.--- gnu/packages/music.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
Toggle diff (62 lines)diff --git a/gnu/packages/music.scm b/gnu/packages/music.scmindex ae8579cb47..affe067d7c 100644--- a/gnu/packages/music.scm+++ b/gnu/packages/music.scm@@ -5365,8 +5365,13 @@ and as an LV2 plugin.") (define-public zrythm (package+ ;; Zrythm contains trademarks and comes with a trademark policy found in+ ;; TRADMARKS.md inside the release distribution. The trademark policy+ ;; allows verbatim re-distribution, and it also allows FSF-approved+ ;; distros to make necessary changes to integrate the software into the+ ;; distribution. (name "zrythm")- (version "0.8.333")+ (version "0.8.911") (source (origin (method url-fetch)@@ -5374,13 +5379,13 @@ and as an LV2 plugin.") version ".tar.xz")) (sha256 (base32- "0x2kxr5zz058jpy6k6ymj0fi2gqfcgrlv4qkwz9443hjy5345iwb"))))+ "1xyp70sjc2k5pfdqbwqa988v86da0rmmyl8ry86bqv4ja80sc6g9")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t #:configure-flags- `("-Denable_tests=true" "-Dmanpage=true"- "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")+ `("-Dtests=true" "-Dmanpage=true"+ "-Ddseg_font=false") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-xdg-open@@ -5402,18 +5407,20 @@ and as an LV2 plugin.") ("gtk+" ,gtk+) ("gtksourceview" ,gtksourceview) ("guile" ,guile-2.2)+ ("libaudec" ,libaudec) ("libcyaml" ,libcyaml) ("libsamplerate" ,libsamplerate) ("libsndfile" ,libsndfile) ("libyaml" ,libyaml) ("lilv" ,lilv)+ ("lv2" ,lv2)+ ("reproc" ,reproc)+ ("rubberband" ,rubberband) ("xdg-utils" ,xdg-utils)- ("rubberband" ,rubberband)))+ ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("help2man" ,help2man)- ("libaudec" ,libaudec)- ("lv2" ,lv2) ("glib" ,glib "bin"))) ;for 'glib-compile-resources' (synopsis "Digital audio workstation focusing on usability") (description "Zrythm is a digital audio workstation designed to be-- 2.27.0
From c578fa80f6a07748e103e8c43355a354a749801e Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Thu, 10 Sep 2020 13:53:45 +0100Subject: [PATCH 3/4] gnu: libaudec: Update to 0.2.3.
* gnu/packages/audio.scm (libaudec): Update to 0.2.3.--- gnu/packages/audio.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Toggle diff (34 lines)diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scmindex 631b935f5e..9e1dac3e6a 100644--- a/gnu/packages/audio.scm+++ b/gnu/packages/audio.scm@@ -4610,7 +4610,7 @@ in the package.") (define-public libaudec (package (name "libaudec")- (version "0.2.2")+ (version "0.2.3") (source (origin (method git-fetch)@@ -4620,14 +4620,14 @@ in the package.") (file-name (git-file-name name version)) (sha256 (base32- "04mpmfmqc43asw0m3zxhb6jj4qms7x4jw7mx4xb1d3lh16xllniz"))))+ "04hw61db8wscj28qjyiaiafx8xl87njgmvqszxyhs4gmg8xgjip7")))) (build-system meson-build-system) (arguments- `(#:configure-flags `("-Denable_tests=true -Denable_ffmpeg=true")))+ ;; Compile tests.+ `(#:configure-flags `("-Dtests=true"))) (inputs `(("libsamplerate" ,libsamplerate)- ("libsndfile" ,libsndfile)- ("ffmpeg" ,ffmpeg)))+ ("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config", pkg-config))) (synopsis "Library for reading and resampling audio files")-- 2.27.0
From 10df2f9e6d8e533fc4df9ec067ef88468d788034 Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Thu, 10 Sep 2020 13:49:51 +0100Subject: [PATCH 2/4] gnu: libcyaml: Update to 1.1.0.
* gnu/packages/web.scm (libcyaml): Update to 1.1.0.--- gnu/packages/web.scm | 2 ++ 1 file changed, 2 insertions(+)
Toggle diff (22 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scmindex 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")))) (build-system gnu-build-system) (arguments `(#:make-flags-- 2.27.0
From 62dbf6ea03a35300be72e220732c9fd7de2a5e60 Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Thu, 10 Sep 2020 13:45:25 +0100Subject: [PATCH 1/4] gnu: Add reproc.
* gnu/packages/cpp.scm (reproc): New variable.--- gnu/packages/cpp.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
Toggle diff (51 lines)diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scmindex 78f0f28716..5ee7171158 100644--- a/gnu/packages/cpp.scm+++ b/gnu/packages/cpp.scm@@ -13,6 +13,7 @@ ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>+;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; ;;; This file is part of GNU Guix. ;;;@@ -493,6 +494,36 @@ it's own version of the tool, this is a fork that aims to be more responsive and make @code{cpplint} usable in wider contexts.") (license license:bsd-3))) +(define-public reproc+ (package+ (name "reproc")+ (version "14.1.0")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/DaanDeMeyer/reproc")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "1n71wb50qv2dmhjgw7azx5gigbrp19l2n3d41g9p05l5l0y1qg0q"))))+ (build-system cmake-build-system)+ (arguments+ ;; No tests.+ `(#:tests? #f+ ;; Enable building of shared library.+ #:configure-flags `("-DBUILD_SHARED_LIBS=1")))+ (native-inputs+ `(("pkg-config" ,pkg-config)))+ (synopsis "Process IO library")+ (description "reproc (Redirected Process) is a C/C++ library that+simplifies starting, stopping and communicating with external programs. The+main use case is executing command line applications directly from C or C+++code and retrieving their output.")+ (home-page "https://github.com/DaanDeMeyer/reproc")+ (license license:expat)))+ (define-public sobjectizer (package (name "sobjectizer")-- 2.27.0
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl9aJy8ACgkQAi6uQjE9cPOlmQf+NqauW/Gt9ESlNAG31d53zcEjCMX40dwq+zYeSzjXc5t/vcFN+BfDG/Yb8579HNO6hTfAGo/HQMWEgAYFunV5I/I1aXl5XOIQaTP02ooLXyZcCQz/Ggx7YiV3LZmLZCCFka3w+jcjm4cPJrEfeath0AZVirFkp6KgB4dycw1fmSyEUC+Bxr6ulaTS+YbxY8BCTG85h8Advv5VDcGCZafnR2bM05CDavv9DkcnoNDutkavVimJRTin/DtH17DL5unAzyE+DEJkCulzxaY0f/GexL5NnyQj+GuG+z25iwz4ZdEdT4/EpAQm7mmZCNb7X4TaCeTufUHN2kKGn2Tb9+m6pw===H1RP-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 11 Sep 17:36 +0200
(name . Alexandros Theodotou)(address . alex@zrythm.org)
871rj8tjdz.fsf@gnu.org
Hi,
Alexandros Theodotou <alex@zrythm.org> skribis:
Toggle quote (7 lines)> From 315b2618d2a95a950790d2a0bba05747b880505a Mon Sep 17 00:00:00 2001> From: Alexandros Theodotou <alex@zrythm.org>> Date: Thu, 10 Sep 2020 14:03:20 +0100> Subject: [PATCH 4/4] gnu: zrythm: Update to 0.8.911.>> * gnu/packages/music.scm (zrythm): Update to 0.8.911.
This requires Meson 0.55 so it doesn’t work on master.
Could you add Meson 0.55 and have zrythm use it?
Toggle quote (28 lines)> From 10df2f9e6d8e533fc4df9ec067ef88468d788034 Mon Sep 17 00:00:00 2001> From: Alexandros Theodotou <alex@zrythm.org>> Date: Thu, 10 Sep 2020 13:49:51 +0100> Subject: [PATCH 2/4] gnu: libcyaml: Update to 1.1.0.>> * gnu/packages/web.scm (libcyaml): Update to 1.1.0.> ---> gnu/packages/web.scm | 2 ++> 1 file changed, 2 insertions(+)>> 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 thenzrythm would fail to build.
Toggle quote (7 lines)> From 62dbf6ea03a35300be72e220732c9fd7de2a5e60 Mon Sep 17 00:00:00 2001> From: Alexandros Theodotou <alex@zrythm.org>> Date: Thu, 10 Sep 2020 13:45:25 +0100> Subject: [PATCH 1/4] gnu: Add reproc.>> * gnu/packages/cpp.scm (reproc): New variable.
Applied!
Could you resend the other 3 patches, making sure everything works onmaster?
TIA!
Ludo’.
A
A
Alexandros Theodotou wrote on 11 Sep 18:52 +0200
(name . Ludovic Courtès)(address . ludo@gnu.org)
5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org
Hi,
On Fri, 2020-09-11 at 17:36 +0200, Ludovic Courtès wrote:
Toggle quote (4 lines)> 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 additionalmeson55 package and used it like #:meson ,meson55. Feel free to edit itaccordingly.
Toggle quote (25 lines)> > 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.
Toggle quote (3 lines)> Could you resend the other 3 patches, making sure everything works on> master?
Please find them attached.
Thanks,Alex
From 5445ba672111bd753fcbba831996996de9d0fff0 Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Fri, 11 Sep 2020 17:48:40 +0100Subject: [PATCH 4/4] gnu: zrythm: Update to 0.8.911.
* gnu/packages/music.scm (zrythm): Update to 0.8.911.--- gnu/packages/music.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-)
Toggle diff (94 lines)diff --git a/gnu/packages/music.scm b/gnu/packages/music.scmindex aa55607939..57298c5d87 100644--- a/gnu/packages/music.scm+++ b/gnu/packages/music.scm@@ -73,11 +73,13 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost)+ #:use-module (gnu packages build-tools) #:use-module (gnu packages cdrom) #:use-module (gnu packages code) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression)+ #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl)@@ -5442,8 +5444,13 @@ and as an LV2 plugin.") (define-public zrythm (package+ ;; Zrythm contains trademarks and comes with a trademark policy found in+ ;; TRADMARKS.md inside the release distribution. The trademark policy+ ;; allows verbatim re-distribution, and it also allows FSF-approved+ ;; distros to make necessary changes to integrate the software into the+ ;; distribution. (name "zrythm")- (version "0.8.333")+ (version "0.8.911") (source (origin (method url-fetch)@@ -5451,13 +5458,19 @@ and as an LV2 plugin.") version ".tar.xz")) (sha256 (base32- "0x2kxr5zz058jpy6k6ymj0fi2gqfcgrlv4qkwz9443hjy5345iwb"))))+ "1xyp70sjc2k5pfdqbwqa988v86da0rmmyl8ry86bqv4ja80sc6g9")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t+ #:meson ,meson55 #:configure-flags- `("-Denable_tests=true" "-Dmanpage=true"- "-Dinstall_dseg_font=false" "-Denable_ffmpeg=true")+ `("-Dtests=true"+ "-Dmanpage=true"+ "-Ddseg_font=false"+ "-Dgraphviz=enabled" ; for exporting routing graphs+ "-Dguile=enabled" ; for Guile scripting+ "-Djack=enabled" ; for JACK audio/MIDI backend+ "-Dsdl=enabled") ; for SDL audio backend (which uses ALSA) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-xdg-open@@ -5470,7 +5483,6 @@ and as an LV2 plugin.") `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("font-dseg" ,font-dseg)- ("ffmpeg" ,ffmpeg) ("fftw" ,fftw) ("fftwf" ,fftwf) ("gettext" ,gettext-minimal)@@ -5479,19 +5491,23 @@ and as an LV2 plugin.") ("gtk+" ,gtk+) ("gtksourceview" ,gtksourceview) ("guile" ,guile-2.2)+ ("libaudec" ,libaudec) ("libcyaml" ,libcyaml) ("libsamplerate" ,libsamplerate) ("libsndfile" ,libsndfile) ("libyaml" ,libyaml) ("lilv" ,lilv)+ ("lv2" ,lv2)+ ("reproc" ,reproc)+ ("rubberband" ,rubberband)+ ("rtmidi" ,rtmidi)+ ("sdl2" ,sdl2) ("xdg-utils" ,xdg-utils)- ("rubberband" ,rubberband)))+ ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config) ("help2man" ,help2man)- ("libaudec" ,libaudec)- ("lv2" ,lv2)- ("glib" ,glib "bin"))) ;for 'glib-compile-resources'+ ("glib" ,glib "bin"))) ; for 'glib-compile-resources' (synopsis "Digital audio workstation focusing on usability") (description "Zrythm is a digital audio workstation designed to be featureful and easy to use. It offers unlimited automation options, LV2-- 2.27.0
From f19400bbce4d53df8d5829a3db4e3047b6b5ea6e Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Fri, 11 Sep 2020 17:37:23 +0100Subject: [PATCH 3/4] gnu: libaudec: Update to 0.2.3.
* gnu/packages/audio.scm (libaudec): Update to 0.2.3.--- gnu/packages/audio.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Toggle diff (34 lines)diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scmindex 0746f67b2e..5e6008f31e 100644--- a/gnu/packages/audio.scm+++ b/gnu/packages/audio.scm@@ -4610,7 +4610,7 @@ in the package.") (define-public libaudec (package (name "libaudec")- (version "0.2.2")+ (version "0.2.3") (source (origin (method git-fetch)@@ -4620,14 +4620,14 @@ in the package.") (file-name (git-file-name name version)) (sha256 (base32- "04mpmfmqc43asw0m3zxhb6jj4qms7x4jw7mx4xb1d3lh16xllniz"))))+ "04hw61db8wscj28qjyiaiafx8xl87njgmvqszxyhs4gmg8xgjip7")))) (build-system meson-build-system) (arguments- `(#:configure-flags `("-Denable_tests=true -Denable_ffmpeg=true")))+ ;; Compile tests.+ `(#:configure-flags `("-Dtests=true"))) (inputs `(("libsamplerate" ,libsamplerate)- ("libsndfile" ,libsndfile)- ("ffmpeg" ,ffmpeg)))+ ("libsndfile" ,libsndfile))) (native-inputs `(("pkg-config", pkg-config))) (synopsis "Library for reading and resampling audio files")-- 2.27.0
From e242e5eace681f9d0a6fda1b6e7c496a052f6ee9 Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Fri, 11 Sep 2020 17:34:22 +0100Subject: [PATCH 2/4] gnu: libcyaml: Update to 1.1.0.
* gnu/packages/web.scm (libcyaml): Update to 1.1.0.--- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/web.scm b/gnu/packages/web.scmindex 2c3a007779..f0d7278a59 100644--- a/gnu/packages/web.scm+++ b/gnu/packages/web.scm@@ -5027,7 +5027,7 @@ written in C. It is developed as part of the NetSurf project.") (define-public libcyaml (package (name "libcyaml")- (version "1.0.1")+ (version "1.1.0") (source (origin (method git-fetch)@@ -5036,7 +5036,7 @@ written in C. It is developed as part of the NetSurf project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256- (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))+ (base32 "1al5cbild3qimm59rmaj3i8m57qhinwshz7r67p7fqsccijrz71b")))) (build-system gnu-build-system) (arguments `(#:make-flags-- 2.27.0
From 434b1ee36502451959328b1fc426acdf44b4f980 Mon Sep 17 00:00:00 2001From: Alexandros Theodotou <alex@zrythm.org>Date: Fri, 11 Sep 2020 17:27:56 +0100Subject: [PATCH 1/4] gnu: Add meson55.
* gnu/packages/build-tools.scm (meson55): New variable.--- gnu/packages/build-tools.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Toggle diff (29 lines)diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scmindex 7213c1bd0b..45471dc954 100644--- a/gnu/packages/build-tools.scm+++ b/gnu/packages/build-tools.scm@@ -211,6 +211,22 @@ files}, are written in a custom domain-specific language (@dfn{DSL}) that resembles Python.") (license license:asl2.0))) +;; Added temporarily for packages that need it.+;; TODO: Remove when core-updates is merged.+(define-public meson55+ (package+ (inherit meson)+ (name "meson55")+ (version "0.55.1")+ (source (origin+ (method url-fetch)+ (uri (string-append "https://github.com/mesonbuild/meson/"+ "releases/download/" version "/meson-"+ version ".tar.gz"))+ (sha256+ (base32+ "1070kjiirxxdfppmrhi3wsc6rykay1zlciqrzayjhjg0hkw42mrv"))))))+ (define-public meson-for-build (package (inherit meson)-- 2.27.0
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEESBMjhK0999huJUuDAi6uQjE9cPMFAl9bq1MACgkQAi6uQjE9cPOMIQf/WVT5ylzoCAXMpOwdpdbO/Jrs5hvKkPS+oi+Eagmon+CvT/hDPefnhAYU/LyyIwuVHGP8wz9PaQXvRDLAUaRg/QqNaj+WGzqombIIdRvMrn62Jofzx7bR2iK2M/FNxgiknRfZDKx5vii9TojOON1PjOd+jbI0H/jRkD9GNtMI0Klvbw5alcLQb9NS/Bi7jV48oCtzb953NBSlWJDK3n5esykzsYoK496BEXh+/ll8s4R2CcrQVBy6JPhdRKSFLxdWTJPUSNIxVW7/Cjst1t6OvKLXEDyJNpPukCRmOejMp2NekVhbJpRl8n+qkx5qiOoQQ9Vdo4HDafsFWIrHz/Ei4Q===xuMI-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 13 Sep 23:37 +0200
(name . Alexandros Theodotou)(address . alex@zrythm.org)
87mu1t8ijj.fsf@gnu.org
Hi,
Alexandros Theodotou <alex@zrythm.org> skribis:
Toggle quote (41 lines)> 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’.
Closed
?