GNU bug report logs - #51280
[PATCH 0/5] Update openttd to 12.0.

Previous Next

Package: guix-patches;

Reported by: Felix Gruber <felgru <at> posteo.net>

Date: Tue, 19 Oct 2021 06:59:02 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Tue, 19 Oct 2021 06:59:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Felix Gruber <felgru <at> posteo.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Tue, 19 Oct 2021 06:59:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 0/5] Update openttd to 12.0.
Date: Tue, 19 Oct 2021 06:58:29 +0000
Felix Gruber (5):
  gnu: openttd-engine: Update to 12.0.
  gnu: openttd-opengfx: Update to 7.1.
  gnu: openttd-opensfx: Update to 1.0.2.
  gnu: openttd-openmsx: Update to 0.4.2.
  gnu: openttd: Fix build failure.

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

-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Tue, 19 Oct 2021 07:03:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 1/5] gnu: openttd-engine: Update to 12.0.
Date: Tue, 19 Oct 2021 07:01:57 +0000
* gnu/packages/games.scm (openttd-engine): Update engine to 12.0.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 38852a2874..adf8dec02a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4287,14 +4287,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.11.2")
+    (version "12.0")
     (source
      (origin (method url-fetch)
              (uri (string-append "https://cdn.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
              (sha256
               (base32
-               "0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
+               "1p1j5cf4ry57dcgm7qx2g2s00z1c6qgjabb4kqjp00yz00wgv85v"))))
     (build-system cmake-build-system)
     (inputs
      `(("allegro" ,allegro)
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Tue, 19 Oct 2021 07:03:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 2/5] gnu: openttd-opengfx: Update to 7.1.
Date: Tue, 19 Oct 2021 07:01:58 +0000
* packages/games.scm (openttd-opengfx): Update to 7.1.
  [arguments]: Use cc-for-target.
---
 gnu/packages/games.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index adf8dec02a..7afcbe860f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4324,7 +4324,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "0.6.1")
+    (version "7.1")
     (source
      (origin
        (method url-fetch)
@@ -4332,10 +4332,10 @@ engine.  When you start it you will be prompted to download a graphics set.")
                            version "/opengfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0jgy8xv7r72m127qn09vr3rxhnbakl2990f7lldsk0d5d8n993vd"))))
+         "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:make-flags (list "CC=gcc"
+     `(#:make-flags (list (string-append "CC=" ,(cc-for-target))
                           (string-append "INSTALL_DIR="
                                          (assoc-ref %outputs "out")
                                          "/share/games/openttd/baseset/opengfx"))
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Tue, 19 Oct 2021 07:03:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 3/5] gnu: openttd-opensfx: Update to 1.0.2.
Date: Tue, 19 Oct 2021 07:01:59 +0000
* packages/games.scm (openttd-opensfx): Update to 1.0.2.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 7afcbe860f..fe3d4fbe18 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4383,7 +4383,7 @@ OpenGFX provides you with...
 (define openttd-opensfx
   (package
     (name "openttd-opensfx")
-    (version "1.0.1")
+    (version "1.0.2")
     (source
      (origin
        (method url-fetch)
@@ -4392,7 +4392,7 @@ OpenGFX provides you with...
              version "/opensfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "06vycppqcxbfdqlxzna5xr303zgcmpcvj6ylw5b2ws0ssph2f1s0"))))
+         "0aym026lg0r7dp3jxxs9c0rj8lwy1fz3v9hmk3mml6sycsg3fv42"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("catcodec" ,catcodec)
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Tue, 19 Oct 2021 07:03:03 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Tue, 19 Oct 2021 07:02:00 +0000
* packages/games.scm (openttd-openmsx): Update to 0.4.2.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index fe3d4fbe18..3fcca77926 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4433,7 +4433,7 @@ the original Transport Tycoon Deluxe.")
 (define openttd-openmsx
   (package
     (name "openttd-openmsx")
-    (version "0.4.0")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
@@ -4442,7 +4442,7 @@ the original Transport Tycoon Deluxe.")
              version "/openmsx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0prjljsdgdxqdhhcriqskqha004ybs575xcjq80zha3pqnmrdk0k"))))
+         "1bwfql9540bp9czna0df6apsm6kr15pjghlmg4viixim8jckbrzx"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("grfcodec" ,grfcodec)
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Tue, 19 Oct 2021 07:03:03 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 5/5] gnu: openttd: Fix build failure.
Date: Tue, 19 Oct 2021 07:02:01 +0000
* packages/games.scm (openttd)[native-inputs]: Use gcc-9 to fix build
  failure.
---
 gnu/packages/games.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 3fcca77926..78e885e0a0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4495,6 +4495,7 @@ Transport Tycoon Deluxe.")
      `(("opengfx" ,openttd-opengfx)
        ("openmsx" ,openttd-openmsx)
        ("opensfx" ,openttd-opensfx)
+       ("gcc" ,gcc-9)                   ; for #include <charconv>
        ,@(package-native-inputs openttd-engine)))))
 
 (define openrct2-title-sequences
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Wed, 03 Nov 2021 14:22:02 GMT) Full text and rfc822 format available.

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

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Felix Gruber <felgru <at> posteo.net>
Cc: 51280 <at> debbugs.gnu.org
Subject: Re: [bug#51280] [PATCH 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Wed, 3 Nov 2021 16:20:26 +0200
[Message part 1 (text/plain, inline)]
On Tue, Oct 19, 2021 at 07:02:00AM +0000, Felix Gruber wrote:
> * packages/games.scm (openttd-openmsx): Update to 0.4.2.
> ---
>  gnu/packages/games.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index fe3d4fbe18..3fcca77926 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -4433,7 +4433,7 @@ the original Transport Tycoon Deluxe.")
>  (define openttd-openmsx
>    (package
>      (name "openttd-openmsx")
> -    (version "0.4.0")
> +    (version "0.4.2")
>      (source
>       (origin
>         (method url-fetch)
> @@ -4442,7 +4442,7 @@ the original Transport Tycoon Deluxe.")
>               version "/openmsx-" version "-source.tar.xz"))
>         (sha256
>          (base32
> -         "0prjljsdgdxqdhhcriqskqha004ybs575xcjq80zha3pqnmrdk0k"))))
> +         "1bwfql9540bp9czna0df6apsm6kr15pjghlmg4viixim8jckbrzx"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("grfcodec" ,grfcodec)

I was looking to review this patch set and I got a hash mismatch on the
source download here. Can you check into what may have happened? Thanks.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:22:01 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: Efraim Flashner <efraim <at> flashner.co.il>, 51280 <at> debbugs.gnu.org
Subject: Re: [bug#51280] [PATCH 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Sat,  6 Nov 2021 10:21:18 +0000
[Message part 1 (text/plain, inline)]
Hi Efraim,

On 11/3/21 3:20 PM, Efraim Flashner wrote:
> I was looking to review this patch set and I got a hash mismatch on the
> source download here. Can you check into what may have happened? Thanks.

It looks like the source tarball for openmsx 0.4.2 originally contained
the sources for 0.4.1 and was later replaced with the correct tarball.
I've run diffoscope against the two tarballs (you can find the full diff
in the attachment). This diff is consistent with the diff

https://github.com/OpenTTD/OpenMSX/compare/345efabba2eca1117ff0747d67529f0d334d770c...0.4.2

in openmsx's git repository between the untagged 0.4.1 at commit
345efabba2eca1117ff0747d67529f0d334d770c and the tag 0.4.2.

I will create a new version of my patchset with the correct hash
0h583d8fxy78kc3jvpp78r76a48qhxrhm4q7jbnj74aw0kwrcl8g corresponding to
the updated 0.4.2 tarball.
This will also allow me to replace python-2 with python in all openttd
packages, as I've realized their latest versions were all made
compatible with Python 3.


Best,
Felix
[openmsx-0.4.2.diffoscope (text/plain, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:42:01 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org,
	Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2 0/5] Update openttd to 12.0.
Date: Sat,  6 Nov 2021 10:40:35 +0000
This updated patchset fixes the hash for openttd-openmsx, whose source
tarball was recently replaced [1]. It also changes the native-inputs of
all openttd packages to use python instead of python-2.

[1]: https://lists.gnu.org/archive/html/guix-patches/2021-11/msg00164.html

Felix Gruber (5):
  gnu: openttd-engine: Update to 12.0.
  gnu: openttd-opengfx: Update to 7.1.
  gnu: openttd-opensfx: Update to 1.0.2.
  gnu: openttd-openmsx: Update to 0.4.2.
  gnu: openttd: Fix build failure.

 gnu/packages/games.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:42:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org,
	Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2 1/5] gnu: openttd-engine: Update to 12.0.
Date: Sat,  6 Nov 2021 10:40:36 +0000
* gnu/packages/games.scm (openttd-engine): Update engine to 12.0.
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 782c2b9c2e..3704704135 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4287,14 +4287,14 @@ world}, @uref{http://evolonline.org, Evol Online} and
 (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.11.2")
+    (version "12.0")
     (source
      (origin (method url-fetch)
              (uri (string-append "https://cdn.openttd.org/openttd-releases/"
                                  version "/openttd-" version "-source.tar.xz"))
              (sha256
               (base32
-               "0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
+               "1p1j5cf4ry57dcgm7qx2g2s00z1c6qgjabb4kqjp00yz00wgv85v"))))
     (build-system cmake-build-system)
     (inputs
      `(("allegro" ,allegro)
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:43:01 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org,
	Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2 2/5] gnu: openttd-opengfx: Update to 7.1.
Date: Sat,  6 Nov 2021 10:40:37 +0000
* packages/games.scm (openttd-opengfx): Update to 7.1.
  [native-inputs]: Replace python-2 with python.
  [arguments]: Use cc-for-target.
---
 gnu/packages/games.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 3704704135..2a429f4662 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4324,7 +4324,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
 (define openttd-opengfx
   (package
     (name "openttd-opengfx")
-    (version "0.6.1")
+    (version "7.1")
     (source
      (origin
        (method url-fetch)
@@ -4332,10 +4332,10 @@ engine.  When you start it you will be prompted to download a graphics set.")
                            version "/opengfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0jgy8xv7r72m127qn09vr3rxhnbakl2990f7lldsk0d5d8n993vd"))))
+         "0nhzlk6s73qvznm5fdwcs1b42g2plf26s5ag39fvck45zm7m48jk"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:make-flags (list "CC=gcc"
+     `(#:make-flags (list (string-append "CC=" ,(cc-for-target))
                           (string-append "INSTALL_DIR="
                                          (assoc-ref %outputs "out")
                                          "/share/games/openttd/baseset/opengfx"))
@@ -4363,7 +4363,7 @@ engine.  When you start it you will be prompted to download a graphics set.")
                      ("grfcodec" ,grfcodec)
                      ("nml" ,nml)
                      ("which" ,which)
-                     ("python" ,python-2)))
+                     ("python" ,python)))
     (home-page "http://dev.openttdcoop.org/projects/opengfx")
     (synopsis "Base graphics set for OpenTTD")
     (description
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:43:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org,
	Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2 3/5] gnu: openttd-opensfx: Update to 1.0.2.
Date: Sat,  6 Nov 2021 10:40:38 +0000
* packages/games.scm (openttd-opensfx): Update to 1.0.2.
  [native-inputs]: Replace python-2 with python.
---
 gnu/packages/games.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2a429f4662..a6602fe4f6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4383,7 +4383,7 @@ OpenGFX provides you with...
 (define openttd-opensfx
   (package
     (name "openttd-opensfx")
-    (version "1.0.1")
+    (version "1.0.2")
     (source
      (origin
        (method url-fetch)
@@ -4392,11 +4392,11 @@ OpenGFX provides you with...
              version "/opensfx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "06vycppqcxbfdqlxzna5xr303zgcmpcvj6ylw5b2ws0ssph2f1s0"))))
+         "0aym026lg0r7dp3jxxs9c0rj8lwy1fz3v9hmk3mml6sycsg3fv42"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("catcodec" ,catcodec)
-       ("python" ,python-2)
+       ("python" ,python)
        ("tar" ,tar)))
     (arguments
      `(#:make-flags
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:43:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org,
	Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Sat,  6 Nov 2021 10:40:39 +0000
* packages/games.scm (openttd-openmsx): Update to 0.4.2.
  [native-inputs]: Replace python-2 with python.
---
 gnu/packages/games.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a6602fe4f6..8e92e04daa 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4433,7 +4433,7 @@ the original Transport Tycoon Deluxe.")
 (define openttd-openmsx
   (package
     (name "openttd-openmsx")
-    (version "0.4.0")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
@@ -4442,11 +4442,11 @@ the original Transport Tycoon Deluxe.")
              version "/openmsx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0prjljsdgdxqdhhcriqskqha004ybs575xcjq80zha3pqnmrdk0k"))))
+         "0h583d8fxy78kc3jvpp78r76a48qhxrhm4q7jbnj74aw0kwrcl8g"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("grfcodec" ,grfcodec)
-       ("python" ,python-2)
+       ("python" ,python)
        ("tar" ,tar)))
     (arguments
      `(#:make-flags
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 10:44:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org,
	Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2 5/5] gnu: openttd: Fix build failure.
Date: Sat,  6 Nov 2021 10:40:40 +0000
* packages/games.scm (openttd)[native-inputs]: Use gcc-9 to fix build
  failure.
---
 gnu/packages/games.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8e92e04daa..346bceed37 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4495,6 +4495,7 @@ Transport Tycoon Deluxe.")
      `(("opengfx" ,openttd-opengfx)
        ("openmsx" ,openttd-openmsx)
        ("opensfx" ,openttd-opensfx)
+       ("gcc" ,gcc-9)                   ; for #include <charconv>
        ,@(package-native-inputs openttd-engine)))))
 
 (define openrct2-title-sequences
-- 
2.30.2





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 12:35:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Felix Gruber <felgru <at> posteo.net>, 51280 <at> debbugs.gnu.org, Efraim Flashner
 <efraim <at> flashner.co.il>
Subject: Re: [PATCH v2 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Sat, 06 Nov 2021 13:34:09 +0100
Hi,

Am Samstag, den 06.11.2021, 10:40 +0000 schrieb Felix Gruber:
> * packages/games.scm (openttd-openmsx): Update to 0.4.2.
>   [native-inputs]: Replace python-2 with python.
> ---
>  gnu/packages/games.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index a6602fe4f6..8e92e04daa 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm
> @@ -4433,7 +4433,7 @@ the original Transport Tycoon Deluxe.")
>  (define openttd-openmsx
>    (package
>      (name "openttd-openmsx")
> -    (version "0.4.0")
> +    (version "0.4.2")
>      (source
>       (origin
>         (method url-fetch)
> @@ -4442,11 +4442,11 @@ the original Transport Tycoon Deluxe.")
>               version "/openmsx-" version "-source.tar.xz"))
>         (sha256
>          (base32
> -         "0prjljsdgdxqdhhcriqskqha004ybs575xcjq80zha3pqnmrdk0k"))))
> +         "0h583d8fxy78kc3jvpp78r76a48qhxrhm4q7jbnj74aw0kwrcl8g"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("grfcodec" ,grfcodec)
> -       ("python" ,python-2)
> +       ("python" ,python)
>         ("tar" ,tar)))
>      (arguments
>       `(#:make-flags
OpenTTD fails to find this version of opensmx (as opposed to failing to
play any sound for it, which is the current behaviour on master).  Do
you have a guess as to why this is the case?

Regards,
Liliana





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sat, 06 Nov 2021 12:36:01 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Felix Gruber <felgru <at> posteo.net>, 51280 <at> debbugs.gnu.org, Efraim Flashner
 <efraim <at> flashner.co.il>
Subject: Re: [PATCH v2 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Sat, 06 Nov 2021 13:34:59 +0100
Am Samstag, den 06.11.2021, 13:34 +0100 schrieb Liliana Marie Prikler:
> OpenTTD fails to find this version of opensmx
Should be openmsx, always typo on that one





Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sun, 07 Nov 2021 20:08:01 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 51280 <at> debbugs.gnu.org, 
 Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: [PATCH v2 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Sun,  7 Nov 2021 20:06:46 +0000
Hi Liliana,

On 11/6/21 1:34 PM, Liliana Marie Prikler wrote:
> OpenTTD fails to find this version of opensmx (as opposed to failing to
> play any sound for it, which is the current behaviour on master).  Do
> you have a guess as to why this is the case?

It looks like the script that generates the midi files in openmsx
silently failed after I've replaced the python2 native-input with
python, because the Python scripts in openmsx refer in their #! to
Python as python and not python3. When I instead use the native-input
python-wrapper, the midi files are correctly built and we are back to
the old behaviour with openttd showing the midi tracks but being unable
to play them.

I'll send an updated patch for openmsx.

Best,
Felix




Information forwarded to guix-patches <at> gnu.org:
bug#51280; Package guix-patches. (Sun, 07 Nov 2021 20:13:01 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 51280 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com>,
 Efraim Flashner <efraim <at> flashner.co.il>
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v3 4/5] gnu: openttd-openmsx: Update to 0.4.2.
Date: Sun,  7 Nov 2021 20:11:29 +0000
* packages/games.scm (openttd-openmsx): Update to 0.4.2.
  [native-inputs]: Replace python-2 with python-wrapper.
---
 gnu/packages/games.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4764021f73..0b4f8c6bfe 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4433,7 +4433,7 @@ the original Transport Tycoon Deluxe.")
 (define openttd-openmsx
   (package
     (name "openttd-openmsx")
-    (version "0.4.0")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
@@ -4442,11 +4442,13 @@ the original Transport Tycoon Deluxe.")
              version "/openmsx-" version "-source.tar.xz"))
        (sha256
         (base32
-         "0prjljsdgdxqdhhcriqskqha004ybs575xcjq80zha3pqnmrdk0k"))))
+         "0h583d8fxy78kc3jvpp78r76a48qhxrhm4q7jbnj74aw0kwrcl8g"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("grfcodec" ,grfcodec)
-       ("python" ,python-2)
+       ; Scripts are Python3 compatible, but call the interpreter as
+       ; python instead of python3.
+       ("python" ,python-wrapper)
        ("tar" ,tar)))
     (arguments
      `(#:make-flags
-- 
2.30.2





Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Mon, 08 Nov 2021 20:51:02 GMT) Full text and rfc822 format available.

Notification sent to Felix Gruber <felgru <at> posteo.net>:
bug acknowledged by developer. (Mon, 08 Nov 2021 20:51:02 GMT) Full text and rfc822 format available.

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Felix Gruber <felgru <at> posteo.net>, 51280-done <at> debbugs.gnu.org, Efraim
 Flashner <efraim <at> flashner.co.il>
Subject: Re: [PATCH v2 0/5] Update openttd to 12.0.
Date: Mon, 08 Nov 2021 21:50:22 +0100
Am Samstag, den 06.11.2021, 10:40 +0000 schrieb Felix Gruber:
>   gnu: openttd-engine: Update to 12.0.
>   gnu: openttd-opengfx: Update to 7.1.
>   gnu: openttd-opensfx: Update to 1.0.2.
>   gnu: openttd-openmsx: Update to 0.4.2.
>   gnu: openttd: Fix build failure.
> 
>  gnu/packages/games.scm | 25 +++++++++++++------------
>  1 file changed, 13 insertions(+), 12 deletions(-)
Forgot to send out the mail, but I pushed v2 (with the v3 on openmsx).

Thanks





bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 07 Dec 2021 12:24:08 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 194 days ago.

Previous Next


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