From patchwork Fri Sep 11 16:52:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexandros Theodotou X-Patchwork-Id: 24022 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4463C27BBE8; Fri, 11 Sep 2020 17:53:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8721727BBE7 for ; Fri, 11 Sep 2020 17:53:23 +0100 (BST) Received: from localhost ([::1]:41256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGmIc-00059a-Jh for patchwork@mira.cbaines.net; Fri, 11 Sep 2020 12:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGmII-0004yc-AZ for guix-patches@gnu.org; Fri, 11 Sep 2020 12:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kGmIH-0003wY-VW for guix-patches@gnu.org; Fri, 11 Sep 2020 12:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kGmIH-0003PH-Ud for guix-patches@gnu.org; Fri, 11 Sep 2020 12:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42473] [PATCH] gnu: zrythm: Update to 0.8.694. Resent-From: Alexandros Theodotou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Sep 2020 16:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: Tobias Geerinckx-Rice , 42473@debbugs.gnu.org, Maxim Cournoyer , GNU Guix maintainers Received: via spool by 42473-submit@debbugs.gnu.org id=B42473.159984317013078 (code B ref 42473); Fri, 11 Sep 2020 16:53:01 +0000 Received: (at 42473) by debbugs.gnu.org; 11 Sep 2020 16:52:50 +0000 Received: from localhost ([127.0.0.1]:45274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kGmI5-0003Os-FJ for submit@debbugs.gnu.org; Fri, 11 Sep 2020 12:52:49 -0400 Received: from mout01.posteo.de ([185.67.36.141]:48004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kGmI1-0003Oc-DF for 42473@debbugs.gnu.org; Fri, 11 Sep 2020 12:52:47 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 18CAF16005F for <42473@debbugs.gnu.org>; Fri, 11 Sep 2020 18:52:38 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Bp1yX6FhWz6tml; Fri, 11 Sep 2020 18:52:36 +0200 (CEST) Message-ID: <5f6b65912ab95729ddf4bf4b4121dd1ba7e5f247.camel@zrythm.org> From: Alexandros Theodotou Date: Fri, 11 Sep 2020 17:52:35 +0100 In-Reply-To: <871rj8tjdz.fsf@gnu.org> 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> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, 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. Thanks, Alex From 434b1ee36502451959328b1fc426acdf44b4f980 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 11 Sep 2020 17:27:56 +0100 Subject: [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(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 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