From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id EKYtMCWik2LGHQEAbAwnHQ (envelope-from ) for ; Sun, 29 May 2022 18:41:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6PM1LyWik2L1GAAAG6o9tA (envelope-from ) for ; Sun, 29 May 2022 18:41:09 +0200 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 4476A31889 for ; Sun, 29 May 2022 18:41:09 +0200 (CEST) Received: from localhost ([::1]:34198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvLyW-0007W4-6A for larch@yhetil.org; Sun, 29 May 2022 12:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvLyQ-0007Vi-MV for guix-patches@gnu.org; Sun, 29 May 2022 12:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nvLyQ-0002J6-Dk for guix-patches@gnu.org; Sun, 29 May 2022 12:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nvLyQ-0006df-BD for guix-patches@gnu.org; Sun, 29 May 2022 12:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55703] [PATCH] Update minetest Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 May 2022 16:41:02 +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: Vivien Kraus , 55703@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 55703-submit@debbugs.gnu.org id=B55703.165384240425438 (code B ref 55703); Sun, 29 May 2022 16:41:02 +0000 Received: (at 55703) by debbugs.gnu.org; 29 May 2022 16:40:04 +0000 Received: from localhost ([127.0.0.1]:41704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvLxU-0006cD-9V for submit@debbugs.gnu.org; Sun, 29 May 2022 12:40:04 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:39680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nvLxS-0006bc-TD for 55703@debbugs.gnu.org; Sun, 29 May 2022 12:40:03 -0400 Received: by mail-ed1-f66.google.com with SMTP id v25so2758251eda.6 for <55703@debbugs.gnu.org>; Sun, 29 May 2022 09:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=h+8KoUZq7uVUxdXfaadb5Loo+hxcvzzvv5g+LYs5iU4=; b=WjxKbys7ajGHsJXvIwl71gePQuUhHz19u4bmd8ADsNd0FCk24NMvdan63u/MtNeKhU xADVfOtM6Tq6Bw3xbG8Hr7d49J7XExzwU+HpGzOiZA1GehQOIB/WGSwwanXlp/crvEV6 NLnICNhXaI9ABd6EuKTLYT+o2QONaC2ucBLqSj/6Q+HLXUVqU5Ex9kbw8ON66JOzRuf9 aFG2viqFGWbrL61xSzsvjqeoji7UJCW4eoeoyJ7esDVjOwXIdnCH5S4FrNzY6vxDZ3W0 mIE7Z3JuNez94ZAEhgKoewYjYYWGac+kz+xNtEXd9ZjlLvJ2NiipXU2ljidbMYlaRoho FJnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=h+8KoUZq7uVUxdXfaadb5Loo+hxcvzzvv5g+LYs5iU4=; b=FRZEBY2atYvB+CCFlegG7ew4CumaRzgS5Z/7eNTHUJI2j8a33FqkIUxc9cAfcND8Mj jLTSbmUmhtjDWgM0QO3cCW9SO9wr/h6nFJA9lCO9mN5tzOmrB4A/EGXbKQZGGB/wOdbe 6Vi42Srqowqb9xdB19/Tha/mjdwagVVpOOHwldZl2OFkt+UO6s07J9UEvJCFS/4mSN4f cOiuumsAHdymfsEQFSFVRf/5Y4UkAFzgCJgAkY2z3TkTxUCvPdxxQi9Yr1HPC4JANKBY qZyAJUxKXxBn/UEezhEcyZdh8C0eRsSX9qxJJsDFZfrnccrABkLqau5+0WRRDWYzhxpF MU/Q== X-Gm-Message-State: AOAM530oUZzb7UG4s7SpydqSle4YHBH3YOfBPIpQACNfCSWvO26uNVtO 75TGWzYoP5xR5O03IRy6ZVw= X-Google-Smtp-Source: ABdhPJw3VS8cDpPHxAt7ns0mo2/4m1XRWW0uY9ImC3T2pPBvbcep4OjuwHYWlShq8H9VIPvoM8FPqg== X-Received: by 2002:a05:6402:1cc1:b0:413:2cfb:b6ca with SMTP id ds1-20020a0564021cc100b004132cfbb6camr54989180edb.265.1653842396878; Sun, 29 May 2022 09:39:56 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id jg36-20020a170907972400b006fef51aa566sm3372041ejc.2.2022.05.29.09.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 09:39:56 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Sun, 29 May 2022 18:39:55 +0200 In-Reply-To: <12632f4ae00e1b060afa612aa66a54f7a64beddb.camel@planete-kraus.eu> References: <88c65d08cae0393ec661df673bd0e815a10df7b1.camel@planete-kraus.eu> <55cb9d13a8fbd5474aaf72f7c0c21a59eef9d76b.camel@gmail.com> <12632f4ae00e1b060afa612aa66a54f7a64beddb.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1653842469; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=h+8KoUZq7uVUxdXfaadb5Loo+hxcvzzvv5g+LYs5iU4=; b=PhVjFYhDajDk9ZmOWFM8dBHFX85q+TT1IW8B35Ivk55flot74XyoDo2ZLfi7a44qNWdkm0 HhZj4Q0OXtjCBB3IQP2SNieK+4sTjhdVuoQDR7IUEQ12w1h3qeTX5gmg9YoF/gEHd747pd UoTxK7LUKHZFITeJBsm0khvIUWDb9PZGzYoaXIqe2kRxT8Sei26prqA8ICMy+TGzpkMZf8 ak7UsZme4qzAvfKBrcX6M7bSTwIZc1wyptgaQJqM13+Zezt8m8FiNLhWyHSjfSq5j61fS3 ft+k15KMCdMS5bt3kVEUS1TH6p+KkMqTccw4feZkZg7i4k9+dxY14Jkc54vy7g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653842469; a=rsa-sha256; cv=none; b=kdD0TXczC64JomnK3OUzinuuLb2m498aVkVUXn99uOVTvdMY0KgOy8E23pna6CC3e8/a4C UKRbyvqbpNjQttmmLoGF9273cy1SPcIlR2I7lB/wIoBKOUJvhFYCKS5vN2hHLdHJgNUAGx joFdflpNUTuYaeLqUWR+fPDcx1MKhYXR8VMU8/SYhdjEi3jOE2RQnQN38xBzBwVa3IBVeH H4p4ykga/f0p2X0gffHZxc+F27G08lZedQUYD0l5s/8ZklKq41fhmOGHuljoQ86R24X1Zu XAaAP5/cIg03R1/JkVdom2JajSlaSgZGgxKqxxg5FZp7ukUGz3SzbHQB8RCRxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WjxKbys7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.96 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WjxKbys7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4476A31889 X-Spam-Score: 6.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: vHthLclnSxiF Hi, Am Sonntag, dem 29.05.2022 um 17:43 +0200 schrieb Vivien Kraus: > 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. That's exactly the split I intended, thanks. > + (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. > + (arguments > + `(#:tests? #f)) As with Irrlicht itself, you should write out "; no check target" > > > * 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). As far as I can see however, minetest-sound-core is a slightly different kind of package though. Like gnulib or GNOME's libgd, the authors want it to be included as source code in the target mod. I don't know how this makes a difference in Minetest mods, but there is a chance it might. At the very least, it does not appear as though minetest-sound-core is itself a mod (or is it?). > > ¹ 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? Ideally, you would check the JSON for the release, e.g. https://content.minetest.net/api/packages/VanessaE/homedecor_modpack/releases/12307/ @Maxime, looking at the result it'd be possible to fetch sources from contentdb. Should we implement contentdb-fetch? > > ² 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. Cheers