From patchwork Wed Nov 13 12:05:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Parnikkapore X-Patchwork-Id: 70355 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 7248227BBE9; Wed, 13 Nov 2024 12:06:43 +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=unavailable 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 3E09D27BBE2 for ; Wed, 13 Nov 2024 12:06:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBC8V-0005qx-2q; Wed, 13 Nov 2024 07:06:16 -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 1tBC8K-0005qH-4E for guix-patches@gnu.org; Wed, 13 Nov 2024 07:06:04 -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 1tBC8J-0007iN-KA for guix-patches@gnu.org; Wed, 13 Nov 2024 07:06:03 -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:In-Reply-To:Subject; bh=Au8ZJlL//N5nHjlVGmsHHGVJnWZPZXmudoiKKl0lqGw=; b=VCn/4A2Dw6JumGIR+Egz6NoQ3AW/KnrVOBGR/pkD/8F2MJcZdlbXqZ9adMd0gYkMyxleFb8ONewRWEwzB9CYj2kLqGUwvpIrxyGZZO4s3JN0Fh6r6c8QCdeA7YLpMOYoPwmAhtu6J8vZypreosGbDw9i09ndokrt6LPDdDsc1OVdTQEMLGIebAnYkKIU3nwippIoba7Okd+oYPFi+knHWtYHxd2/9kmXgrsxeObBN0/+S1E+oYM5b3iKMj9ZDcRERgQTTQSwy3yHbLEX/vqk72qejLNzwng8Zr29vo0MmxgBk1NHGocFj8hZ9gLLuNQaQ8TVm7t1/fFEoqVHsiScJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBC8I-0003WV-02; Wed, 13 Nov 2024 07:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74336] [PATCH] gnu: minetest: Update to 5.10.0. In-Reply-To: Resent-From: Parnikkapore Original-Sender: "Debbugs-submit" Resent-CC: poomklao@yahoo.com, adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Nov 2024 12:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74336@debbugs.gnu.org Cc: Parnikkapore , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?w6XCrsKLw6Y=?= =?utf-8?b?wpbCh8Omwq3Cpg==?= X-Debbugs-Original-Xcc: Parnikkapore , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?w6XCrsKLw6Y=?= =?utf-8?b?wpbCh8Omwq3Cpg==?= Received: via spool by 74336-submit@debbugs.gnu.org id=B74336.173149953913509 (code B ref 74336); Wed, 13 Nov 2024 12:06:01 +0000 Received: (at 74336) by debbugs.gnu.org; 13 Nov 2024 12:05:39 +0000 Received: from localhost ([127.0.0.1]:41083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBC7v-0003Vo-Cy for submit@debbugs.gnu.org; Wed, 13 Nov 2024 07:05:39 -0500 Received: from sonic308-19.consmr.mail.sg3.yahoo.com ([106.10.241.209]:41833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBC7r-0003VW-W6 for 74336@debbugs.gnu.org; Wed, 13 Nov 2024 07:05:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1731499527; bh=Au8ZJlL//N5nHjlVGmsHHGVJnWZPZXmudoiKKl0lqGw=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=B3W5J1SzdTAvuXS9vui+bW88iiDpk6JwdLWQrKUlv31xW8UnnAHpqYULqujVypGHVxguSzEAV1rrlAEA8kNWAFYJVMLpxsPAH5BKd0NPHRMN9KEfq1vGzKB5HbdzzWIvOxHvaizyEL6m7BbbBDfFrCh6OkuwswJPsEi9gHjV5zu8ZIWrhoWxWgFH4HEaIKKOwd1BHg+TFR0dKBOCQf9n+u+uMCTQi+Iw/iEcRuQDXjzCA9X1rkZjzTCiHfkLuobOZ6pT/azdW9uT6diQd8f+K5OOsMi/I1P30/6W+rUn53QSn1sIOvtgCAQRJ9T54+mTBDdIJ+vY2KyIQwncAVq0eA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1731499527; bh=jWhYiv9OTg+MESyk8/wDMtDFM9jlMgFOE1BZr+xFFko=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=RNR+NxOwcm2YmELpqhcb6MRKiI3Q2wCkzliz3KpY2Kfg7PkBjy/1GVL2Gs46jzVU9djPhT0nU5UiRiGgMHYU5YNtoJsHZhCnIn2B0rLJKWyOs1yjfXNTW2lZ5u2PpTtLuLaVDp6XDDFQhBgUTz3ZL2s4W5asNg4QnjTFIoW2YpYFJOOMGlHC6G3B3B4XpoW4qUDcrpNVeHph/NLXU0zLSOtj2m557MhgFXdY1Q4TNxr/Wo9FrV7a9+Q9csr+fbUNDi9yYdzZmewJatCgGjz7JiofaWCR3NaGZBen7cbEkr+nAKjpBEaUaTl0TexdAY9WX9BwPVQnhvGUqnYsxmOSdw== X-YMail-OSG: 32mnLUAVM1m5NuV6Ketmz5IsaaWwXWt_nahoza.R5swct60HCiJGu_EVa1n4JVc Qtr_TGadWH4yy1ld4kERf0jlU.596yvPu_v6RpHiLCXDeEmC6QwXJwACeAoEcQqsA3vlLPg6QEvz Y26NftpsokX_6FxICfySQj2XiRGwgjMtUuJ_m2Ag20x66ZPTwULzbKtMJgK1npbxz8d3Wz8.0Wqe vKsKeH.NDbft4ddBIOj_iXVIXZkxeqnCyVXjlZqonRShypsywbxQ0FSu9VaK.8w7BHAF.ScT3OCy gXrC.BmuwhOSRTUsZlUiYeiD5rXnNsdW.7.JUbfX8ZUm9HzaHf9TGF.4YbQYc8PIOJCO6vijs_rj liLzUuCB6uMj7To.zEbhuFyk9pnGG0ahtxQZup1GS4EaiNZHgVwvpikVi5kFZAUTW7kNLDw.sihg 4XiRX6EIh5T.FlciTmYmGzRzWlObHo6ymtw5FWQFIxWIUzD96HjWHw0Brx5A8PQHhjW9mdocVuKy cx1p3n.KYIVjr4r0TE_1IaKDeJqS3aVwojPE9Sl1SdvF5DsO1KK_LpnxTHDScMsRtgVgENIzLZ0O F_hn9TJi6oz7h7.Lvhtg1c_JigrDBAzDXf7xy2Kd9TlMfHoXYJfyxr7jf.TGVYzFQw2Eok1l_R75 8IazpYDmVJ6cEtW1LMIflXHphDJoNr6hcgoVQX5GqlX3PHD2MGp9Uj0SEMEBn8OVe8jpV3L1zeMR FvylXWXT.5xQAie8lHA1w1WvEE0Z9apuhmsiIGKgtW1.8UdwS5gPsTj_NrWfTUFqn5KaAydxZra_ EdHmzMp7t0HiYlbOmAogxgS86dPOY._.wbeB2w6BQrPuIaT0iMfrn1MynonCJUS26_mhoJDVUBSI Jd09YYyeXHsls.36Np14WaJYQJnwEiK8uZ.vH1xomHUzDjhLuHLO_Bt.onXiFru8QCU7Z_dIn0ao OqO.boV7gaECtTTNkB18.HNNZ7aT0xmfHwRP5auP8Wm1T.TdE21o5APUnfuMmtFGxvW6U41rwx2O s1RDw.V5LTq4sZeT8k7JZiWUmPjPB5y52oQrBY7MznW8mwWNBMIDrCfdVhxXCFAAT_gYn_TeCWuk S.s6D5.NbIhoZYpW1IdODYSuePAYjnK3MFmTU_tIYTntZRw3hdro9S1baLKCD8VhPSJ1M3lMXlZt deIGG6zSxKqynOFoV0W5kqBAK3FI9dHuLLrOSj9ykqpPuS.7nWcmue2hyjIHnNeYzV0Y88QCF0Jy mcYkCVlaXuUCOpFtsajLhAOPzvVz5H9S6gJqnXxoc1rWb5YMmbF2QtrzhwkCfmGiGNY73xHNJSWw arK2YxivC1ofV_O5h8tR5zfaTBkYtV18o9Yh4etTypTWdfHtkjA6wuu_56yMEvOkJmuU6ilgOnZ6 CivaRCPPNAfbP8NS7ZkaCoDMkRkGOuw1L7H6ngVb7a73wEwYImoKPT2wMcMxN5jmR8qtIA_qVzNn 3taIDFDL.S4HQPdfSg30b5PF33dhduZw.zzcR8Wew.JxE_fVGbdwA6n2uSv.9qC45p88kVFnk29A gjdb3Ag_DUC1.BBSa.7lTcAkgf1cneEEUZC_HswBPJLuWAJYZVeSJi8.bjJ_Yw6e_nVbhzrLk8Rb o2fV9cq6E4hvzedFjEiQS.tC48PYhNPlPbbK62fLnG7lI.TMBjV0o5vdDXSv2pR0IP1II6onzCq1 19miMG.Hlj7Kr4BqLD0Sbh17.CuSCgH3sh1lUaVMcSexdslyWCG5cR_o2jb1tZEPkTO4Gja6NvyB MseJM4tAThka9XQmJb1zcSTGYAYdIN5L_bJm5a31SRvhCwYTt4BI01HfzKNCH7Pdmq7RNGmI8C4d SHRXLrW3Cm3MhLUitIgDTPC0oeOy9WwAHdhlp_1YTbJ_IF8.0.JGjh7oyet6ZexF4ei.TMIEhNiU UkQc4M9paGS1S7c5FiBiZoV_.P0R.LAxgS29SRTE7VH96cL_WRCq16srZen.y.YaWD6DhQHJfsbR pKwQnHFltWMuL8S_e2_O5BAb.vYBvYbX.1gCOGlrvMKwW6.XrTRKprPPmtH6yhDbDctLYoAcE75I H9A8e82I9O4X0xeNZi9pvg8mdcrYe55JexMp.gajhZz4p52ENvLcJTinrt5UknYT8LVAcb956zbL WHKboNYnj5fITuVuDxscZ4opI9PE6t6eqMCRnwIrsvwFfXhFGM39FYWlo5uOhttsT8EjfaGWiRPA WR.KHrpXlctM6MYIi7GkBjBD3Ww9INUTeIuH3SByfRvCXAg-- X-Sonic-MF: X-Sonic-ID: c4a54ce4-38fa-48dc-9e5c-c29f111d01c7 Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.sg3.yahoo.com with HTTP; Wed, 13 Nov 2024 12:05:27 +0000 Received: by hermes--production-sg3-5b7954b588-8t8cf (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 27ec9069c9d81d9a20e9e40369ecd8a0; Wed, 13 Nov 2024 12:05:22 +0000 (UTC) Date: Wed, 13 Nov 2024 20:05:18 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 References: 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 all patches no longer applicable. [inputs]: Remove coreutils and libxxf86vm. Change-Id: If8720bb51309d7c251e76a1885695851f3a03255 --- Small update as I found out how the old package definition made the tests pass. gnu/packages/minetest.scm | 57 +++++++++++++-------------------------- 1 file changed, 18 insertions(+), 39 deletions(-) base-commit: 1f057603ef59c7b9c32f610a897321fd75dc4dad diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index 2552596ef8..64acdc6a98 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,56 +63,34 @@ (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 (list #: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"))) + "-DENABLE_UPDATE_CHECKER=FALSE") #: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 +98,9 @@ (define-public minetest ;; when invoked on the target outside of `guix build'. (when tests? (setenv "HOME" "/tmp") - (invoke "src/minetest" "--run-unittests"))))))) + (setenv "MINETEST_GAME_PATH" + (string-append (getcwd) "/../source/games")) + (invoke "../source/bin/luanti" "--run-unittests"))))))) (native-search-paths (list (search-path-specification (variable "MINETEST_GAME_PATH") @@ -129,8 +109,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 +118,6 @@ (define-public minetest libpng libogg libvorbis - libxxf86vm libxi luajit mesa @@ -147,6 +125,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