From patchwork Thu Mar 30 09:36:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 48796 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 A2C791719A; Thu, 30 Mar 2023 10:38:16 +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=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 17959170E3 for ; Thu, 30 Mar 2023 10:38:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phojT-00030E-9y; Thu, 30 Mar 2023 05:38:11 -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 1phojO-0002zb-0t for guix-patches@gnu.org; Thu, 30 Mar 2023 05:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phojK-0002dz-1f for guix-patches@gnu.org; Thu, 30 Mar 2023 05:38:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phojJ-0003wV-Sy for guix-patches@gnu.org; Thu, 30 Mar 2023 05:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62539] [PATCH] gnu: endless-sky: Update to 0.10.0. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 09:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62539 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62539@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168016902815092 (code B ref -1); Thu, 30 Mar 2023 09:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2023 09:37:08 +0000 Received: from localhost ([127.0.0.1]:55789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phoiS-0003vL-4J for submit@debbugs.gnu.org; Thu, 30 Mar 2023 05:37:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:47638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1phoiN-0003v7-D8 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 05:37:06 -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 <873216071@qq.com>) id 1phoiM-0001kC-4Y for guix-patches@gnu.org; Thu, 30 Mar 2023 05:37:03 -0400 Received: from out162-62-57-252.mail.qq.com ([162.62.57.252]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1phoiJ-0002MS-0Y for guix-patches@gnu.org; Thu, 30 Mar 2023 05:37:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1680169008; bh=Xvr47ExcsfBqR8VJkZutwpXUh6bPloM35AV5uLgYb/E=; h=From:To:Subject:Date; b=zWFfp7EWOSUXT6qK2ltPZvEGZQU+jTOLGO5Pgccy1OS3qbdRUVURV7kvuHZeOTKs+ +hd72ImynVZwL2mfM8kCZKkOgtxoHE6YWRhfMrmJhmflpgfJqoCj3Ushc3qfv8rZKm AbR/+jUQSe07BkhYXJvyD2+8JZuLxLecaaeQw5xs= Received: from localhost.localdomain ([111.0.51.145]) by newxmesmtplogicsvrszc1-0.qq.com (NewEsmtp) with SMTP id 9283D88F; Thu, 30 Mar 2023 17:36:40 +0800 X-QQ-mid: xmsmtpt1680169000tqw0xm803 Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeieDhfsgVXcr2i6IH7p6njDEbXnkz1OhjyqlPGDHopy3yZhNjyxSM iHio0DCV/6tt2g32X5ZWC/pX5Wcw3Um3swe26tBg89Ux32n+Lm/+j7lDKSfNe5PUDrxGjae7BTGg QC8VmvPGV62debojQkQxMhiYgBUg2xtyOvuyu8jdjeUOQMULGTRqv7abzBTZguq8heU8JgmALCjx +0AjomNa2SHMZuscbOovAIP8PHH4CZOuVB4Y4niviKm2T1KxFGyt9lhMp3gaeeX4dRWiE42GZs/a uUv4f4hhj9KB7iYXb0kw18+UFy5xfibJ3UETpCzhT0Vu9/5AHHNKvB3eBIxr9BU4XrjClOkre6QY /QObtikVzUNwEoTryBtrSDrjzHxHHnG2y4Lmp7uncqZIuyaOFF7xQXNd8fBV+qWsrejpxYQKOQs0 3eLR72UaBZwyEb0dnhc12BqTrad9LAJDKreQ2La0RfJJVZMpDu4bUtKlxL/Wj6NkVHfRBaxB31BI m+SgBoRI7QPGW022kn3etdHbt2ZLQxEXhpTW4ZXESg3+MXRUK/mD54cLIi70ckRcoflXKzKo+oRU sMly1ugte3c/IEuygwrEZ6kJUPcMqfSb8XPkiejY1ialJdJKk+ISZ/U1LQtOELxTv5UbBPBYB+C4 YJIoRCPHXkhb+sf3JLBrZwmiXwL9ylmPpaeENUNmO5PlOH1qeRO0ghXKFIg++k7KlM/03nj0kL1R erUg2t/UdNi1V8UMI0+ILIy8DFECNE4dj8yzgNTqd0We4RYcVO2fjeeHbgyyyjZikPmzrdH8Fkb7 Lu6Y64TJyFDnTRXZdEQb9pdy1K+fckMjnfAidoC12Yfn6hhOPBT+mih8uYtRaNXQEw5kwLNsZMsB DlMqttO852mK28LyKN2TN524ky+WUwc6OwtyFnVEcKmtKEwCqNw0KMi60Y+0PO3A== Date: Thu, 30 Mar 2023 17:36:39 +0800 X-OQ-MSGID: <430f971b6dacaaa2df7147712bc114b3726b13d1.1680168994.git.873216071@qq.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=162.62.57.252; envelope-from=873216071@qq.com; helo=out162-62-57-252.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> 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/games.scm (endless-sky): Update to 0.10.0. [build-system]: chang to cmake-build-system. --- gnu/packages/games.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5825b8d936..ca9f85dbf1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -75,6 +75,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Hendursaga ;;; Copyright © 2022 Parnikkapore +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -8256,7 +8257,7 @@ (define-public quadrapassel (define-public endless-sky (package (name "endless-sky") - (version "0.9.16.1") + (version "0.10.0") (source (origin (method git-fetch) @@ -8265,10 +8266,13 @@ (define-public endless-sky (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cb2g1cb0mk6x9gq2x7n10rxlfhsq8wnssk068j6h80al3hhybly")))) - (build-system scons-build-system) + (base32 "1zbizmigxdwpi3m7sxv9hhf3aa18kbhsfrp48zy3iw2v64pw9l3r")))) + (build-system cmake-build-system) (arguments - (list #:scons-flags #~(list (string-append "PREFIX=" #$output)) + (list #:configure-flags #~(list "-DES_USE_VCPKG=0" + "-DES_USE_SYSTEM_LIBRARIES=1") + #:make-flags #~(list (string-append "PREFIX=" #$output)) + #:build-type "Release" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -8277,11 +8281,8 @@ (define-public endless-sky (substitute* "source/Files.cpp" (("/usr/local") #$output)) ;; Install game binary into %out/bin. - (substitute* "SConstruct" - (("games\"") "bin\"")))) - (add-before 'build 'use-gcc-ar - ;; Use gcc-ar to support LTO. - (lambda _ (setenv "AR" "gcc-ar")))))) + (substitute* "CMakeLists.txt" + (("games\\)") "bin)"))))))) (inputs (list glew libjpeg-turbo