GNU bug report logs - #48613
[PATCH] gnu: openttd: update to 1.11.2

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Solene Rapenne <solene <at> perso.pw>
Subject: bug#48613: closed (Re: [bug#48613] openttd: update to 1.11.2 -
 not mangled patch)
Date: Tue, 25 May 2021 10:10:02 +0000

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

Your bug report

#48613: [PATCH] gnu: openttd: update to 1.11.2

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 48613 <at> debbugs.gnu.org.

-- 
48613: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=48613
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: Solene Rapenne <solene <at> perso.pw>
Cc: 48613-done <at> debbugs.gnu.org
Subject: Re: [bug#48613] openttd: update to 1.11.2 - not mangled patch
Date: Tue, 25 May 2021 12:09:11 +0200

Hello,

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

> - the build system switched from GNU configure to cmake
> - tests enabled by copying the assets files before check step

I tweaked the commit message, added a copyright line for you, and
applied your patch.

Thank you.

Regards,
-- 
Nicolas Goaziou

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

From: Solene Rapenne <solene <at> perso.pw>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: openttd: update to 1.11.2
Date: Sun, 23 May 2021 19:27:02 +0200

- the build system switched from GNU configure to cmake
- tests enabled by copying the assets files before check step
---
 gnu/packages/games.scm | 54 +++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 24e487a2b8..e83911a2cd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4317,35 +4317,15 @@ world}, @uref{http://evolonline.org, Evol
Online} and (define openttd-engine
   (package
     (name "openttd-engine")
-    (version "1.10.3")
+    (version "1.11.2")
     (source
      (origin (method url-fetch)
              (uri (string-append
"https://cdn.openttd.org/openttd-releases/" version "/openttd-" version
"-source.tar.xz")) (sha256
               (base32
-
"0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:tests? #f              ; no "check" target
-       #:phases
-       (modify-phases %standard-phases
-         ;; The build process fails if the configure script is passed
the
-         ;; option "--enable-fast-install".
-         (replace 'configure
-           (lambda* (#:key inputs outputs (configure-flags '())
-                     #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (lzo (assoc-ref inputs "lzo")))
-               (apply invoke "./configure"
-                      (string-append "--prefix=" out)
-                      ;; Provide the "lzo" path.
-                      (string-append "--with-liblzo2="
-                                     lzo "/lib/liblzo2.a")
-                      ;; Put the binary in 'bin' instead of 'games'.
-                      "--binary-dir=bin"
-                      configure-flags)))))))
-    (native-inputs `(("pkg-config" ,pkg-config)))
+
"0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
+    (build-system cmake-build-system)
     (inputs
      `(("allegro" ,allegro)
        ("fontconfig" ,fontconfig)
@@ -4511,20 +4491,20 @@ Transport Tycoon Deluxe.")
     (inherit openttd-engine)
     (name "openttd")
     (arguments
-     `(#:configure-flags
-       (list (string-append "--with-midi=" (assoc-ref %build-inputs
"timidity++")
-                            "/bin/timidity"))
-       ,@(substitute-keyword-arguments (package-arguments
openttd-engine)
-           ((#:phases phases)
-            `(modify-phases ,phases
-               (add-after 'install 'install-data
-                 (lambda* (#:key inputs outputs #:allow-other-keys)
-                   (for-each
-                    (lambda (input)
-                      (copy-recursively (assoc-ref inputs input)
-                                        (assoc-ref outputs "out")))
-                    (list "opengfx" "openmsx" "opensfx"))
-                   #t)))))))
+     `(
+       #:configure-flags
+       (let* ((out (assoc-ref %outputs "out")))
+         (list (string-append "-DCMAKE_INSTALL_BINDIR=" out "/bin")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'install-data
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (for-each
+              (lambda (input)
+                (copy-recursively (assoc-ref inputs input)
+                                  (assoc-ref outputs "out")))
+              (list "opengfx" "openmsx" "opensfx"))
+             #t)))))
     (inputs
      `(("timidity++" ,timidity++)
        ,@(package-inputs openttd-engine)))
-- 
2.31.1

Previous Next

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