GNU bug report logs - #62539
[PATCH] gnu: endless-sky: Update to 0.10.0.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Z572 <873216071 <at> qq.com>
Subject: bug#62539: closed (Re: [bug#62539] [PATCH] gnu: endless-sky:
 Update to 0.10.0.)
Date: Sun, 02 Apr 2023 20:33:03 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#62539: [PATCH] gnu: endless-sky: Update to 0.10.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 62539 <at> debbugs.gnu.org.

-- 
62539: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62539
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Z572 via Guix-patches via <guix-patches <at> gnu.org>
Cc: 62539-done <at> debbugs.gnu.org, Z572 <873216071 <at> qq.com>
Subject: Re: [bug#62539] [PATCH] gnu: endless-sky: Update to 0.10.0.
Date: Sun, 02 Apr 2023 22:32:32 +0200

Hello,

Z572 via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/games.scm (endless-sky): Update to 0.10.0.
> [build-system]: chang to cmake-build-system.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou

[Message part 3 (message/rfc822, inline)]

From: Z572 <873216071 <at> qq.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: endless-sky: Update to 0.10.0.
Date: Thu, 30 Mar 2023 17:36:39 +0800

* 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 <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Hendursaga <hendursaga <at> aol.com>
 ;;; Copyright © 2022 Parnikkapore <poomklao <at> yahoo.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> 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
-- 
2.39.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.