GNU bug report logs - #37981
[PATCH] gnu: openttd: Update package.

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 37981 in the body.
You can then email your comments to 37981 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: Josh Holland <josh <at> inv.alid.pw>
To: guix-patches <at> gnu.org
Cc: Josh Holland <josh <at> inv.alid.pw>
Subject: [PATCH] gnu: openttd: Update package.
Date: Tue, 29 Oct 2019 14:40:42 +0000

* gnu/packages/games.scm (openttd-engine): Update to 1.9.3.
[source](patches): Delete since present in new release.
[home-page]: Add www. per guix lint suggestion.
(openttd-opengfx): Update to 0.5.5.
---
 gnu/packages/games.scm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 3e85449fac..1a4aafcaa8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2019 Dan Frumin <dfrumin <at> cs.ru.nl>
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar <at> araneo.si>
+;;; Copyright © 2019 Josh Holland <josh <at> inv.alid.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2594,24 +2595,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.8.0")
+    (version "1.9.3")
     (source
      (origin (method url-fetch)
-             (uri (string-append "http://binaries.openttd.org/releases/"
+             (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
-             (patches
-              (list
-               (origin (method url-fetch)
-                       (uri (string-append
-                             "https://github.com/OpenTTD/OpenTTD/commit/"
-                             "19076c24c1f3baf2a22d1fa832d5688216cf54a3.patch"))
-                       (file-name "openttd-fix-compilation-with-ICU-61.patch")
-                       (sha256
-                        (base32
-                         "02d1xmb75yv4x6rfnvxk3vvq4l3lvvwr2pfsdzn7lzalic51ziqh")))))
              (sha256
               (base32
-               "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"))
+               "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"))
              (modules '((guix build utils)))
              (snippet
               ;; The DOS port contains proprietary software.
@@ -2656,7 +2647,7 @@ Tycoon Deluxe with many enhancements including multiplayer mode,
 internationalization support, conditional orders and the ability to clone,
 autoreplace and autoupdate vehicles.  This package only includes the game
 engine.  When you start it you will be prompted to download a graphics set.")
-    (home-page "http://openttd.org/")
+    (home-page "http://www.openttd.org/")
     ;; This package is GPLv2, except for a few files located in
     ;; "src/3rdparty/" which are under the 3-clause BSD, LGPLv2.1+ and Zlib
     ;; licenses.  In addition, this software contains an in-game downloader
@@ -2667,7 +2658,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "0.5.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
@@ -2675,7 +2666,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
                            version "/opengfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0iz66q7p1mf00njfjbc4vibh3jaybki7armkl18iz7p6x4chp9zv"))))
+         "009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags (list "CC=gcc"
-- 
2.23.0

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: 37981 <at> debbugs.gnu.org
Cc: Josh Holland <josh <at> inv.alid.pw>
Subject: Fwd: [bug#37981] [PATCH] gnu: openttd: Update package.
Date: Tue, 29 Oct 2019 16:45:48 +0100

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

Josh,

Thanks!  Building it now…

Josh Holland 写道：
> * gnu/packages/games.scm (openttd-engine): Update to 1.9.3.
> [source](patches): Delete since present in new release.
> [home-page]: Add www. per guix lint suggestion.

As noted on IRC, https:// is supported too.  Did you stick with 
HTTP on purpose?

> (openttd-opengfx): Update to 0.5.5.

Is there no order in which engine and data can be updated 
separately and still result in a working game?

Kind regards,

T G-R

[signature.asc (application/pgp-signature, inline)]

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

From: Josh Holland <josh <at> inv.alid.pw>
To: Tobias Geerinckx-Rice <me <at> tobias.gr>
Cc: 37981 <at> debbugs.gnu.org
Subject: Re: Fwd: [bug#37981] [PATCH] gnu: openttd: Update package.
Date: Tue, 29 Oct 2019 16:43:35 +0000

Tobias Geerinckx-Rice <me <at> tobias.gr> writes:
> As noted on IRC, https:// is supported too.  Did you stick with HTTP
> on purpose?

No, I didn't even notice that it was plain HTTP.

>> (openttd-opengfx): Update to 0.5.5.
>
> Is there no order in which engine and data can be updated separately
> and still result in a working game?

I haven't checked, but I'm 99% sure that they can be updated
independently.  However, the only publicly exposed package is `openttd'
which uses the engine and data packages as native-inputs.  I can
separate them out into separate commits and re-submit the patch if that
would be better.

--
Josh Holland

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

From: Josh Holland <josh <at> inv.alid.pw>
To: 37981 <at> debbugs.gnu.org
Cc: Josh Holland <josh <at> inv.alid.pw>
Subject: [PATCH 2/2] gnu: openttd-engine: Update to 1.9.3.
Date: Tue, 29 Oct 2019 17:08:34 +0000

* gnu/packages/games.scm (openttd-engine): Update to 1.9.3.
[home-page]: Use https and www.
---
 gnu/packages/games.scm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5930b60423..ab237eb6a2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2595,24 +2595,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.8.0")
+    (version "1.9.3")
     (source
      (origin (method url-fetch)
-             (uri (string-append "http://binaries.openttd.org/releases/"
+             (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
-             (patches
-              (list
-               (origin (method url-fetch)
-                       (uri (string-append
-                             "https://github.com/OpenTTD/OpenTTD/commit/"
-                             "19076c24c1f3baf2a22d1fa832d5688216cf54a3.patch"))
-                       (file-name "openttd-fix-compilation-with-ICU-61.patch")
-                       (sha256
-                        (base32
-                         "02d1xmb75yv4x6rfnvxk3vvq4l3lvvwr2pfsdzn7lzalic51ziqh")))))
              (sha256
               (base32
-               "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"))
+               "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"))
              (modules '((guix build utils)))
              (snippet
               ;; The DOS port contains proprietary software.
@@ -2657,7 +2647,7 @@ Tycoon Deluxe with many enhancements including multiplayer mode,
 internationalization support, conditional orders and the ability to clone,
 autoreplace and autoupdate vehicles.  This package only includes the game
 engine.  When you start it you will be prompted to download a graphics set.")
-    (home-page "http://openttd.org/")
+    (home-page "https://www.openttd.org/")
     ;; This package is GPLv2, except for a few files located in
     ;; "src/3rdparty/" which are under the 3-clause BSD, LGPLv2.1+ and Zlib
     ;; licenses.  In addition, this software contains an in-game downloader
-- 
2.23.0

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

From: Josh Holland <josh <at> inv.alid.pw>
To: 37981 <at> debbugs.gnu.org
Cc: Josh Holland <josh <at> inv.alid.pw>
Subject: [PATCH 1/2] gnu: openttd-opengfx: Update to 0.5.5.
Date: Tue, 29 Oct 2019 17:08:33 +0000

* gnu/packages/games.scm (openttd-opengfx): Update package
---
 gnu/packages/games.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 3e85449fac..5930b60423 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -44,6 +44,7 @@
 ;;; Copyright © 2019 Dan Frumin <dfrumin <at> cs.ru.nl>
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv <at> posteo.net>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar <at> araneo.si>
+;;; Copyright © 2019 Josh Holland <josh <at> inv.alid.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2667,7 +2668,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "0.5.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
@@ -2675,7 +2676,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
                            version "/opengfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0iz66q7p1mf00njfjbc4vibh3jaybki7armkl18iz7p6x4chp9zv"))))
+         "009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags (list "CC=gcc"
-- 
2.23.0

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

From: Josh Holland <josh <at> inv.alid.pw>
To: 37981 <at> debbugs.gnu.org
Cc: Josh Holland <josh <at> inv.alid.pw>
Subject: [PATCH v2] gnu: openttd-engine: Update to 1.9.3.
Date: Tue, 29 Oct 2019 17:14:06 +0000

* gnu/packages/games.scm (openttd-engine): Update to 1.9.3.
[home-page]: Use https and www.
[source](patches): Delete as merged upstream.
---
I forgot to mention the removal of the patches in the commit message
the first time.


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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5930b60423..ab237eb6a2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2595,24 +2595,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.8.0")
+    (version "1.9.3")
     (source
      (origin (method url-fetch)
-             (uri (string-append "http://binaries.openttd.org/releases/"
+             (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
-             (patches
-              (list
-               (origin (method url-fetch)
-                       (uri (string-append
-                             "https://github.com/OpenTTD/OpenTTD/commit/"
-                             "19076c24c1f3baf2a22d1fa832d5688216cf54a3.patch"))
-                       (file-name "openttd-fix-compilation-with-ICU-61.patch")
-                       (sha256
-                        (base32
-                         "02d1xmb75yv4x6rfnvxk3vvq4l3lvvwr2pfsdzn7lzalic51ziqh")))))
              (sha256
               (base32
-               "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"))
+               "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"))
              (modules '((guix build utils)))
              (snippet
               ;; The DOS port contains proprietary software.
@@ -2657,7 +2647,7 @@ Tycoon Deluxe with many enhancements including multiplayer mode,
 internationalization support, conditional orders and the ability to clone,
 autoreplace and autoupdate vehicles.  This package only includes the game
 engine.  When you start it you will be prompted to download a graphics set.")
-    (home-page "http://openttd.org/")
+    (home-page "https://www.openttd.org/")
     ;; This package is GPLv2, except for a few files located in
     ;; "src/3rdparty/" which are under the 3-clause BSD, LGPLv2.1+ and Zlib
     ;; licenses.  In addition, this software contains an in-game downloader
-- 
2.23.0

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

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Josh Holland <josh <at> inv.alid.pw>
Cc: 37981-done <at> debbugs.gnu.org
Subject: Re: [bug#37981] [PATCH] gnu: openttd: Update package.
Date: Tue, 29 Oct 2019 20:04:03 +0100

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

Josh Holland 写道：
> I can separate them out into separate commits and re-submit the 
> patch
> if that would be better.

Thanks for doing so; pushed (with forgotten Signed-off-by line) as 
532dba49ca7f04138c4eae3e4961a102c64da2a9 et al.

Kind regards,

T ‘I was too busy… testing’ G-R

[signature.asc (application/pgp-signature, inline)]

Previous Next

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