From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WIG+HD+RXl8vDAAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 21:38:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WAgLFz+RXl8TaQAAB5/wlQ (envelope-from ) for ; Sun, 13 Sep 2020 21:38:07 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2065694060B for ; Sun, 13 Sep 2020 21:38:07 +0000 (UTC) Received: from localhost ([::1]:51474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHZhF-0005wh-Eh for larch@yhetil.org; Sun, 13 Sep 2020 17:38:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHZhC-0005wV-9B for guix-patches@gnu.org; Sun, 13 Sep 2020 17:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHZhC-0005oC-0K for guix-patches@gnu.org; Sun, 13 Sep 2020 17:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHZhB-0006S1-VO for guix-patches@gnu.org; Sun, 13 Sep 2020 17:38:01 -0400 Subject: bug#42473: [PATCH] gnu: zrythm: Update to 0.8.694. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 21:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 42473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Alexandros Theodotou Cc: Tobias Geerinckx-Rice , 42473-done@debbugs.gnu.org, Maxim Cournoyer , GNU Guix maintainers Mail-Followup-To: 42473@debbugs.gnu.org, ludo@gnu.org, alex@zrythm.org Received: via spool by 42473-done@debbugs.gnu.org id=D42473.160003307624781 (code D ref 42473); Sun, 13 Sep 2020 21:38:01 +0000 Received: (at 42473-done) by debbugs.gnu.org; 13 Sep 2020 21:37:56 +0000 Received: from localhost ([127.0.0.1]:51975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHZh6-0006Rd-7o for submit@debbugs.gnu.org; Sun, 13 Sep 2020 17:37:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHZh4-0006RQ-HX for 42473-done@debbugs.gnu.org; Sun, 13 Sep 2020 17:37:54 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38982) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHZgw-0005nL-QP; Sun, 13 Sep 2020 17:37:46 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48134 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kHZgw-0007Gs-9f; Sun, 13 Sep 2020 17:37:46 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <0e6300fea9caa1f9d7645c968a7c5b50d89f7b5c.camel@zrythm.org> <87k0yvfb60.fsf@gnu.org> <87wo2vdj6d.fsf@gmail.com> <871rkydx1j.fsf@nckx> <0f9e1795910b17cdd4d73f3b4848276f5da09889.camel@zrythm.org> <87mu1ygccl.fsf@gnu.org> <679bd4b51b68c5d83257618ef9855e7d54a71a94.camel@zrythm.org> <871rj8tjdz.fsf@gnu.org> <5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 28 Fructidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 13 Sep 2020 23:37:36 +0200 In-Reply-To: <5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org> (Alexandros Theodotou's message of "Fri, 11 Sep 2020 17:52:35 +0100") Message-ID: <87mu1t8ijj.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.49 X-TUID: gorwHmhG7qBI Hi, Alexandros Theodotou skribis: > On Fri, 2020-09-11 at 17:36 +0200, Ludovic Court=C3=A8s wrote: >> This requires Meson 0.55 so it doesn=E2=80=99t work on master. >>=20 >> 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")))) >>=20 >> 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: =E2=80=A2 Renamed Meson variable to =E2=80=98meson-0.55=E2=80=99. =E2=80=A2 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=E2=80=99.