From patchwork Sun Jun 5 08:36:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 39748 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 382FE27BBEA; Sun, 5 Jun 2022 09:38:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE3F427BBE9 for ; Sun, 5 Jun 2022 09:38:24 +0100 (BST) Received: from localhost ([::1]:42302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nxlmB-0001Nw-Oq for patchwork@mira.cbaines.net; Sun, 05 Jun 2022 04:38:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxlks-0001Nc-FZ for guix-patches@gnu.org; Sun, 05 Jun 2022 04:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nxlks-0001fW-4o for guix-patches@gnu.org; Sun, 05 Jun 2022 04:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nxlkr-0005ss-Uh for guix-patches@gnu.org; Sun, 05 Jun 2022 04:37:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55703] [PATCH] Update minetest Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Jun 2022 08:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 55703@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 55703-submit@debbugs.gnu.org id=B55703.165441821322597 (code B ref 55703); Sun, 05 Jun 2022 08:37:01 +0000 Received: (at 55703) by debbugs.gnu.org; 5 Jun 2022 08:36:53 +0000 Received: from localhost ([127.0.0.1]:60017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxlkc-0005sC-C1 for submit@debbugs.gnu.org; Sun, 05 Jun 2022 04:36:53 -0400 Received: from planete-kraus.eu ([89.234.140.182]:44558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nxlkX-0005rz-CR for 55703@debbugs.gnu.org; Sun, 05 Jun 2022 04:36:44 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 82803d8e; Sun, 5 Jun 2022 08:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:mime-version; s=dkim; bh=hJVYu+s/mMi2MQbgvRYcaaQ0L J4=; b=bdgl7bkieNGlOi5pzZF4JS+No7KYp8ipLUZD3xEXFVgb4vgyy5Iah4qYL 08z4wYYynPAz0LQ+JimufEs1EumZNJd5JUtsQSQ5BaFvtSpFvcujcCYY9jAlSkhx qduuO2DFl5Q0FSWFgo3ZlBNZIWVaVNMCx6jHnUevWSuK6rNY3w= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7fbd5dda (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Sun, 5 Jun 2022 08:36:34 +0000 (UTC) Message-ID: <721968ef33aabe47a37dae8d330a0c2c4a8a7a8c.camel@planete-kraus.eu> Date: Sun, 05 Jun 2022 10:36:28 +0200 In-Reply-To: References: <88c65d08cae0393ec661df673bd0e815a10df7b1.camel@planete-kraus.eu> <55cb9d13a8fbd5474aaf72f7c0c21a59eef9d76b.camel@gmail.com> <12632f4ae00e1b060afa612aa66a54f7a64beddb.camel@planete-kraus.eu> User-Agent: Evolution 3.42.1 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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches Hello, Le dimanche 29 mai 2022 à 18:39 +0200, Liliana Marie Prikler a écrit : > > > +    (source > > +     (origin > > +       (inherit (package-source irrlicht)) > > +       (method git-fetch) > > +       (uri (git-reference > > +             (url "https://github.com/minetest/irrlicht") > > +             (commit version))) > > +       (sha256 > > +        (base32 > > +         "1jxk1x0f60n8lrz8a6x62aj2pqg0qnbajsld3lqncvwsfbi0xjx1")) > > +       (patches '()) > > +       (snippet '(begin #t)))) > Instead of inheriting and blanking patches and snippet, you could > simply not inherit. That is simpler, yes. > > > +    (arguments > > +     `(#:tests? #f)) > As with Irrlicht itself, you should write out "; no check target" Yes. > > > > > * gnu/packages/minetest.scm (minetest-basic-materials): Update to > > > > 2022-03-28 (commet 9d55f991…). > > > > [snippet]: Make sound_api_core a dependency, not a submodule. > > > Again doing two things at once.  I think it'd be wiser to first do > > > the updates, then add minetest-sound-core, then add the snippets.  > > > WDYT? > > > > minetest-sound-core is introduced as a submodule for the > > basic_materials update.  So the code for it is not present at all.  > > If > > I first update basic_materials, then the tests will fail because it > > can’t find sound_core. Do you mean that I should first try to respect > > the will of the author and add it as a submodule (I don’t know how to > > do that) and then take it out as a separate package? > Hmm, perhaps I was confused by the commit message.  If changes to the > package are necessary for the bump, it makes sense to do them in the > same commit as you did, but the wording would imply that it was > previously a submodule, which perhaps through strange git magic is no > longer available in the source (because it has been externalized). I rewrote the comment and linked to the basic_material issue mentioned by Maxime elsewhere in the thread: https://github.com/mt-mods/basic_materials/issues/4 > > > > ² As pointed out by Maxime elsewhere in the mailing list, > > > Minetest packages usually have flaky tags in their forges, so > > > someone needs to look closer at whether this is going to break in > > > the future. > > > > Yes. Mesecons was using version numbers and then the latest tag is > > a > > date. Given that it’s April 1st, maybe there’s something funny > > occuring here, but the changes around that day looked reasonable to > > my untrained eye. However, one thing I didn’t notice at first was > > the > > drop of the + in the license. Sorry. > I'm not sure whether that's the right version to bump to, sorry. > According to ContentDB the latest release is > 27c3c515b49af91c1dbc427f31a820722854eb24, but that's untagged in git; > I > suggest either making a git-version and adding an appropriate comment > or contacting upstream for clarification. Obviously yes that’s the commit to use. So now the v3 looks like this. What do you think? Vivien From e7c18085594f7808ea8ef0359d2e020b21498cf0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 29 May 2022 14:43:28 +0200 Subject: [PATCH v3 9/9] gnu: minetest-advtrains: Update to 2.4.1. * gnu/packages/minetest.scm (minetest-advtrains): Update to 2.4.1. --- gnu/packages/minetest.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 5511e6f640..da6e556f4e 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -721,7 +721,7 @@ (define-public minetest-unified-inventory (define-public minetest-advtrains (package (name "minetest-advtrains") - (version "2.3.1") + (version "2.4.1") (source (origin (method git-fetch) @@ -729,7 +729,7 @@ (define-public minetest-advtrains (url "https://git.bananach.space/advtrains.git") (commit (string-append "release-" version)))) (sha256 - (base32 "1ijqlchh269jpvmgmdmdvy3nsnk0bszkvvcqk6vaysvxam695ggw")) + (base32 "1q2jj8181pjgsakl28xadv0z4sszq1lb5rpgj070wr0px6mp447p")) (file-name (git-file-name name version)))) (build-system minetest-mod-build-system) (home-page "http://advtrains.de/") -- 2.36.1