From patchwork Sun May 29 15:43: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: 2723 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 F14BA27BBEA; Sun, 29 May 2022 16:44:19 +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 60A6A27BBE9 for ; Sun, 29 May 2022 16:44:18 +0100 (BST) Received: from localhost ([::1]:45986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvL5V-0001SI-IR for patchwork@mira.cbaines.net; Sun, 29 May 2022 11:44:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvL5G-0001S8-2V for guix-patches@gnu.org; Sun, 29 May 2022 11:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvL5F-0002dz-Ms for guix-patches@gnu.org; Sun, 29 May 2022 11:44:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nvL5F-0005Ai-LM for guix-patches@gnu.org; Sun, 29 May 2022 11:44: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, 29 May 2022 15:44: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.165383903919865 (code B ref 55703); Sun, 29 May 2022 15:44:01 +0000 Received: (at 55703) by debbugs.gnu.org; 29 May 2022 15:43:59 +0000 Received: from localhost ([127.0.0.1]:41627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvL55-0005AE-MM for submit@debbugs.gnu.org; Sun, 29 May 2022 11:43:59 -0400 Received: from planete-kraus.eu ([89.234.140.182]:44554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvL4z-0005A1-86 for 55703@debbugs.gnu.org; Sun, 29 May 2022 11:43:49 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 7b74d02f; Sun, 29 May 2022 15:43:42 +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=WaskHX/I0fJceZRfTxsGr9uCR Co=; b=q/6RJusiiLl/D1pln5l3NzdE5ZZ4v7kauAbyHYvA7l52PgLwJjgUnsJAW UMKIbY8LZPqlsQtq+GTmoWg9MvP7VQrj82hXTCa/sST3LIUbY0cuuiWONAqUPcRz QjUa3MkRQUTXLTJBvXeYzvTSVnnP3gQsk7WMhMvdx61sD4CRvQ= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id fa68e04c (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Sun, 29 May 2022 15:43:38 +0000 (UTC) Message-ID: <12632f4ae00e1b060afa612aa66a54f7a64beddb.camel@planete-kraus.eu> Date: Sun, 29 May 2022 17:43:28 +0200 In-Reply-To: <55cb9d13a8fbd5474aaf72f7c0c21a59eef9d76b.camel@gmail.com> References: <88c65d08cae0393ec661df673bd0e815a10df7b1.camel@planete-kraus.eu> <55cb9d13a8fbd5474aaf72f7c0c21a59eef9d76b.camel@gmail.com> 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 à 15:48 +0200, Liliana Marie Prikler a écrit : > Am Sonntag, dem 29.05.2022 um 14:47 +0200 schrieb Vivien Kraus: > > Subject: [PATCH v1 1/8] gnu: minetest: Update to 5.5.1. > > > > * gnu/local.mk (dist_patch_DATA): Remove minetest-add- > > MINETEST_MOD_PATH.patch. > > * gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch: Delete > > it. > > * gnu/packages/minetest.scm (irrlichtmt): New variable. > > (minetest): Update to 5.5.1. > > [patches]: Remove patch. > > [configure-flags]: find irrlichtmt and zstd. > > [inputs]: Replace irrlicht with irrlichtmt, add zstd. > > (minetest-data): Update hash. > I'd name "irrlichtmt" to "irrlicht-for-minetest" and perhaps split > this > patch into two.  Even if they need to be bumped "at once" later, I > don't think this holds for the initial introduction. I renamed the fork, and I split the commit as: introduce the fork, and then (update minetest + use irrlicht-for-minetest). If I split the minetest update commit further, it will create a broken commit. I was told on #guix that I should not create such commits. Quoting nckx: vivien: No, each commit should result in a sane state whenever possible. > > * 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? > ¹ I did not check for hash mismatches or ContenDB version > equivalence. I just looked up the date and found a the commit in github that was there (usually contentdb reports the next day as the github commit). Is there something more to do? > ² 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. Vivien From 05e27470105d040309d92d66a8fce65a55848eab Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 29 May 2022 14:43:28 +0200 Subject: [PATCH v2 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 8fc20fb7ea..11579d803e 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -715,7 +715,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) @@ -723,7 +723,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