From patchwork Thu Apr 17 19:19:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark L X-Patchwork-Id: 41768 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 C6B3327BC4A; Fri, 18 Apr 2025 14:33:34 +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 1EDF027BC49 for ; Fri, 18 Apr 2025 14:33:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5lpk-0005kz-1J; Fri, 18 Apr 2025 09:32:46 -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 1u5dh2-00040y-8q for guix-patches@gnu.org; Fri, 18 Apr 2025 00:51:12 -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 1u5dh1-0006Gf-U2 for guix-patches@gnu.org; Fri, 18 Apr 2025 00:51:12 -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:Subject; bh=OLm/CRRV9YyYLbO5s4Mm03FO/+23BOC3ERXfx+ClXiI=; b=CMZ9nsiC6nbQt27WgtREpoLjgka7wqZmqPjVoof8LQ3qiiGhsvGD02GaVNAmuyeWOdqnF5UbWUsVMvPmwI5jfzWVnI+rG7EU+lh7E0b5PnkxUVKh+WVfarCj0AXavd8y0wPaliYqMS5vkZ24OxqLEDCvpx4gJtbT/uy6C289l/brXWJGfBCUrT2fNZ1WRh0FF7mZltR1MQs2qOoXj+krPrMb2/x25lmEZog/KoEmYIx0Ne6xl+aouxys8KgNHgbWSeyA+CnKsYRZtKS1DsYosrsRanFBzpSu3CJ4ukXRB3+fQKSWeFpRQ5JHXpkI8jZu7t2OtsHveaBCqMwv8IrLHw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5dh0-0005Zt-5A; Fri, 18 Apr 2025 00:51:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77886] [PATCH] gnu: Update openttd dependencies to fix its build Resent-From: Mark L Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 18 Apr 2025 04:51:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77886@debbugs.gnu.org Cc: Mark L , joe@pydis.wtf, adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net Received: via spool by submit@debbugs.gnu.org id=B.174495183921124 (code B ref -1); Fri, 18 Apr 2025 04:51:08 +0000 Received: (at submit) by debbugs.gnu.org; 18 Apr 2025 04:50:39 +0000 Received: from localhost ([127.0.0.1]:49220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5dgR-0005Tx-Ib for submit@debbugs.gnu.org; Fri, 18 Apr 2025 00:50:38 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37056) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5Uma-0004AB-Rl for submit@debbugs.gnu.org; Thu, 17 Apr 2025 15:20:25 -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 1u5UmV-0007M9-20 for guix-patches@gnu.org; Thu, 17 Apr 2025 15:20:15 -0400 Received: from mail.pydis.wtf ([89.58.26.118]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5UmS-00036z-QX for guix-patches@gnu.org; Thu, 17 Apr 2025 15:20:14 -0400 Received: from mail.pydis.wtf (localhost [127.0.0.1]) by mail.pydis.wtf (Postfix) with ESMTP id 077B0E37AE for ; Thu, 17 Apr 2025 19:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pydis.com; s=lovelace; t=1744917605; bh=3uS60TOrNQMvLQhC7an1LSwghaZ4e1CEnxKvZG5VvC0=; h=From:To:Cc:Subject:Date:From; b=c3CQeh0GjyhQkrBNyek3G6Hvva21X37a+rrPDLlfexwDBqfIH6kDlJSo+DdDwDXzV LEO8noZKJmrrj1RmQXiftYwFO3tGUcwsfoxDUshzA1zCjbQ2ezuXNda/A/EV+DqwH/ PML887LZVz9c7KC+E2Zyj1ynr6El9eRGvRcL6MbXA5EgnPlvXMvcLXPObh/7P3hGvp 3UTrY0cq6mWZEc+bz5rx+8IV52tCRKQBiHv3Bv2TfaDxQkAKEy0yr8B3jbVBB7UQH2 mVbolxQ7N/T6Rzanu4wFjYhhRCSNvY2wWsG41gJUx41Drsr2kptwq5q/vrV1rlHCPn 0ThVfGlmZ0Hnw== Received: from zulu.jchri.st (unknown [IPv6:2607:9000:3000:14::a50e]) (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 58B24E37AC; Thu, 17 Apr 2025 19:20:04 +0000 (UTC) Received: from localhost (jchri.st [local]) by jchri.st (OpenSMTPD) with ESMTPA id 1ebc8d4c; Thu, 17 Apr 2025 19:20:01 +0000 (UTC) Date: Thu, 17 Apr 2025 21:19:58 +0200 Message-Id: <3599b7a19bb223a3633118cca60347648b0db05a.1744917596.git.cake@pydis.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Received-SPF: pass client-ip=89.58.26.118; envelope-from=cake@pydis.com; helo=mail.pydis.wtf X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 18 Apr 2025 00:50:28 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 18 Apr 2025 09:32:35 -0400 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 | 16 ++++++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2 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..7c1380bcae 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,10 @@ (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") + (string-append "PYTHON=" + #$(this-package-native-input "python") + "bin/python")) #:phases #~(modify-phases %standard-phases (replace 'configure