From patchwork Mon May 24 08:34:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Solene Rapenne X-Patchwork-Id: 29528 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DF83D27BC81; Mon, 24 May 2021 09:35:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6ADA127BC78 for ; Mon, 24 May 2021 09:35:16 +0100 (BST) Received: from localhost ([::1]:50068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ll63P-0005qp-FK for patchwork@mira.cbaines.net; Mon, 24 May 2021 04:35:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ll63C-0005pA-TH for guix-patches@gnu.org; Mon, 24 May 2021 04:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ll63C-00072B-M0 for guix-patches@gnu.org; Mon, 24 May 2021 04:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ll63C-0001YA-IJ for guix-patches@gnu.org; Mon, 24 May 2021 04:35:02 -0400 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= 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 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Solene Rapenne X-ACL-Warn: , Solene Rapenne via Guix-patches X-Patchwork-Original-From: Solene Rapenne via Guix-patches via From: Solene Rapenne X-getmail-retrieved-from-mailbox: Patches 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)))