From patchwork Wed Nov 13 10:33:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parnikkapore X-Patchwork-Id: 70354 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 2D70D27BBEA; Wed, 13 Nov 2024 10:34:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_MSGID_YAHOO,FREEMAIL_FROM,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 301DD27BBE2 for ; Wed, 13 Nov 2024 10:34:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBAhL-0004Ne-Pt; Wed, 13 Nov 2024 05:34:08 -0500 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 1tBAhJ-0004Fi-6x for guix-patches@gnu.org; Wed, 13 Nov 2024 05:34:05 -0500 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 1tBAhI-0002y8-Un for guix-patches@gnu.org; Wed, 13 Nov 2024 05:34:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:MIME-Version:Date:From:To:Subject; bh=b3B2o7GUwOU71KCZIboCN8YdJBhsH083PGKN4hFO63o=; b=tDMTrlZUgEuY1bjjZu8PWtjHYEckvpzdJ/4BcNHqF6KpZDYKuMVtFQlhcbjP1Ok4133r+NHkDlp4nfY4irWjEOsbPUC7FfRZWqsPRIbw918GcHsJ1ozJz0tMwq+VI5elGgoCIwD29fbPpNPpOxYDciqbbiRlJ+KW6SpKhYIwtqPE+wnq+CbEC0Qq1AFMepW0z0kqGLAVG+dHABRacR8tnxT0j/sdVi6gfJC93x4lUapk5inCTV4s0f9z+xZXBZ6LY6/z0wDF5W2YhYM5M2/+ainmm2/JFzdFvwCQTZ8z+OIyW/5PYQiJGD4mZDMvRv5PALf0kuubD7gyrmvBA2EOAQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBAhG-0007rx-0p; Wed, 13 Nov 2024 05:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74336] [PATCH] gnu: minetest: Update to 5.10.0. Resent-From: Parnikkapore Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 10:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74336@debbugs.gnu.org Cc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?w6XCrsKLw6Y=?= =?utf-8?b?wpbCh8Omwq3Cpg==?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?w6XCrsKLw6Y=?= =?utf-8?b?wpbCh8Omwq3Cpg==?= Received: via spool by submit@debbugs.gnu.org id=B.173149402330222 (code B ref -1); Wed, 13 Nov 2024 10:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Nov 2024 10:33:43 +0000 Received: from localhost ([127.0.0.1]:40934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBAgw-0007rO-Tt for submit@debbugs.gnu.org; Wed, 13 Nov 2024 05:33:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:33954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBAgv-0007rF-NL for submit@debbugs.gnu.org; Wed, 13 Nov 2024 05:33:42 -0500 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 1tBAgv-00047C-Fg for guix-patches@gnu.org; Wed, 13 Nov 2024 05:33:41 -0500 Received: from sonic305-19.consmr.mail.sg3.yahoo.com ([106.10.241.82]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tBAgs-0002vc-Rt for guix-patches@gnu.org; Wed, 13 Nov 2024 05:33:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1731494013; bh=b3B2o7GUwOU71KCZIboCN8YdJBhsH083PGKN4hFO63o=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=gJS34t6Z9oN1RsXHGKwseH1Lwrn3zP7QB1pPIAhfwx+mV+hTKt81nHUVlc6AJ1gPoWVZVyPOo+R/kD2bKW1GcXbU7EUPGRItbwXJTE/2ZnqYeB8kE/oki8fpsKYDPFOneF8eV3ObDmDOMQHgATPk+gEpXZFJq1qCQmQLBejKT1g34/ehxBSV+iKcEgfQxYids312TU++Y70OpvGfJu9Wk6cvmwHYr+4IKiW/fkxJ+YAY/Wxh4QHcU2kRJqjogMcJpix4wgRQ48DciTjPmbQP+eDJxUBRxuFeSnLAY0xRIUo89572vVdtzKUKmmVm2JH1caR4ZqA0Af7txevQiAjzeg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1731494013; bh=wfrd7ZzBERFGyf55O8+YCVDEPDhqYPuJTQyfvsdu9cr=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=J6mfOeDp37PGIko0Chvodvpl4OOSDpfOAgV0uMJ8NrS/P3GmxF/hHAnplE/yQqBrx0ZRXOcOLSuU6qqB31+YYHVdfDtLWd4RAVxs8ST4Se7JISV64kW6gpQHn/k0WT7Ynnv4PqztzZq53c4+I89hsCB5ABlWzdkvygUu6KtkkTrFTF2EI+JRfD3rT0DOhobC1vYYhBjdARxtTnYFq9GqeN3Cy/guMKBjJ2EkuXUgS0hsP2qScODHcd1yTLwjXX3Yraf0m71d/DjZHsY4sKhrToeXScDiuJrb03AE3om7QHAKIPLDYUkjAHW0JMK9cyam7AU1OJCeoU6yXNDSdObwiA== X-YMail-OSG: eaSFp3YVM1kvtuNxjlEjxktlS08pSVepisbB3DalgXx_QttlZcn_cNsInsMmqGO N28.1Km0W_Mz0obZtNw6jcacV4z2CI_KthIJZJ7sFMkGaU.grXk_RcV6x9GUcBd1sPsgWqH8Z2xE OUjBnDIDWQ.FcBsmvCeNxwThyZ9eE7.ZXjVrmjQBP7tzGBRvjGS71TpbNoMZdK5Rok4qzhc3ipsn E_4tyA5TkCJWOzY22tZ5xmxZOyZzX1uskk_SCGNNIYYwP0aUM2OnOXU.Y2Yctrn86oPMDQfC6VSY m9ejvzKCIUFR6prKPHpNrdRK9NGMr8kodMnr7qU1wtwX2a_jikYCVic32Ux9kT1Yt5jKgMiKMhQU 7G0zoZwF32O1BoK3VAxIJixh5SQNM7qvNBGSfnNLjK.NIZruY2BwTQroqmFnvNCLbNV3pZRgLvJ3 PALLEc4vMO5KniCt4SbE4zzEkk2uC.ewuw7Q_7MOAtoUfnbOWHd46fw7MxGK4t7CBxHTWxOeKQGC itkaMsRi._QKBvLeHELhMjPad4JJ6zDaLldrpCTVn96.utjYOmkWpAp0FdchBn8wpulcTtoj_p2N lRmUorFnGml9qAQIpI_Y3e6qUOJ.95qK9uxaAUlgCy5Fctl29G8pVybghXVfXOP5AeQbg71bR1zk K5cbUJNwCUgrDUCHdJgm7CmDNxDSoxi4rjGmLn1lDACV.mjFTMAu_ZdmXOZgDLTqgdSzL7dL.i9f 2sbBxz7VCueXwHxqSYjMBJuBWKPwkY3M09eNhe2HBfTKOGNhIGJuWjFSB09cqNH1aIwBKrJki1he EdmWjKGKLl42J98VgSAgV9SpKeIPbcF_88gK3gAwu1I7OppXrq1wUQvgYt1U4WgT6mfYm8zuAn26 EuyuZWSemc7gnQP6JrSnQZQ9jq3e.ET_yZv12z4SlgUErcAuy8_fng_10vR0AwM5vXkZSu.bAkZh P9uXZwaKF2y1S4v.1PykvfIL1G.3UZa5k2dfNvibuABG.L9cxNIrMqrWi.gPvv3hLQn9_C._Ps9k 55B_.MBiGF9X6FOnBBbvMUbmeGdJL1qKpw7gtV.IaVamDJmFutpkFbhtkug9gqyAy4FwFTlfOAk4 Dh6.O6H2gm6bpHWMUNtUaC9YCjWI_I5K16MJcMJGO3b_A9CYvlLZW_hNDfc4NpGlQ4Qq8z.TbuAl 9uUye0A3N7RFmfQzS_YVyPD69I4IGu87SdTYiEu6SYfFhPasaH0.07hfyQYgn7jAheFUFpP9k88V pFtswWGyk6_fhkM9nmjBNOnJIKuaiI51P6SV34MyXrk5G65YXfCIo8d4UGJOuCPDxHMZbtFq9csK PcgAoWoUViJnqD5FIA._27unysWOreo18n5P2XtxgwXC7P.1LlV1H99G9U6dvNfkpZQh.Kd9RpQI 22NW85iGyO7aSBPkiNc2Bdy.fStDPMvj1DyY5Fkm2tpdy1.jeLtixZnnOOI89RGyENwFykrPFtfw _o5o7LKjyyRdPrLmPJnjeTkbumyt9z6qBk06AILFubR4Y8K5..jaFR7Cv6jadQHFuy59qlIF2070 qUHc0j1a4tQYamT3c3k3uHtzvZHLVhI0kRK4IOIPTGeANiEQCGiQu6XgEhTKFk6l3vNKY__NVnza bzf0x_W5fqbxnBeHFAGGpfRKibKaoJuv4iG9XBloLePJB4QBETVrc0e69X1vHYbotGfLKlt3FRC4 z.xTT9mB471h7uBg6D8Aj8838NTzGJT4raESDXlEw4XapWpfrezvHwvGptpiRD06pKo..qKMXhXJ keqeg.r_zcNmROr.TstzwUX4jbz_EPDcAz8JCeoYPGFhxlRY4TKHu0HyPms95nhvgILD2YbHyaT0 DoT_8PLwov5HJkd_E2JNiAaPhR01yU5oKEY6oPLjLdBx1D5yat07NK5grEpzQDY8.a3lI1qfQUwU txylttfd3.7WKusbYhluvI7lN9pWvDk4Vf1JYVc6ESXnXmZzLVQhyY8WAbffyAZbtGhWfpwQSsMq q2pGZAXAcmqq052Y.ez1HgHf.U1OadWyello6er1IZWTUh2BZmCE3Oqclu1ybW6JX8YWvO3hzJf_ MguDVdXqL2TyE4xtySWhpGKDRGDcMVCezDWRKrBCQz3140U5eyFSCj03SIL_5vHjQzOLr9avr8YE xKjPUQLZ_JF75H94cMNg15UdNemVEwwt460PHb0BAwwSzgjiHikZNI0tLICWaJNXuCro5UFWHRI9 r2eVjAoe6amjgnrf8uIBxFZ94vu36JMddkw8Gq1ZtghxXjw-- X-Sonic-MF: X-Sonic-ID: 7d044096-d840-4ccf-91e3-48389b05aa01 Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.sg3.yahoo.com with HTTP; Wed, 13 Nov 2024 10:33:33 +0000 Received: by hermes--production-sg3-5b7954b588-h28gr (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 119fa53e1ac886e1ff7a90e90a300655; Wed, 13 Nov 2024 10:33:28 +0000 (UTC) Date: Wed, 13 Nov 2024 18:33:17 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 References: Received-SPF: pass client-ip=106.10.241.82; envelope-from=poomklao@yahoo.com; helo=sonic305-19.consmr.mail.sg3.yahoo.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Parnikkapore X-ACL-Warn: , Parnikkapore via Guix-patches X-Patchwork-Original-From: Parnikkapore via Guix-patches via From: Parnikkapore 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 * gnu/packages/minetest.scm (minetest): Update to 5.10.0. [source] : Fix unbundling. [arguments] <#:configure-flags>: Remove redundant flags. [arguments] <#:phases>: Remove patches to nonexistent code (or that breaks stuff). [inputs]: Remove coreutils and libxxf86vm. Change-Id: If8720bb51309d7c251e76a1885695851f3a03255 --- Hi Guix! This is an update + cleanup of Minetest^WLuanti. Some of the highlights: - Apparently, the old unbundling code is broken and deleted nothing. A few packages (catch2 and tiniergltf) are assumed by the CMake files to be bundled - I don't have time to work around that yet, but it shouldn't be too difficult. - Removed substitute*-s for code that no longer exist (+ one that's now causing a build failure) and unused/redundant dependencies. Also, redundant CMake flags. Known issues: - Will segfault upon exit somewhere within IrrlichtMT - Incomplete unbundling As mentioned earlier, [Minetest has been renamed to Luanti][1]. This would've been a simple rename + deprecated-package job... if not for the fact that the word "minetest" appears in several places in Guix. We need to figure out how to handle that... [1]: https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/ gnu/packages/minetest.scm | 54 ++++++++++++--------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) base-commit: 1f057603ef59c7b9c32f610a897321fd75dc4dad diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 2552596ef8..241fe8588c 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -54,7 +54,7 @@ (define-module (gnu packages minetest) (define-public minetest (package (name "minetest") - (version "5.9.0") + (version "5.10.0") (source (origin (method git-fetch) @@ -63,20 +63,25 @@ (define-public minetest (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1h4yn4k0wpjr1h24aiqcnc9xsxgxj4bq757pla2pa9zmh2xf45kk")) + (base32 "1nsnsf1axiazb8zz51c0742kh0qx2b298pr5mr91m0l9r6dv1sdj")) (modules '((guix build utils))) ;; Delete bundled libraries, keep lib/sha256 because there's no good ;; upstream, see: ;; https://github.com/openssl/openssl/blob/master/crypto/sha/sha512.c ;; "SHA512 low level APIs are deprecated for public use, ;; but still ok for internal use." Also asked MT devs on IRC for this. + ;; TODO: catch2 should be unbundled (but may need to have its version + ;; pinned); tiniergltf is separate but Minetest-specific so could + ;; go either way. (snippet '(begin - (with-directory-excursion "lib" - (for-each (lambda (file) - (if (not (string=? file "sha256")) - (delete-file-recursively file))) - (find-files (string-append "lib") #:directories? #t))) + (rename-file "lib" "_lib") + (mkdir "lib") + (for-each (lambda (lib) + (rename-file (format #f "_lib/~a" lib) + (format #f "lib/~a" lib))) + '(sha256 catch2 tiniergltf)) + (delete-file-recursively "_lib") #t)))) (build-system cmake-build-system) (arguments @@ -84,35 +89,9 @@ (define-public minetest #:configure-flags #~(list "-DENABLE_LTO=ON" "-DENABLE_UPDATE_CHECKER=FALSE" - (string-append "-DCURL_INCLUDE_DIR=" - (search-input-directory - %build-inputs "include/curl")) - (string-append "-DZSTD_INCLUDE_DIR=" - (dirname (search-input-file - %build-inputs - "include/zstd.h"))) - (string-append "-DZSTD_LIBRARY=" - (search-input-file - %build-inputs "lib/libzstd.so"))) + "-DINSTALL_DEVTEST=TRUE") ; Required for tests #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-sources - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/filesys.cpp" - ;; Use store-path for "rm" instead of non-existing FHS path. - (("\"/bin/rm\"") - (format #f "~s" - (search-input-file inputs "bin/rm")))) - (substitute* "src/CMakeLists.txt" - ;; Let minetest binary remain in build directory. - (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") - "")) - (substitute* "src/unittest/test_servermodmanager.cpp" - ;; do no override MINETEST_GAME_PATH - (("(un)?setenv\\(\"MINETEST_GAME_PATH\".*\\);") - "(void)0;")) - (setenv "MINETEST_GAME_PATH" ;for check - (string-append (getcwd) "/games")))) (delete 'check) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) @@ -120,7 +99,7 @@ (define-public minetest ;; when invoked on the target outside of `guix build'. (when tests? (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) + (invoke "../source/bin/luanti" "--run-unittests"))))))) (native-search-paths (list (search-path-specification (variable "MINETEST_GAME_PATH") @@ -129,8 +108,7 @@ (define-public minetest (variable "MINETEST_MOD_PATH") (files '("share/minetest/mods"))))) (native-inputs (list pkg-config)) - (inputs (list coreutils - curl + (inputs (list curl freetype gettext-minimal gmp @@ -139,7 +117,6 @@ (define-public minetest libpng libogg libvorbis - libxxf86vm libxi luajit mesa @@ -147,6 +124,7 @@ (define-public minetest openal sqlite `(,zstd "lib"))) + (outputs '("out" "debug")) (synopsis "Voxel game engine") (description "Minetest is a voxel game engine that supports modding and game creation