GNU bug report logs - #49871
[PATCH 0/3] Update endless-sky

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49871 in the body.
You can then email your comments to 49871 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/3] Update endless-sky
Date: Wed, 04 Aug 2021 12:45:11 +0200

Hi,

these patches update Endless Sky to the latest version and clean up the
package.

Thanks!

Timotej Lazar (3):
  gnu: endless-sky: Update to 0.9.14.
  gnu: endless-sky: Clean up phases.
  gnu: endless-sky: Enable tests.

 gnu/packages/games.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

-- 
2.32.0

Message #8 received at 49871 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 49871 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 1/3] gnu: endless-sky: Update to 0.9.14.
Date: Wed,  4 Aug 2021 12:49:30 +0200

* gnu/packages/games.scm (endless-sky): Update to 0.9.14.
[arguments]: Add 'use-gcc-ar phase to support LTO used by the new version.
---
 gnu/packages/games.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ad48c49566..792ff64a07 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8351,7 +8351,7 @@ your score gets higher, you level up and the blocks fall faster.")
 (define-public endless-sky
   (package
     (name "endless-sky")
-    (version "0.9.12")
+    (version "0.9.14")
     (source
       (origin
         (method git-fetch)
@@ -8360,7 +8360,7 @@ your score gets higher, you level up and the blocks fall faster.")
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32 "18nkl4s3r5sy3sd9lhbdg9160c7fggklklprx0d5azifc8g6k0wj"))))
+         (base32 "12iganf8dxiyrjznnabsarxjsr0h717j3k4mz15p0k67wxyahhmf"))))
     (build-system scons-build-system)
     (arguments
      `(#:scons ,scons-python2
@@ -8382,7 +8382,10 @@ your score gets higher, you level up and the blocks fall faster.")
                 "Environment(ENV = os.environ)")
                ;; Install into %out/bin
                (("games\"") "bin\""))
-             #t)))))
+             #t))
+         (add-before 'build 'use-gcc-ar
+           ;; Use gcc-ar to support LTO.
+           (lambda _ (setenv "AR" "gcc-ar") #t)))))
     (inputs
      `(("glew" ,glew)
        ("libjpeg" ,libjpeg-turbo)
-- 
2.32.0

Message #11 received at 49871 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 49871 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 2/3] gnu: endless-sky: Clean up phases.
Date: Wed,  4 Aug 2021 12:49:31 +0200

* gnu/packages/games.scm (endless-sky)[arguments]: Drop unused substitution
and merge existing phases into 'fix-paths.
---
 gnu/packages/games.scm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 792ff64a07..9a595162de 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8368,19 +8368,13 @@ your score gets higher, you level up and the blocks fall faster.")
        #:tests? #f ; no tests
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-resource-locations
+         (add-after 'unpack 'fix-paths
            (lambda* (#:key outputs #:allow-other-keys)
+             ;; Look for resources in the store directory.
              (substitute* "source/Files.cpp"
-               (("/usr/local/")
-                (string-append (assoc-ref outputs "out") "/")))
-             #t))
-         (add-after 'unpack 'patch-scons
-           (lambda _
+               (("/usr/local") (assoc-ref outputs "out")))
+             ;; Install game binary into %out/bin.
              (substitute* "SConstruct"
-               ;; Keep environmental variables
-               (("Environment\\(\\)")
-                "Environment(ENV = os.environ)")
-               ;; Install into %out/bin
                (("games\"") "bin\""))
              #t))
          (add-before 'build 'use-gcc-ar
-- 
2.32.0

Message #14 received at 49871 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 49871 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 3/3] gnu: endless-sky: Enable tests.
Date: Wed,  4 Aug 2021 12:49:32 +0200

* gnu/packages/games.scm (endless-sky)[arguments]: Enable tests.
---
 gnu/packages/games.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9a595162de..40c49063cd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8365,7 +8365,6 @@ your score gets higher, you level up and the blocks fall faster.")
     (arguments
      `(#:scons ,scons-python2
        #:scons-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
-       #:tests? #f ; no tests
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-paths
-- 
2.32.0

Message #19 received at 49871-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 49871-done <at> debbugs.gnu.org
Subject: Re: [bug#49871] [PATCH 0/3] Update endless-sky
Date: Thu, 05 Aug 2021 09:05:55 +0200

Hello,

Timotej Lazar <timotej.lazar <at> araneo.si> writes:

> these patches update Endless Sky to the latest version and clean up the
> package.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou

Previous Next

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