From patchwork Sun Apr 27 15:46:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark L X-Patchwork-Id: 42085 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 7B65827BC4B; Sun, 27 Apr 2025 16:47:30 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 9279B27BC4A for ; Sun, 27 Apr 2025 16:47:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u94Dg-000856-82; Sun, 27 Apr 2025 11:47:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u94De-00084g-5a for guix-patches@gnu.org; Sun, 27 Apr 2025 11:47:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u94Dd-0007qy-Rc for guix-patches@gnu.org; Sun, 27 Apr 2025 11:47:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=E2KIj+kUgC4yif4B0JlqHwL9kZTr7eWLi+FAjnNJ0Ek=; b=uBCFtj/fyM9R6c42+V4nhyPUTFSeqdyJHmfywb+vAxPIHJ40IqehoRhCJ4KTZFpoBdad2DmJrIFTE2/iVdg2jdKtIIaMvo2izeLcx+zIrWEUkqYnRotF8lXj5+/KoHvGhCcLDhZC2jMpXii7BRBasTfLs6qOWr3rhMDYsWckzau0RdTxHBYisCohW0+RsU/ipX7Xt+69x83PgTuLNumxMPkJGc+Bn5nuLNF1qVmoEe7t9olMPx0iHrLOW9fupdgJfHXgQSMaHs5VK5LhgMD5JQYRqs+wk3iHmVehO3gPMe/j5h/5vXKM0pCAVnc9RNwUXoqjL+w2CKt6YP9dVRuvsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u94Dd-0001U5-LL for guix-patches@gnu.org; Sun, 27 Apr 2025 11:47:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77886] [PATCH v2] gnu: Update openttd dependencies to fix its build References: <3599b7a19bb223a3633118cca60347648b0db05a.1744917596.git.cake@pydis.com> In-Reply-To: <3599b7a19bb223a3633118cca60347648b0db05a.1744917596.git.cake@pydis.com> Resent-From: Mark L Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Apr 2025 15:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77886@debbugs.gnu.org Cc: Mark L , joe@pydis.wtf Received: via spool by 77886-submit@debbugs.gnu.org id=B77886.17457688135680 (code B ref 77886); Sun, 27 Apr 2025 15:47:01 +0000 Received: (at 77886) by debbugs.gnu.org; 27 Apr 2025 15:46:53 +0000 Received: from localhost ([127.0.0.1]:43794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u94DV-0001TW-4G for submit@debbugs.gnu.org; Sun, 27 Apr 2025 11:46:53 -0400 Received: from mail.pydis.wtf ([89.58.26.118]:47024) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u94DR-0001T3-Dk for 77886@debbugs.gnu.org; Sun, 27 Apr 2025 11:46:50 -0400 Received: from mail.pydis.wtf (localhost [127.0.0.1]) by mail.pydis.wtf (Postfix) with ESMTP id D6E51E220E for <77886@debbugs.gnu.org>; Sun, 27 Apr 2025 15:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pydis.com; s=lovelace; t=1745768801; bh=X71+bpeIxzJhH/gpNabYMAWTvinWewGnq064uCVyS/E=; h=From:To:Cc:Subject:Date:From; b=tOG8CRsa6TKceWSWbMSucoIhzOv6tFfOArfwmqkg8zjOUA0tK/DoQxZOoE3Wyd8TN I35Y6vsrPwmPG18opKFX2nfsP/mVEx225PrV+x+I2fAkkizpFVmWQF3KjNhJKA4QN+ 7vKrm/YY16O+Xr//PnfFb3H742mFOAEe7DSBss57hbiognQWyYIBGeT35OyHQcel06 79ZECoNlo7CCryVqGTV23tqmSyAriyOXtD1+JWhF6kSgJQXG8OUsVP6LrZWON5yJXa r+01mi6R/k+PVs93XtlTSNF6CZpWxPQoSYfiqiJNtVEsRMW3Xi6e0HuPsbvnj0c3RX Wwl8zrJY/mOdA== Received: from host (unknown [IPv6:2a02:6ea0:dc05::e001]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mail.pydis.wtf (Postfix) with ESMTPSA id 7D04FE0080; Sun, 27 Apr 2025 15:46:41 +0000 (UTC) Received: from localhost (host [local]) by host (OpenSMTPD) with ESMTPA id 0c5213a9; Sun, 27 Apr 2025 15:46:41 +0000 (UTC) Date: Sun, 27 Apr 2025 17:46:36 +0200 Message-Id: X-Mailer: git-send-email 2.39.5 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: , Reply-to: Mark L X-ACL-Warn: , Mark L via Guix-patches X-Patchwork-Original-From: Mark L via Guix-patches via From: Mark L Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The current version of `openttd-opengfx` has been released in September 2021. This fixes a few issues with the build of `openttd-opengfx`: - The make script would try to call `python` instead of `python3`. - The make script would call `gimp`, but this seems like it broke during a Gimp update. A patch for this is in the later Git commits. Since the current and most recent version of `openttd-opengfx` has been released in September 2021, I've updated this to the latest commit on `master` so it can build. - The older version of `nml` could not build it properly due to missing support for `ROAD_WAYPOINTS`. Change-Id: Ie7b58e267f11d2de86c05c1ea9abcc4e8690eda1 --- gnu/packages/game-development.scm | 9 ++------- gnu/packages/games.scm | 17 +++++++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) base-commit: 54cc9c96ec0877b2afa24871c3acd8af27b0d500 diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 91369089b9..db45b64d41 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -545,19 +545,14 @@ (define-public gzochi (define-public nml (package (name "nml") - (version "0.7.2") + (version "0.7.6") (source (origin (method url-fetch) (uri (pypi-uri "nml" version)) (sha256 - (base32 "1kgzkv8pc0blck8c6iqq1idx1nrxyjw2vbnrdisnxizi6zds5l73")))) + (base32 "0if99hk9dsiw33iabkrbrpwybv8vl3hpim1cf07sklkshigwxryr")))) (build-system python-build-system) - ;; TODO: Fix test that fails with - ;; "AttributeError: partially initialized module 'nml.nmlop' has no - ;; attribute 'ADD' (most likely due to a circular import)" - (arguments - '(#:tests? #f)) (propagated-inputs (list python-pillow python-ply)) (home-page "https://github.com/OpenTTD/nml") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 07f199966a..b3c5d122fe 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5238,15 +5238,16 @@ (define openttd-engine (define openttd-opengfx (package (name "openttd-opengfx") - (version "7.1") + (version "3739bbe9bdcd5bfbb2f720a99667f77d31caf02f") (source (origin - (method url-fetch) - (uri (string-append "https://cdn.openttd.org/opengfx-releases/" - version "/opengfx-" version "-source.tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/openttd/opengfx") + (commit version))) (sha256 (base32 - "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk")))) + "03fhzlv4935868lxpdik7afz8cgsnzwr38a2blzmvy18c4lzc4m3")))) (build-system gnu-build-system) (arguments (list @@ -5254,7 +5255,11 @@ (define openttd-opengfx #~(list (string-append "CC=" #$(cc-for-target)) (string-append "INSTALL_DIR=" #$output - "/share/games/openttd/baseset/opengfx")) + "/share/games/openttd/baseset/opengfx") + "REPO_DATE=20000101" + (string-append "PYTHON=" + #$(this-package-native-input "python") + "/bin/python3")) #:phases #~(modify-phases %standard-phases (replace 'configure