From unknown Sat Jun 21 03:28:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48613] [PATCH] gnu: openttd: update to 1.11.2 Resent-From: Solene Rapenne Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 May 2021 17:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48613 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48613@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162179084025133 (code B ref -1); Sun, 23 May 2021 17:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 May 2021 17:27:20 +0000 Received: from localhost ([127.0.0.1]:41722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lkrsm-0006XJ-06 for submit@debbugs.gnu.org; Sun, 23 May 2021 13:27:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:59402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lkrsh-0006X8-7I for submit@debbugs.gnu.org; Sun, 23 May 2021 13:27:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lkrsg-0003xc-PS for guix-patches@gnu.org; Sun, 23 May 2021 13:27:15 -0400 Received: from perso.pw ([163.172.223.238]:28550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lkrse-0000TJ-F1 for guix-patches@gnu.org; Sun, 23 May 2021 13:27:14 -0400 Received: from perso.pw (localhost [127.0.0.1]) by perso.pw (OpenSMTPD) with ESMTP id 3ab4e43b for ; Sun, 23 May 2021 19:27:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; s=1337; bh=/7feZrpSXR26LFpiPJ7/Ql5Dh oQ=; b=LnGlEaDq9muWX6+WycQcrhRsXVDdPb+OiJPdvpmiXTYUatADcVxvs/7ok BpmpDcg0yGY0txzaPl6DVxfBQVqqwfo6fSydjbcT8owjce20xv9lx+mxyC7ArEx/ s98sjpTW3KzmSsinf+bvTYPa+wa7eFuh8mDZX/KDs8qjQtOD8U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=1337; b=M103qxuOHg3zwUv6D4a CVZ1Sr/QhO3lyq/j1A+U+bZt+cFuIirR+gj8tAnCOkB3HSklYT1Eo/2pVbMCq4s3 WctkQbCqxwo2ozVg2MQ9TBZevsCjQJFwlp3+r25N/T+Z+QHxcNc/lBhijR0zuxW6 sXbxAcvq0gpQaTuo/UEBBZZc= X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on perso.pw X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.5 Received: from localhost (176-154-164-34.abo.bbox.fr [176.154.164.34]) by perso.pw (OpenSMTPD) with ESMTPSA id 35e8f109 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Sun, 23 May 2021 19:27:03 +0200 (CEST) Date: Sun, 23 May 2021 19:27:02 +0200 From: Solene Rapenne Message-ID: <20210523192702.0cfff8f8@perso.pw> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=163.172.223.238; envelope-from=solene@perso.pw; helo=perso.pw X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) - 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 From unknown Sat Jun 21 03:28:14 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48613] openttd: update to 1.11.2 - not mangled patch References: <20210523192702.0cfff8f8@perso.pw> In-Reply-To: <20210523192702.0cfff8f8@perso.pw> Resent-From: Solene Rapenne Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 08:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48613 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48613@debbugs.gnu.org Received: via spool by 48613-submit@debbugs.gnu.org id=B48613.16218452695915 (code B ref 48613); Mon, 24 May 2021 08:35:02 +0000 Received: (at 48613) by debbugs.gnu.org; 24 May 2021 08:34:29 +0000 Received: from localhost ([127.0.0.1]:42338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ll62e-0001XK-JB for submit@debbugs.gnu.org; Mon, 24 May 2021 04:34:28 -0400 Received: from perso.pw ([163.172.223.238]:6011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ll62b-0001X9-9E for 48613@debbugs.gnu.org; Mon, 24 May 2021 04:34:27 -0400 Received: from perso.pw (localhost [127.0.0.1]) by perso.pw (OpenSMTPD) with ESMTP id 8c417daf for <48613@debbugs.gnu.org>; Mon, 24 May 2021 10:34:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; s=1337; bh=1y+j1dLdrPKsbD4Ap6UfQ+O9N 2E=; b=gkU+qxQ5uInyNtByUH44ex1EWxNoFIx7LzL3g0kSS7tQ+YZqhxZ3fs0vj HPXOYZKjAGHBy/P/yQShzgt74cv2NMWxOLY/+6XGOufGZ2NwWmW83n/JEeyBQmIG RUwEhlT6GxEpyzKSSpTV35G8/oHm64oTlWAtYp9uyVKVya9LWA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=1337; b=Kc7nXsgmS16NRF+kF18 4QEneG8W9JPsmgUagLzEMr+f9BbJyOPODte1VIk/dDkzql0t5JUv2kI07IlKC79b qewMLR5RgVVjiAjJfurjkA7wSBxWj2hoxtbnxZGiX644Pq+dqPTbLt7aGz+qSh8T Ba40W69azd/plSCTR9QcDZbY= X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on perso.pw X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.5 Received: from localhost (87-88-175-40.abo.bbox.fr [87.88.175.40]) by perso.pw (OpenSMTPD) with ESMTPSA id fc7d5c55 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <48613@debbugs.gnu.org>; Mon, 24 May 2021 10:34:16 +0200 (CEST) Date: Mon, 24 May 2021 10:34:14 +0200 From: Solene Rapenne Message-ID: <20210524103414.33173bbe@perso.pw> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) the previous patch was mangled by my mail editor. I forgot to fix it for all the sent emails. - 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 From unknown Sat Jun 21 03:28:14 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Solene Rapenne Subject: bug#48613: closed (Re: [bug#48613] openttd: update to 1.11.2 - not mangled patch) Message-ID: References: <87h7ir5dmg.fsf@nicolasgoaziou.fr> <20210523192702.0cfff8f8@perso.pw> X-Gnu-PR-Message: they-closed 48613 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 48613@debbugs.gnu.org Date: Tue, 25 May 2021 10:10:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1621937402-19339-1" This is a multi-part message in MIME format... ------------=_1621937402-19339-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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@debbugs.gnu.org. --=20 48613: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D48613 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1621937402-19339-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 48613-done) by debbugs.gnu.org; 25 May 2021 10:09:24 +0000 Received: from localhost ([127.0.0.1]:44763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llU01-00050o-3n for submit@debbugs.gnu.org; Tue, 25 May 2021 06:09:24 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:34317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llTzy-00050Z-Pq for 48613-done@debbugs.gnu.org; Tue, 25 May 2021 06:09:19 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id DD960C000E; Tue, 25 May 2021 10:09:11 +0000 (UTC) From: Nicolas Goaziou To: Solene Rapenne Subject: Re: [bug#48613] openttd: update to 1.11.2 - not mangled patch References: <20210523192702.0cfff8f8@perso.pw> <20210524103414.33173bbe@perso.pw> Date: Tue, 25 May 2021 12:09:11 +0200 In-Reply-To: <20210524103414.33173bbe@perso.pw> (Solene Rapenne via Guix-patches via's message of "Mon, 24 May 2021 10:34:14 +0200") Message-ID: <87h7ir5dmg.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 48613-done Cc: 48613-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Solene Rapenne via Guix-patches via 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 ------------=_1621937402-19339-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 May 2021 17:27:20 +0000 Received: from localhost ([127.0.0.1]:41722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lkrsm-0006XJ-06 for submit@debbugs.gnu.org; Sun, 23 May 2021 13:27:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:59402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lkrsh-0006X8-7I for submit@debbugs.gnu.org; Sun, 23 May 2021 13:27:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lkrsg-0003xc-PS for guix-patches@gnu.org; Sun, 23 May 2021 13:27:15 -0400 Received: from perso.pw ([163.172.223.238]:28550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lkrse-0000TJ-F1 for guix-patches@gnu.org; Sun, 23 May 2021 13:27:14 -0400 Received: from perso.pw (localhost [127.0.0.1]) by perso.pw (OpenSMTPD) with ESMTP id 3ab4e43b for ; Sun, 23 May 2021 19:27:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; s=1337; bh=/7feZrpSXR26LFpiPJ7/Ql5Dh oQ=; b=LnGlEaDq9muWX6+WycQcrhRsXVDdPb+OiJPdvpmiXTYUatADcVxvs/7ok BpmpDcg0yGY0txzaPl6DVxfBQVqqwfo6fSydjbcT8owjce20xv9lx+mxyC7ArEx/ s98sjpTW3KzmSsinf+bvTYPa+wa7eFuh8mDZX/KDs8qjQtOD8U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=perso.pw; h=date:from:to :subject:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=1337; b=M103qxuOHg3zwUv6D4a CVZ1Sr/QhO3lyq/j1A+U+bZt+cFuIirR+gj8tAnCOkB3HSklYT1Eo/2pVbMCq4s3 WctkQbCqxwo2ozVg2MQ9TBZevsCjQJFwlp3+r25N/T+Z+QHxcNc/lBhijR0zuxW6 sXbxAcvq0gpQaTuo/UEBBZZc= X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on perso.pw X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.5 Received: from localhost (176-154-164-34.abo.bbox.fr [176.154.164.34]) by perso.pw (OpenSMTPD) with ESMTPSA id 35e8f109 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Sun, 23 May 2021 19:27:03 +0200 (CEST) Date: Sun, 23 May 2021 19:27:02 +0200 From: Solene Rapenne To: guix-patches@gnu.org Subject: [PATCH] gnu: openttd: update to 1.11.2 Message-ID: <20210523192702.0cfff8f8@perso.pw> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=163.172.223.238; envelope-from=solene@perso.pw; helo=perso.pw X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) - 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 ------------=_1621937402-19339-1--