From unknown Sat Jun 14 19:44:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#27421 <27421@debbugs.gnu.org> To: bug#27421 <27421@debbugs.gnu.org> Subject: Status: OpenTTD OpenGFX patches Reply-To: bug#27421 <27421@debbugs.gnu.org> Date: Sun, 15 Jun 2025 02:44:54 +0000 retitle 27421 OpenTTD OpenGFX patches reassign 27421 guix-patches submitter 27421 Kei Kebreau severity 27421 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 13:37:18 2017 Received: (at submit) by debbugs.gnu.org; 18 Jun 2017 17:37:18 +0000 Received: from localhost ([127.0.0.1]:55287 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMe8U-0001vV-9R for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:37:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMe8S-0001vI-Qr for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:37:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dMe8M-00023z-OR for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:37:11 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:51687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dMe8M-00023p-LF for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:37:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dMe8L-0002xR-Hw for guix-patches@gnu.org; Sun, 18 Jun 2017 13:37:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dMe8I-00020G-Gg for guix-patches@gnu.org; Sun, 18 Jun 2017 13:37:09 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:35169 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dMe8I-0001zO-85 for guix-patches@gnu.org; Sun, 18 Jun 2017 13:37:06 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id DFD6E547F20; Sun, 18 Jun 2017 19:37:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807424; bh=mhQmSjEr1AEznDojtvp0uFTxcIctzkY/3J2zq7m6OrY=; h=From:To:Subject:Date:From; b=ao4kDGSep1OTsZ4ZsW9FJr2HurEJYkJFZzcGxTaN+8PG0IvMFMKJxzyG//bwK0VFp z4QWj9L5QEO1HfGRdH6H3jf5qer40ch85zI4EufX6tDUV2SE45kOtuNj+5F8JTG3hi ZAAdXJcAhIWxmWJCtMKVkJ51tJ3xhtQqDSp9hfCI= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807424; bh=mhQmSjEr1AEznDojtvp0uFTxcIctzkY/3J2zq7m6OrY=; h=From:To:Subject:Date:From; b=ao4kDGSep1OTsZ4ZsW9FJr2HurEJYkJFZzcGxTaN+8PG0IvMFMKJxzyG//bwK0VFp z4QWj9L5QEO1HfGRdH6H3jf5qer40ch85zI4EufX6tDUV2SE45kOtuNj+5F8JTG3hi ZAAdXJcAhIWxmWJCtMKVkJ51tJ3xhtQqDSp9hfCI= To: guix-patches@gnu.org Subject: OpenTTD OpenGFX patches User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Sun, 18 Jun 2017 13:37:01 -0400 Message-ID: <87injt42pu.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -2.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 (--) --=-=-= Content-Type: text/plain This patch series allows a user to have a playable OpenTTD game "out of the box" by including the game's OpenGFX data. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJZRro9AAoJEOal7jwZRnoNfu8P/A4MuZ7ZNLroS1KFl73XnohX k5f51q3MVymwr6JvdM6YnzTn85199TMO9xV6FSpdJvFwnM5OcerA1bXvU5LvlCbh ig4qnCGcFvuxuxp8ErbuiTE6FWOCDEDhA1Qw3TqMjzw4Fq/jtmaKBiqVoq2pOQ+b i1Z9fbruenJRlsECM+M4LTSa9LTIUQ6wJlR9oilQvf8HUVflhqFR4pRV2hMw5zou xqbEni4g6hQgTP1g1dFlFR3rjNeas3x19QH0oWW5xTc/wSkY9Ywum+QfJwPKLsS9 85X3eezrG65PmAh/8wIj1NFZRRE3RhygkKU3KaNgDjVbo+HD3tsKXdB2uWezVkby dcC2JPIfo1uDl+bkxuMDqs7gpNRdyBKhkJf/sLWNp1MBwG6jHDwZ+vVcCN8zzVDn qeig2Pm9znKuEYrzY6rWumFp/WlI5E7bOifN13aieynn0+MhhgzC0aFmz7Fwz11r yUEcZDIC51qObooDltouEFlnb2f6jJyDGATX0xWuRB0adzJdQ0mCIxRQes+a9w75 sV/EYOB2bIR3D5CAM6Jz/GYYtSEr/j87T4uiz+Yy9UG3BKRxZs0zbrLPZqTXZNNx /IubsWO6smjDZdw6Q5PROx3OeZKNaHXqyL0NOhNqcfEQ3+8bmvj5TmnU+fPsK39/ kNXbL4DLChGXVqeq81KZ =qOIa -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 13:45:06 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 17:45:06 +0000 Received: from localhost ([127.0.0.1]:55292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeG2-00028W-3r for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:06 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:56296 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeG0-00028L-B5 for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:04 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 1862C565793; Sun, 18 Jun 2017 19:45:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807903; bh=lK4wd34La45GE1YqSCce3+v6azoC3YvtBCq9osJ5wTI=; h=From:To:Cc:Subject:Date:From; b=xwk9+8NBxZANHBkUAbWxRf1L7Lmc5/LU00uoP74fJU8fE8eoAmWYWpJvw/bxsh/tJ gMaBYayXSaY2cSjtNZaZSNx57QreuUDCHpq8jkYM+LjoOuOLTHWMAejIGEKYOuoc4w mGBuT8no5VhdFyB6G10liiJh3DPg13MKlKfEkCA4= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807900; bh=lK4wd34La45GE1YqSCce3+v6azoC3YvtBCq9osJ5wTI=; h=From:To:Cc:Subject:Date:From; b=vQkpggGImqlhedyDyhpYgnPVmEynJhe98qJHTim0pKyPjajqfQsgXWUBQ4J+/T08q UsynbZtxE4reH6+5lz+np+ZE0D58sILX3GqIIzerGzAdzfjax0sWIScbpUyCXiV0gI 8SxofdNWb9Ddf57SBok6CoHTOvFSFlURSsyoT6UI= To: 27421@debbugs.gnu.org Subject: [PATCH 1/5] gnu: Add nml. Date: Sun, 18 Jun 2017 13:44:43 -0400 Message-Id: <20170618174443.32690-1-kei@openmailbox.org> X-Mailer: git-send-email 2.13.0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) * gnu/packages/game-development.scm (nml): New variable. --- gnu/packages/game-development.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 18ce2ae4a..034713596 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -189,6 +189,30 @@ and network communications. A very thin client library can be embedded to provide connectivity for client applications written in any language.") (license license:gpl3+))) +(define-public nml + (package + (name "nml") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://bundles.openttdcoop.org/nml/releases/" + version "/nml-" version ".tar.gz")) + (sha256 + (base32 + "0wk9ls5qyjwkra54rkj1gg94xbwzi7b84a5fh1ma1q7pbimi8rmg")))) + (build-system python-build-system) + (inputs + `(("python-pillow" ,python-pillow) + ("python-ply" ,python-ply))) + (home-page "http://dev.openttdcoop.org/projects/nml") + (synopsis "NML compiler") + (description + "NML is a a python-based compiler, capable of compiling NML files (along +with their associated language, sound and graphic files) into grf and/or nfo +files.") + (license license:gpl2+))) + (define-public python-sge-pygame (package (name "python-sge-pygame") -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 13:45:51 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 17:45:51 +0000 Received: from localhost ([127.0.0.1]:55295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGl-00029g-D9 for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:51 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:53400 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGi-00029V-VK for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:49 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 2CD8A565C50; Sun, 18 Jun 2017 19:45:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807948; bh=ptDQnSfVVJG4BrMt+p2M1idWC+lkxbMhcr3kvLK+9+M=; h=From:To:Cc:Subject:Date:From; b=eVNwb1vQB8TAYZ3qt+Gzd35zekRbxSx2H89C55uZih3jJYMzO6kTAl9xUJiMpJUUN hu2l9WhDEFGkg+iy/AxikALneK2Hkytqg2XVFsDjHdPonlj2MR2nvKI3Zai4Wf4DMS QexTMujcAy/fMfOlm2xue9ONc2Jijlp/DzxsCGuM= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807947; bh=ptDQnSfVVJG4BrMt+p2M1idWC+lkxbMhcr3kvLK+9+M=; h=From:To:Cc:Subject:Date:From; b=q3NUOnJcEXvjgpp51mTTGy1aJU/Eir+dbRHEmhv55MNf6vqBAgCU+MNfYXZkaWAlV Vi2M/qw/1bTzAB2iYS3me+NlJlXwIQRkbQ5LLcGkjw2YRFkhKOXOX4AZCxKOih/WFf +dzfz1eeh929qiBj3sZEqFg8v/d69eHs+7lWoUNI= To: 27421@debbugs.gnu.org Subject: [PATCH 2/5] gnu: Add dos2unix. Date: Sun, 18 Jun 2017 13:45:16 -0400 Message-Id: <20170618174519.32747-1-kei@openmailbox.org> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) * gnu/packages/textutils.scm (dos2unix): New variable. --- gnu/packages/textutils.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7bc2fc47f..a94ae39c8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Hartmut Goebel +;;; Copyright © 2017 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) @@ -47,6 +49,34 @@ #:use-module (gnu packages slang) #:use-module (gnu packages zip)) +(define-public dos2unix + (package + (name "dos2unix") + (version "7.3.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://waterlan.home.xs4all.nl/" name "/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1i9hbxn0br7xa18z4bjpkdv7mrzmbfxhm44mzpd07yd2qnxsgkcc")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list "CC=gcc" + (string-append "prefix=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (native-inputs + `(("gettext" ,gettext-minimal) + ("perl" ,perl))) + (home-page "https://waterlan.home.xs4all.nl/dos2unix.html") + (synopsis "DOS/Mac to Unix and vice versa text file format converter") + (description + "dos2unix is a tool to convert line breaks in a text file from Unix format +to DOS format and vice versa.") + (license license:bsd-2))) + (define-public recode (package (name "recode") -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 13:45:54 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 17:45:54 +0000 Received: from localhost ([127.0.0.1]:55298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGo-00029w-LW for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:54 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:45270 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGm-00029o-Vz for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:53 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 3BDFF565A7E; Sun, 18 Jun 2017 19:45:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807952; bh=UYj6V18s4w9Cgu8HnP6g52jLJ31ZBy97VDSE5cxONpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RiQT0W/7jLP8q1bpEChLknsHYBV4siHUu00jc7A1eLmouOSBX73QA1Dr5GLEwLaPZ FdbwQCjjKmKT+4BS8XsXa8BcjGqMLqXwVtNRKBo4vDTj7RPn2MtAXAHiIolXPmvZma pbPlcn2b+qA63rAPzHq3vI2lit15vAa4shrxR21k= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807951; bh=UYj6V18s4w9Cgu8HnP6g52jLJ31ZBy97VDSE5cxONpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=irMsjhpTMgpP8CbsmFdgHNQw6nzqRy8APO4BYYO3L9/OAdm8CfjoFls6Qhq3P6tcZ UlaPij29UIVHXWPT32ucEw7LcLVEapEo7vitUYR+K3hI7r3N6tztv6as6kZbRYNNCD xTSkDFs71x50+o/cQPNvkmOzUAshJBVCCEjp752s= To: 27421@debbugs.gnu.org Subject: [PATCH 3/5] gnu: Add grfcodec. Date: Sun, 18 Jun 2017 13:45:17 -0400 Message-Id: <20170618174519.32747-2-kei@openmailbox.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170618174519.32747-1-kei@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) * gnu/packages/game-development.scm (grfcodec): New variable. --- gnu/packages/game-development.scm | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 034713596..404061eff 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -35,6 +35,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages boost) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) @@ -147,6 +148,64 @@ conversions (for example, from PPM to Doom picture format). In addition, DeuTex has functions such as merging wads, etc.") (license license:gpl2+))) +(define-public grfcodec + (package + (name "grfcodec") + (version "6.0.6") + (source (origin + (method url-fetch) + (uri (string-append "http://binaries.openttd.org/extra/" + name "/" version "/" name "-" version + "-source.tar.xz")) + (sha256 + (base32 + "08admgnpqcsifpicbm56apgv360fxapqpbbsp10qyk8i22w1ivsk")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install ; no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc")) + (man (string-append out "/share/man/man1"))) + (for-each (lambda (file) + (install-file file bin)) + '("grfcodec" "grfid" "grfstrip" "nforenum")) + (install-file "COPYING" doc) + (with-directory-excursion "docs" + (for-each (lambda (file) + (install-file (string-append file ".txt") doc)) + '("auto_correct" "commands" "grf" "grfcodec" "grftut" + "readme" "readme.rpn")) + (for-each (lambda (file) + (install-file file man)) + (find-files "." "\\.1")))) + #t))))) + (inputs + `(("boost" ,boost) + ("libpng" ,libpng) + ("zlib" ,zlib))) + (synopsis "GRF (Graphics Resource File) development tools") + (description + "The GRF development tools are a set of tools for developing (New)GRFs. It +includes a number of smaller programs, each with a specific task: +@enumerate +@item @code{grfcodec} decodes and encodes GRF files for OpenTTD. +@item @code{grfid} extracts the so-called \"GRF ID\" from a GRF. +@item @code{grfstrip} strips all sprites from a GRF. +@item @code{nforenum} checks NFO code for errors, making corrections when +necessary. +@end enumerate") + (home-page "http://dev.openttdcoop.org/projects/grfcodec") + ;; GRFCodec, GRFID, and GRFStrip are exclusively under the GPL2. + ;; NFORenum is under the GPL2+. + ;; The MD5 implementation contained in GRFID is under the zlib license. + (license (list license:gpl2 license:gpl2+ license:zlib)))) + (define-public gzochi (package (name "gzochi") -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 13:45:58 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 17:45:58 +0000 Received: from localhost ([127.0.0.1]:55301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGr-0002AD-UJ for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:58 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:44123 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGq-0002A6-TT for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 13:45:57 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 29BC1565C73; Sun, 18 Jun 2017 19:45:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807956; bh=Cc+IQN1RzRThNgDPd+usQDjrScnJk6CyE7KEHIodf/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ddECkhUrhmDqXHd+JkWSXvVWt0U3Yi2IZLbPH7tOmqybdPF8Z8C47WPcboeh27wt8 bmmHCANU/p5FGVkw9ZK0q979AKyV4QyzhD6NeDRwpTejnClL50ge0PNFzb3+SdvoaC 7YVA6y+a8kFS5QVmyt16gnhRze/nCTwvD+72Nw/A= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807955; bh=Cc+IQN1RzRThNgDPd+usQDjrScnJk6CyE7KEHIodf/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zX9WYeXjBUlKAUAfPOKC4EzXodlZOn+k6IVn5wh/A19GpDkx4ikCPW4CWeBR1YY1D 5BgDONJMxeeQYxIN+UuS/Q8MXCesDIMH6ka8s3STJqHeESPhlJwbBNWyQoCuKzunMl nWhcltS7BBwcll3Bw8mGGqw4vjtsRxkzU7+/oRl4= To: 27421@debbugs.gnu.org Subject: [PATCH 4/5] gnu: Add openttd-opengfx. Date: Sun, 18 Jun 2017 13:45:18 -0400 Message-Id: <20170618174519.32747-3-kei@openmailbox.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170618174519.32747-1-kei@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) * gnu/packages/games.scm (openttd-opengfx): New variable. --- gnu/packages/games.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2c5294737..4214a2f75 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages gimp) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -2299,6 +2300,55 @@ engine. When you start it you will be prompted to download a graphics set.") ;; 'openttd' a wrapper around them. The engine is playable by itself, ;; but it asks a user to download graphics if it's not found. +(define openttd-opengfx + (package + (name "openttd-opengfx") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (string-append "http://binaries.openttd.org/extra/opengfx/" + version "/opengfx-" version "-source.tar.xz")) + (sha256 + (base32 + "0iz66q7p1mf00njfjbc4vibh3jaybki7armkl18iz7p6x4chp9zv")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags (list "CC=gcc" + (string-append "INSTALL_DIR=" + (assoc-ref %outputs "out") + "/share/openttd/baseset")) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + ;; Make sure HOME is writable for GIMP. + (setenv "HOME" (getcwd)) + + ;; Redirect stdout to /dev/null instead of stderr. This prevents + ;; dos2unix from receiving its version information as a flag. + (substitute* "Makefile" + (("\\$\\(UNIX2DOS\\) -q --version 2>/dev/null") + "$(UNIX2DOS) -q --version 1>/dev/null"))))) + ;; The check phase for this package only checks the md5sums of the built + ;; GRF files against the md5sums of the release versions. Because we use + ;; different software versions than upstream does, some of the md5sums + ;; are different. However, the package is still reproducible, it's safe + ;; to disable this test. + #:tests? #f)) + (native-inputs `(("dos2unix" ,dos2unix) + ("gimp" ,gimp) + ("grfcodec" ,grfcodec) + ("nml" ,nml) + ("python" ,python-2))) + (home-page "http://dev.openttdcoop.org/projects/opengfx") + (synopsis "Base graphics set for OpenTTD") + (description + "The OpenGFX project is a free replacement of the base graphics so that +OpenTTD can be shipped finally fully functional without the need for additional +downloads.") + (license license:gpl2))) + (define-public openttd (package (inherit openttd-engine) -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 13:46:02 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 17:46:02 +0000 Received: from localhost ([127.0.0.1]:55304 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGw-0002Ae-6g for submit@debbugs.gnu.org; Sun, 18 Jun 2017 13:46:02 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:37640 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeGu-0002AN-SM for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 13:46:01 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 1F4B3565863; Sun, 18 Jun 2017 19:45:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807960; bh=LCUnwjUdtAnDpoof9Ltj5q0r9F4mpKGqPPZFhsAsOE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dqk8x/v53H3ckWHVuPb5AFXfJms0CHtIRz9Pzj8V4Gc4ScnjsNZU1hNIJIxfzR4rH jUDaYKDu7RVpWKRbnOwPyRrhvYiLo3+SBdoOJeB3MQPjeXTgkaHTA3YAu44RXgl+sY 45uFcrvnAA0DsVgD1cEd9ezcGntHNTsJ9w7Lj0JQ= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497807959; bh=LCUnwjUdtAnDpoof9Ltj5q0r9F4mpKGqPPZFhsAsOE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HkIP3bCkJ+If6YDPBxB0bUCJrfoosa/mvS9gMcMI/YyVii+bn/5OzrzJpWz7ZBSsD 19bKThEqBceSkFF2rXhNLAjLSaiVRfXqseRa6gxgiv+4zcjJk9kv/qzXQ0JCee9NWn K46Ozum2EVsD/Wyi25dMgX0UvwXY6MUGkptZFUV8= To: 27421@debbugs.gnu.org Subject: [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase. Date: Sun, 18 Jun 2017 13:45:19 -0400 Message-Id: <20170618174519.32747-4-kei@openmailbox.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170618174519.32747-1-kei@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) * gnu/packages/games.scm (openttd-engine): Rename package to openttd. [arguments]: Add it. [native-inputs]: Add openttd-opengfx. --- gnu/packages/games.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4214a2f75..112e1c3db 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2236,9 +2236,9 @@ and a game metadata scraper.") (home-page "http://www.emulationstation.org") (license license:expat)))) -(define openttd-engine +(define-public openttd (package - (name "openttd-engine") + (name "openttd") (version "1.7.1") (source (origin (method url-fetch) @@ -2269,8 +2269,20 @@ and a game metadata scraper.") (string-append "--with-liblzo2=" lzo "/lib/liblzo2.a") ;; Put the binary in 'bin' instead of 'games'. - "--binary-dir=bin")))))))) - (native-inputs `(("pkg-config" ,pkg-config))) + "--binary-dir=bin"))))) + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* + ((opengfx (assoc-ref inputs "opengfx")) + (out (assoc-ref outputs "out")) + (gfx-dir + (string-append out "/share/games/openttd/baseset/opengfx"))) + (mkdir-p gfx-dir) + (copy-recursively opengfx gfx-dir)) + #t))))) + (native-inputs + `(("opengfx" ,openttd-opengfx) + ("pkg-config" ,pkg-config))) (inputs `(("allegro" ,allegro-4) ("fontconfig" ,fontconfig) @@ -2316,8 +2328,7 @@ engine. When you start it you will be prompted to download a graphics set.") (arguments '(#:make-flags (list "CC=gcc" (string-append "INSTALL_DIR=" - (assoc-ref %outputs "out") - "/share/openttd/baseset")) + (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (replace 'configure @@ -2349,11 +2360,6 @@ OpenTTD can be shipped finally fully functional without the need for additional downloads.") (license license:gpl2))) -(define-public openttd - (package - (inherit openttd-engine) - (name "openttd"))) - (define-public pinball (package (name "pinball") -- 2.13.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 14:01:38 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 18:01:38 +0000 Received: from localhost ([127.0.0.1]:55327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeW1-0002ce-Un for submit@debbugs.gnu.org; Sun, 18 Jun 2017 14:01:38 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeVz-0002cV-Ov for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 14:01:36 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 420402084F; Sun, 18 Jun 2017 14:01:35 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 18 Jun 2017 14:01:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=ooJQPBMJRaA+K7WeDxbjsDeJziGZZGrybyCDbU30+ tQ=; b=XEg8vD5Fh4nPYxwNt1BapgbX91iaT+Sgffe24UsDLfquM0QHBsUvATAlp fEoMxnlnNrybIPIQ3hqkMs9T0/oeCmRXK8H2ubKgCwNBb9kYkRQ6smVmtNZTPaBX /xF0naJZguDyX9V4Ah2Q1y1CRVhOTXKNQOvE+d0GEWrOhXRvMZszs/jtBeMbJTNQ 1zjOy1qm3obZQhzXpb6lgSSQu42SKTygAqT2HXb71x8kJjD+pJAUO5jf12kBj7pe cB7kRwi25sJAaQF0sxIpoARLM+NkWUFvyqOkd9yuUGRoD4C9nDoPszRQocxNGvrQ EpZG2LXuocfgql6qikTYVpkmtvEZQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=ooJQPBMJRaA+K7WeDx bjsDeJziGZZGrybyCDbU30+tQ=; b=XKDG4HlGetGg0zT95kLdKXFNfCikXJWLI9 j7vMtZhHcHy4WHK/toOv3c1HSREQXF9id0LicvphnPN+qpNGs1ccXVYCz9L2PhCG lPXDoIPDLQQToF4jlnl2H5xZLeg/HdG2jBrmQY34UIlnxG7ZBJWULpQLV8I/mS4I ITM4LV2Rh8Nw1sFC89gtmaIGpFNf11AtMZdYLMPb4kubOAQOCuzGT5zhciKaJp+S OJQdKw4SChv6krewBByEc2uoDCC7vav6QNYbR6V2QTzTd76p6YY5LeQWd9o3BlPu m4usEp5ueR5CRcdGYr4jyW5eD5zqYMpDIQlW6JUff1DICQdhajRg== X-ME-Sender: X-Sasl-enc: gYt8qOihgcPXBicaqxYN4cKb84+rOnlzyZXvCvS3X3bI 1497808894 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id C68F87E794; Sun, 18 Jun 2017 14:01:34 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27421@debbugs.gnu.org Subject: Re: [bug#27421] [PATCH 1/5] gnu: Add nml. In-Reply-To: <20170618174443.32690-1-kei@openmailbox.org> References: <87injt42pu.fsf@openmailbox.org> <20170618174443.32690-1-kei@openmailbox.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 18 Jun 2017 20:01:33 +0200 Message-ID: <87o9tlfa4i.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/game-development.scm (nml): New variable. [...] > + (build-system python-build-system) > + (inputs > + `(("python-pillow" ,python-pillow) > + ("python-ply" ,python-ply))) Should these not be propagated? > + (home-page "http://dev.openttdcoop.org/projects/nml") > + (synopsis "NML compiler") > + (description > + "NML is a a python-based compiler, capable of compiling NML files (along > +with their associated language, sound and graphic files) into grf and/or nfo > +files.") Could you mention what NML is here with a @dfn{}? Maybe also add @file{.grf} and @file{.nfo} if they are file extensions. LGTM otherwise! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllGv/0ACgkQoqBt8qM6 VPpGBQgAildtq5cf20KZ+sIng32OvpgcDJWTDM1sboBLRbU86uQypdNHvkO6VuIT JhTt4ufhmWFLsjlLWKw6P2kyayAviTg8xhIMs36CvAIt7rHKvFYy5pPxa8XCDZ68 FJ6zcZfQs1r62gNUTtGbr8U4PPTy+QXHei19UCDRk1SlDcvu5uhHxPc2tf/dMwVu nLdmX1V1zvdy5Qc13XmCAOImP+32EuNqT7K7UBBrBPfTpR/m/eHX+n/2EIXz3hdM bCHJcUuhEW6j5HgbPLM99Pmvh7eRXF152+88J7w893C0TxPLl2OdtjNZFal8+/SZ /zkiiNUk9rEtWnAVingQB2rpDgfPJQ== =0k4l -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 14:02:59 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 18:02:59 +0000 Received: from localhost ([127.0.0.1]:55333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeXL-0002es-A2 for submit@debbugs.gnu.org; Sun, 18 Jun 2017 14:02:59 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:60537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeXK-0002em-NJ for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 14:02:58 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8EB96208EA; Sun, 18 Jun 2017 14:02:58 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 18 Jun 2017 14:02:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=c6t9QZepoDzsbE8M5k+gA/fDKFMGvdZmDINJNsKks HY=; b=CeRMzoLtsf0iV+TpDujPTnHsvxRhyK7o7tzxw9ERrO6zLzW3NfHI7Bqtp 3+7l0cEIdTHYiVldDR/3OSJmSRBQRh+pB6ePAsoCtH7KiLrRv8dGaOrFyopnfM9U 5VjJN8X7EU//LkEpnPJJb1SdW4y9T+xHddkWYeYp/2rjICzNSarR+pInmP0ATwfD rXPAYADaED02blgVkMRcJZ00cfy+u/EHmSXoiTpF8OZCLKjQFVXdKc/eT+kjh89c 8aSXTkshvsrP9P7Eg59jS7Xd3GFsTcg9QAkD8fA/Fv7YCxtPk45efXfB0hmOsD1t WGTl8T97ilxchboWaf7uwf6jO6o7A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=c6t9QZepoDzsbE8M5k +gA/fDKFMGvdZmDINJNsKksHY=; b=mCaIO9Njoj3NsG4XsI18zV0KDWVrtCGinA +EYcs8hd10WIcTZVtGSiEtVd2YkuVrggHIHiHCcZ/SVKDbq12aMMLUtQQ2nrxQTT veUiz52Fr+thTqODx4TWNUfZk2FYO5UyRbdfur7LPU0uMQ0XJW8qeKK5Ry8uxQOK aKUpMLDRg3tRzk7Dx6yo1C2X7VFFEMZGp3J/qr+tcsZr3JxoKnn5vyxGpp9Yf/ae QIKwtXpbLSabV+gD3cu4tse1vggoC8y3LowwNySQDqs6nRmwh6GSwRWMD377bN4R z9gm1vnbiNbofZ+b2Pk4Dq6zzbdQDaTYpl9Rh3vFPdlSLf+lQ2Mw== X-ME-Sender: X-Sasl-enc: fswTO94f71vhXwwqD0tRrn+IxzAZXcjKEaA9ZWO9JWBh 1497808978 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 2647C7E545; Sun, 18 Jun 2017 14:02:58 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27421@debbugs.gnu.org Subject: Re: [bug#27421] [PATCH 2/5] gnu: Add dos2unix. In-Reply-To: <20170618174519.32747-1-kei@openmailbox.org> References: <87injt42pu.fsf@openmailbox.org> <20170618174519.32747-1-kei@openmailbox.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 18 Jun 2017 20:02:56 +0200 Message-ID: <87lgopfa27.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/textutils.scm (dos2unix): New variable. LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllGwFAACgkQoqBt8qM6 VPpqQAgApqMK/Nu2r/pNvORH/aziqolcIBEhvwJrnSLBSJtdAUSODY42VLyiBtkN M69hTZCx7Oi+kQOH3LAY1uY2+iqGSATBlxLSfIyDQjZTMO6jJAIR2rCaAbtZgGvs 7FNtScofmY/Dls7v0AqRZreBZuigwKWjhzAd7YNkfqiQGLuYamNwlxszvuexLlkk kVeAptAEja8k1FlwOblilhEa4BhmYcM0ZobbUa0KFxd1YyLPm8TK2gGx7cQ+ulgH LhjpdDbHnQUfCe/gsraUK1PHN2Hk51WnA4FOGUjUO0IWVY35w9LEGJoXKipfFx0p QbGBaSLukz2YmaK6/2kkscvn9ZDvwg== =cKa0 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 14:04:56 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 18:04:56 +0000 Received: from localhost ([127.0.0.1]:55339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeZE-0002iG-MC for submit@debbugs.gnu.org; Sun, 18 Jun 2017 14:04:56 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:37731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMeZD-0002i8-4t for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 14:04:55 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0E9BA20B73; Sun, 18 Jun 2017 14:04:55 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 18 Jun 2017 14:04:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=abduBh3bOj69215Aa3/z+lPSdJAy+0tYdNY5bqKS8 Ls=; b=NurYTUJScR3iKKllKsLL4ghpjtVvso7jOkkW0SKDG0VxsZ2q5p4WOLzWM ahYJaPetMiERdH1W4aSf0ELBz438yfzFAzXUsNMVF6HOAskMAVq3JF4PdQrrG5Cl LxItks63cP+aE7baMtpLzUYxpx73M0sPeH0OjX8uLoPQVbg4FBFTx3wxy5jCFxXs Lnbjdk3w8SnHxj5CQsrvI7jv6K32HaZaodd1ao3u95kNIozF1BhC3lbxvM7x9VnX M9VMlnWYqlnaTV5XAP6K0SM8yZEgaPpu3oAeicMqywEnP2+nGD15OjEwSLbZWqkk xDF+gzY8Vi72eoPeqt+bT4aH5BXZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=abduBh3bOj69215Aa3 /z+lPSdJAy+0tYdNY5bqKS8Ls=; b=qgSIqmFhlHTBLMWV+pmg7kIHCLzIPOrHul hk4PsUvkZT/D8dwKVmtg2D5MlEsmG8Ys8FSAxvAQqxzQyTSRZvGwVo68WGJU4BEm tHKOJs3Dd7m36EDfaPRJN8irsZmz6JQXLlG4OptVPHed3LwMBpRLBZ4TccNszNfT DTns4nLFWjmfHSZ13C7RtpzETr1U/JRtjcMn7Ipl5d1qvVXBdOTKvvOpRRY8Ux4S ptRnY7f/fW+7AWVCJLnAtiO7h4QxDNO0emXT4gtCBLcRwgt6SeGANTivKixRvD3S dngT1ADd+/ywFCkCvdDLxGyRIAkEwN5YKGX5ZXgM1XTsPvVxg2EA== X-ME-Sender: X-Sasl-enc: lpLk0dd9Y8qlRuWIq+j3JtihzDSHGzR39QPbefeO35SH 1497809094 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id A2DE27E7B1; Sun, 18 Jun 2017 14:04:54 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27421@debbugs.gnu.org Subject: Re: [bug#27421] [PATCH 3/5] gnu: Add grfcodec. In-Reply-To: <20170618174519.32747-2-kei@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-2-kei@openmailbox.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 18 Jun 2017 20:04:53 +0200 Message-ID: <87injtf9yy.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/game-development.scm (grfcodec): New variable. LGTM! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllGwMUACgkQoqBt8qM6 VPqgFgf/Wzbxhjn6SCxPQ92XLmvlVEqEJQ5+goIiPVW+UBpYKMJ5dqGv7j7TE80R Gqc7p91njIhNLnbjTAYYy3bHxrUKKNQMbBzuEYbNaYhALhqEndXheRNkznciyfSD /0b/XZczp8qjirJMzELyOM7wTiJtyFojDTDIaz6BubeeegG4K/BQIGBn+Plm7uFj rekGW9QFuFpk8DbbGn56Nut2/AAY375tP3u3dZEjbBC1gxhrTyMvASo0tjwbpUlA ICTRc82Nv/bEoOEfWy9Dor4nW5JatmfP8wWTKse7pasu3/pR884bD7IWThfyBrzx 4lKjQa3YdKebx+bDkAWEpnqftpVJcA== =WYzE -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 14:24:30 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 18:24:30 +0000 Received: from localhost ([127.0.0.1]:55355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMes9-0003Fv-PE for submit@debbugs.gnu.org; Sun, 18 Jun 2017 14:24:29 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:42553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMes7-0003Fn-GE for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 14:24:27 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6721A209B7; Sun, 18 Jun 2017 14:24:27 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 18 Jun 2017 14:24:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=qg8loRut4hQGX6njX0WslMYFWwUYYkUs4PYMWbacW YY=; b=E2maN8fzfi0vZXIe7XNPpV48WLMfMCszYnZAB4HKr5Rka9ErSwQ3YO6zc zMjJ25t3YfTJn/8T69fzNXgGnTT1m06MDSNxfxiM+VPEwpheZtkzNRjnJjqgGZhj cmm+XhF9gytRT3Fs9I+c8AgiuXiD7RPbCZgIiuv/9DYjNLRDMVyBePBXsYJ2UR8y Lk3UDk0T53zpeufIIBCzdOYA8ITwg5KLIakjtxzOaaIUCedyMl+OL/nk3pb1uJ1R hRkXG+YJAHGoPQeLFKcTFXbthsg3z91aottBqb6IMG1tmZEMkHayySDHiGRiBqTC mS04TzT6mPj60BQK/PS+URoPAhXRQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=qg8loRut4hQGX6njX0 WslMYFWwUYYkUs4PYMWbacWYY=; b=EeMW5XSlgkz8lHwLJeEkt+SYyGVgELSUZR PhY/POYXFrS0uyCsXSg/fyaiZqGGHdwVk2wHGGiGCeyf5Gv9lq3R/2Dqd40qtBNF TfCPirR6Rjn11gWM0Yy5Z+gdzIaC+83a/zrdjJnogG98Pal5B4xdxulqobvL5QGU gYoyqrxahgZENXkP1n5rZubV9ODQg0103ZBhKC4SgVbt9zD2QJxwXTSTR8HKaDjA 14DiWdNcPw5Cuy0K4zuZsZH5YSh72ctITTAAGyv1UVnWH+3Ch4iM56iavBo/Qncf od+W/vg9SZncHcVNs3SoASHVFNlMQE9hRzCMBlpmk3cUqSzLtN/g== X-ME-Sender: X-Sasl-enc: J/egLnuC2N5HL4f5dZLY2dwoLHM+HAkUUTkEvGLrInrX 1497810266 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id E914B248B0; Sun, 18 Jun 2017 14:24:26 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27421@debbugs.gnu.org Subject: Re: [bug#27421] [PATCH 4/5] gnu: Add openttd-opengfx. In-Reply-To: <20170618174519.32747-3-kei@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-3-kei@openmailbox.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 18 Jun 2017 20:24:25 +0200 Message-ID: <87fuexf92e.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/games.scm (openttd-opengfx): New variable. [...] > + ;; Redirect stdout to /dev/null instead of stderr. This prevents > + ;; dos2unix from receiving its version information as a flag. > + (substitute* "Makefile" > + (("\\$\\(UNIX2DOS\\) -q --version 2>/dev/null") > + "$(UNIX2DOS) -q --version 1>/dev/null"))))) I'm a bit confused as to why this is necessary. I guess it's a behavior change in recent versions, that --version prints on stdout? LGTM anyway. > + ;; The check phase for this package only checks the md5sums of the built > + ;; GRF files against the md5sums of the release versions. Because we use > + ;; different software versions than upstream does, some of the md5sums > + ;; are different. However, the package is still reproducible, it's safe > + ;; to disable this test. > + #:tests? #f)) > + (native-inputs `(("dos2unix" ,dos2unix) > + ("gimp" ,gimp) > + ("grfcodec" ,grfcodec) > + ("nml" ,nml) > + ("python" ,python-2))) > + (home-page "http://dev.openttdcoop.org/projects/opengfx") > + (synopsis "Base graphics set for OpenTTD") > + (description > + "The OpenGFX project is a free replacement of the base graphics so that > +OpenTTD can be shipped finally fully functional without the need for additional > +downloads.") Yay! I'm thinking we should mention this is one of many available grahics sets for OpenTTD. Maybe something like.. "The OpenGFX projects is an implementation of the OpenTTD base grahics set that aims to ensure the best possible out-of-the-box experience. OpenGFX provides you with... @enumerate @item All graphics you need to enjoy OpenTTD. @item Uniquely drawn rail vehicles for every climate. @item Completely snow-aware rivers. @item Different river and sea water. @item Snow-aware buoys. @end enumerate" (Adapted from readme.ptxt) > + (license license:gpl2))) Indeed version 2 only. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllGxVkACgkQoqBt8qM6 VPoGTgf/QfJrtd/rmH54usVjoThLzU7ehf/coO1qkXOsnfK9yxhSNivtPrx83nTB w1iBvkVt7liW30Vlxd94f89UTPyY8zHtv+i7sW2uuohYHtbK4pYirC9NL0wAdb3C tz6Hk8+Al+4wS8a8JVR8eBPrOWz1J0LKq5q8cVJsrwoKIhRSFVaSA9ZiQgMk13bf r20MXXePYxNSghp5kh3anELQqfptjAFivigXp8j1uhLTgSUDTofcXsQXqL5LUVg6 W+lbr6wK521mg2RoQxdWAQbdLNrjFHyYHsNsqnBAeQYfcHgmWtWJbPnteZ+wcBWl 0GcKUDMPUVn6oX0HM6BPKzgblud6ew== =ucSE -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 14:33:37 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 18:33:38 +0000 Received: from localhost ([127.0.0.1]:55363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMf0z-0003Vs-MW for submit@debbugs.gnu.org; Sun, 18 Jun 2017 14:33:37 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:43799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMf0x-0003Vj-Lr for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 14:33:35 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 82660209FC; Sun, 18 Jun 2017 14:33:35 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sun, 18 Jun 2017 14:33:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=8dgchaVGhzLGJLfP+7foiEDoMdx3dWLPn0697ucxQ w8=; b=i2e7GMzBSmhHuWnbI54+/INsUsPNbvj9+KYHsGOgnNjY+b/m/6DSJ+vSY K9GVBjYGUi/JnkwgWcbhNo2qDqBErWoTeu2hClJTXTCxk9AE+tzcHXGPdL95zzy7 S5GriUhgX9JSNz+pQTmWWtPATfqEbVNPcidSD5g16RDIlYVUwYFF1V1tfoOFCYq3 o2WrSi49+H5ZcHjJhjueXGz1Rik6o5r35FYTil6qD64DRpPLEjY7v559itdo2Tpm qdQJt7iTob4iOtCEpVfl5GLKFODp88ssHjsUYrCGC0hwXAWSPbux8AzrGhRswWzv Nh3lzBPvx0kZz9gBPYfkz0e/Aoh6Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=8dgchaVGhzLGJLfP+7 foiEDoMdx3dWLPn0697ucxQw8=; b=Grwtso5vB/bk4hN9S5RKK9rUT+9xuydbX5 LfjYZU4KxwEAZyt3t3MIt/mEeiHe18yZ7RgyADRbTq420APhopItuZpww/5sHo57 X97J9w7rsbP2rXHiQnuhfcJ85YB9+oTZSkLUwbsJXOHP59wLPba8dSnM24mEKvQ3 7RGqt92YD4KiFv30hnAUipjSvkUWbFMq1OejiS8Gs0UU+MOXwBGNI7fqxczUzfAr C/E7P+RXPqC6TjyJBJLGn3T9h0PETSBgCSRgyknx3qK1tZYCewDhEcEe95VXCECJ LTcHFpXbeN9mpj3gwb2NKQIRTlD0pLkBrxq6Ff5ezBu6y7XRItNg== X-ME-Sender: X-Sasl-enc: 7AtbKOKlh7RnwdJZrAp9TeRF9zBv+uD2vh73ku4IvimO 1497810815 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 0E63A2479C; Sun, 18 Jun 2017 14:33:34 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , 27421@debbugs.gnu.org Subject: Re: [bug#27421] [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase. In-Reply-To: <20170618174519.32747-4-kei@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-4-kei@openmailbox.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sun, 18 Jun 2017 20:33:33 +0200 Message-ID: <87d1a1f8n6.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: Kei Kebreau 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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/games.scm (openttd-engine): Rename package to openttd. > [arguments]: Add it. > [native-inputs]: Add openttd-opengfx. This should also mention that the (openttd) variable is now gone. However, I would prefer keeping "openttd-engine" and only add these changes to the inherited "openttd" package. What do you think? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllGx30ACgkQoqBt8qM6 VPr+Xgf+LsuLgPuFugmju6/EoWIw59hHMWbWTCzPzFhzkmXjMqJUHVX6HBHkQf4/ qj42LQPef+Z2lwdfghHJiA72Gqotg29aVpCRV+ltrRrJ/WbV1mfvCoRjJcrGo3uH EIlWzp1V1yb9cxkEQBYYKktvarS3UhbwLX6fDjyyA8rIzsHpbo0sljQSGoI6PRbo 3PRztoK1IA3BD8HxEOFM4aGxde2RCGISQ15qHaaI+4limiga+SJG3M5p+Ye18j10 LzqFJpqih1gkMK+QuxsWhtzB3j2o6j2RYCg5k0tKKG2ZdK03knyZuXz07MwrX+Xe RKfU4qA4JOhcxbnXkqYCpNSmJG9+sw== =swtS -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 14:51:16 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 18:51:16 +0000 Received: from localhost ([127.0.0.1]:55394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMfI4-0005mV-FU for submit@debbugs.gnu.org; Sun, 18 Jun 2017 14:51:16 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:46560 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMfI2-0005mG-Mg for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 14:51:15 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 68015502C06; Sun, 18 Jun 2017 20:51:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497811873; bh=CY3mdszgzhj4aWh9lKR+otwxYg/aJyXCV4Q77AyJJNQ=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=HBlwF3ILXTB0pR0Degr8T9wVSN92NajiN9CU+k/JM1145DGtLphEZG4JKuWQw41Ni njBrZhUvyQfXdDriBQ/BjQ2QnFdK7E1uXx95vpRjXYBhge8BqECdHzOxSSzAysMu2x zr5oUBoVbu1IuxHiEoYHtomNuvkUrJjQ5QhY8iec= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497811870; bh=CY3mdszgzhj4aWh9lKR+otwxYg/aJyXCV4Q77AyJJNQ=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=q6HX/ArQ9/EBy4PlAzbHMXzpRyGeaCtxMjeki1pwcesMMvRN7Pjaa+2ymnYec/8HN bShf04KIVOlUpKapCCzgvJ7RMHE/aC+/drlZiWnhUdv0Y5+TTNDXnbpjAmDrWWWxbA j5bCtpxAOEayQVsznwHYQ7w2rGW55eZalBka4K3s= To: Marius Bakke Subject: Re: [bug#27421] [PATCH 4/5] gnu: Add openttd-opengfx. References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-3-kei@openmailbox.org> <87fuexf92e.fsf@fastmail.com> Date: Sun, 18 Jun 2017 14:51:06 -0400 In-Reply-To: <87fuexf92e.fsf@fastmail.com> (Marius Bakke's message of "Sun, 18 Jun 2017 20:24:25 +0200") Message-ID: <874lvdcep1.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: 27421@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: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/games.scm (openttd-opengfx): New variable. > > [...] > >> + ;; Redirect stdout to /dev/null instead of stderr. This prevents >> + ;; dos2unix from receiving its version information as a flag. >> + (substitute* "Makefile" >> + (("\\$\\(UNIX2DOS\\) -q --version 2>/dev/null") >> + "$(UNIX2DOS) -q --version 1>/dev/null"))))) > > I'm a bit confused as to why this is necessary. I guess it's a behavior > change in recent versions, that --version prints on stdout? LGTM anyway. > I haven't used old versions of dos2unix, so I wouldn't know better. I've rephrased the comment to make it a bit clearer. >> + ;; The check phase for this package only checks the md5sums of the >> built >> + ;; GRF files against the md5sums of the release versions. Because >> we use >> + ;; different software versions than upstream does, some of the md5sums >> + ;; are different. However, the package is still reproducible, it's >> safe >> + ;; to disable this test. >> + #:tests? #f)) >> + (native-inputs `(("dos2unix" ,dos2unix) >> + ("gimp" ,gimp) >> + ("grfcodec" ,grfcodec) >> + ("nml" ,nml) >> + ("python" ,python-2))) >> + (home-page "http://dev.openttdcoop.org/projects/opengfx") >> + (synopsis "Base graphics set for OpenTTD") >> + (description >> + "The OpenGFX project is a free replacement of the base graphics so that >> +OpenTTD can be shipped finally fully functional without the need >> for additional >> +downloads.") > > Yay! I'm thinking we should mention this is one of many available > grahics sets for OpenTTD. Maybe something like.. > > "The OpenGFX projects is an implementation of the OpenTTD base grahics > set that aims to ensure the best possible out-of-the-box experience. > > OpenGFX provides you with... > @enumerate > @item All graphics you need to enjoy OpenTTD. > @item Uniquely drawn rail vehicles for every climate. > @item Completely snow-aware rivers. > @item Different river and sea water. > @item Snow-aware buoys. > @end enumerate" > > (Adapted from readme.ptxt) Why didn't I do this??? I'm totally using this description. > >> + (license license:gpl2))) > > Indeed version 2 only. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAllGy5oACgkQ5qXuPBlG eg0sEQ/+JPkCWJSTHGKGur4ast/wg37Ob0T9X4gSCLzepMXfEf0tXa8jl/5R6pIJ XFI5CsNOvquxXVrkrpt8wn40k/pWDIi5GWhc/uWxNmHNMhXYP2wktZSXJeQb5DmR 8OquOYAsJv7r5rTfe0VvuzpXgr/NN9BgR3TWTYRrBsC/A5weJkMQFy6DeMspUfGV 7c3iHR9Pa1l8Gzc5xEVeyZ7yL82vaObc3v6opVMnoz4xFrUMkjPcBTek0yLayU1A ElDaoEmzJh/OIu3Jo2g2Ep+DKSvlx8CJ379YTG7fSVbNcYycj7vg/uRtFmKXmqE5 uN8BEjj2jdQFApVG9Hwm6gp6/1gy1ZA8V9wzd7eiMymLKkkzJqokgqI0O3zSQ3td ImtEBg+uBDxe9/Xe+lDkhk2vmHJaxdUvHgODGLMVt3c+QLXKhnbS9ugwFbvx+N7m YqOBVNJBH1U2DogvEMy1pnVn+cWu+tKM/esEpSkp2CGOvpcb3HVW/G016M9H1HIG cWVTCrKE3HPpYL2e4k26acpiR0ffS+eXiAjT67dw3FKGlJOxpMkoqVJgcXFZTuit tEFMJCWiJONk8ZgjM5Fc75D6NJdMBP3Rz7CLXQQIRCzphnEuNK0sO3ex9AxWDsep Oe5R8xmSkQFACFQzBrEEbYBaFNme6FmfkZMp7Z7bLJot3msee0I= =9Ag8 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 15:01:58 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 19:01:58 +0000 Received: from localhost ([127.0.0.1]:55406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMfSP-000641-RL for submit@debbugs.gnu.org; Sun, 18 Jun 2017 15:01:58 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:42258 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMfSO-00063s-7g for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 15:01:56 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 714CB565BC5; Sun, 18 Jun 2017 21:01:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497812515; bh=++CXVotPw/eW1ECPPx/hY+wwGkJ1PxjH1ccqtzuLKkw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ldezBXg0Kfm1RPFEslPYceoRgPHNSylNw3A3646bnz/08KLyerdKUvznScVTWAxLS OotZpvmV3HBTAIJEJ/Wl4e3JvzbaE0BcZgFWnNyWguF7Ner2UOQKFuNrg3YM2AcY4f 0yOXYlqnKjrkbw6D52fpiYOLkrnZgh8hFBrD7tZs= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497812514; bh=++CXVotPw/eW1ECPPx/hY+wwGkJ1PxjH1ccqtzuLKkw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=yq27aCRVq/k/jNouiRSFMM7Y/VXzzMFt29HDyov1nMm6X22lTW0jxLvFIfFMhfZDE tS26cp3jHuPLtWY0s5erZqKPSYDDkvSErwhOMPzhUesJ4erm7AWeG+nnqOHx/6zOV3 ejtYIUTxpY4ETwoBmT3rv4lhZLwjmfEdGISybAjc= To: Marius Bakke Subject: Re: [bug#27421] [PATCH 1/5] gnu: Add nml. In-Reply-To: <87o9tlfa4i.fsf@fastmail.com> (Marius Bakke's message of "Sun, 18 Jun 2017 20:01:33 +0200") References: <87injt42pu.fsf@openmailbox.org> <20170618174443.32690-1-kei@openmailbox.org> <87o9tlfa4i.fsf@fastmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Sun, 18 Jun 2017 15:01:50 -0400 Message-ID: <87y3spazmp.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: 27421@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: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/game-development.scm (nml): New variable. > > [...] > >> + (build-system python-build-system) >> + (inputs >> + `(("python-pillow" ,python-pillow) >> + ("python-ply" ,python-ply))) > > Should these not be propagated? They should! Nice catch. > >> + (home-page "http://dev.openttdcoop.org/projects/nml") >> + (synopsis "NML compiler") >> + (description >> + "NML is a a python-based compiler, capable of compiling NML files (along >> +with their associated language, sound and graphic files) into grf and/or nfo >> +files.") > > Could you mention what NML is here with a @dfn{}? Maybe also add > @file{.grf} and @file{.nfo} if they are file extensions. LGTM otherwise! Sure thing. I am doing the same for "GRF" in the grfcodec description. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAllGzh4ACgkQ5qXuPBlG eg33mBAAtBHlLGOw6EdH1MU6pMLzVWIsnst2xzWgnZbJVPRpnDRokDz8LOQklyTA hqK7Vv3EVGu5IdSQ9t765dBJmXheX+xLiIKhCM9RYJPlXQ2ANkAJ2/ueRQ5tOHf9 bzowDNsmtyh2Gny0VFCbDMDL4YjOG73HyZMprr/CTmi9JBPyHvcIwUKDsaiQEluo Vq1LW9doPsTUX7afIDwtQP0aUK7Z369EaDZps1fXIdNofHRGR4YYRC+cECFNiGOj M5866PgMWMaCgkBmMvk5pJzq90cdnEiki2cwkgWjsKh4afhZsJbArE/JxOa5A/pt ws2RNK+VMLvlnCmYw//NiX+YBXOkvPjmPQedzQ+B9IpOOFBZsKr6sOQLCTub4nyi RmQl4SmXqK8sMOMF33ANXteHpCnLNh4mRn32n7jI8Zh3WAcJ4SbVY6VAHQ2VVYyq oyGSzvbjISO7aV5K5sErK9KOtgZ30d39b5NsIpBkuAxf5C+0KFLr7ta/AA/DvQ42 a+uckXlLeXdqL6RMyVzCHIc9TbiqFeobo5m+/JpaDuvjYmilp/5J8Z4PzzkDFpzy gn2yQh5pN7FB7PBmO0GivipKsuf/EE8BpB54Hzj4JjYaH6VE6pGGZpxk4gq43FCT YF4rQYy9gP1u6Otwwyh87lIT8lCXCnC93/vv3tev6vLBMPT3XGU= =EIJt -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 17:03:57 2017 Received: (at 27421) by debbugs.gnu.org; 18 Jun 2017 21:03:57 +0000 Received: from localhost ([127.0.0.1]:55434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMhMT-0000lW-J6 for submit@debbugs.gnu.org; Sun, 18 Jun 2017 17:03:57 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:49236 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dMhMS-0000lN-G3 for 27421@debbugs.gnu.org; Sun, 18 Jun 2017 17:03:56 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 4C189564459; Sun, 18 Jun 2017 23:03:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497819835; bh=5SJn5KjiHnBQT++0vUws2ybZp5JACtjNvSbYCZM8Kus=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=hK5fjSUOANUuZsbNwQVv9WecXx+Bg/hzVPiHn2R6YKxsD5NcW6M4C58GvrZBBqVlT +Yg3Nr35ljKHJSS0KdG9Ud5xkkUObbBlgKtx8J51cH2RkDZsv3/GznhjiUWhocvJe9 VeqSu9Qj0J3v5is4m+cqlGAHJ/Q6ohoC1TTPpOPo= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1497819834; bh=5SJn5KjiHnBQT++0vUws2ybZp5JACtjNvSbYCZM8Kus=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=A1flTD9GdRNNG7pvdl0FOJhqrmhKc9rrNuc4QC+UEpGNMM0Mda7FuNAsl4oh+SRxc 91/S7gG1ApXgXGR93eX0by1iBv3rK50gb30UTiZrZ9Z0clkmIO3dfagZl2aGCEAAe9 RoeAsBMno9Vq+QMCuStO45OnsSxrLeNikjbR9ku0= To: Marius Bakke Subject: Re: [bug#27421] [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase. References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-4-kei@openmailbox.org> <87d1a1f8n6.fsf@fastmail.com> Date: Sun, 18 Jun 2017 17:03:47 -0400 In-Reply-To: <87d1a1f8n6.fsf@fastmail.com> (Marius Bakke's message of "Sun, 18 Jun 2017 20:33:33 +0200") Message-ID: <87tw3datzg.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: 27421@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: -0.7 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/games.scm (openttd-engine): Rename package to openttd. >> [arguments]: Add it. >> [native-inputs]: Add openttd-opengfx. > > This should also mention that the (openttd) variable is now gone. > However, I would prefer keeping "openttd-engine" and only add these > changes to the inherited "openttd" package. What do you think? That would be a more logical progression given the comment about adding openttd-opengfx. I've attached the change you're talking about. --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-openttd-Add-install-data-phase.patch Content-Transfer-Encoding: quoted-printable From=20d02c7d59d268199a04c2e57da0c9d2646052f980 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 18 Jun 2017 13:45:19 -0400 Subject: [PATCH] gnu: openttd: Add 'install-data' phase. * gnu/packages/games.scm (openttd)[arguments]: Add it. [native-inputs]: Add openttd-opengfx. =2D-- gnu/packages/games.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index df680d11d..b8ca8dc15 100644 =2D-- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2360,7 +2360,25 @@ OpenGFX provides you with... (define-public openttd (package (inherit openttd-engine) =2D (name "openttd"))) + (name "openttd") + (arguments + (substitute-keyword-arguments (package-arguments openttd-engine) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'install-data + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* + ((opengfx (assoc-ref inputs "opengfx")) + (out (assoc-ref outputs "out")) + (gfx-dir + (string-append out + "/share/games/openttd/baseset/opengfx"= ))) + (mkdir-p gfx-dir) + (copy-recursively opengfx gfx-dir)) + #t)))))) + (native-inputs + `(("opengfx" ,openttd-opengfx) + ,@(package-native-inputs openttd-engine))))) =20 (define-public pinball (package =2D-=20 2.13.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAllG6rQACgkQ5qXuPBlG eg36MA//dfP6vvH5vnKWLaHNPUW/1ePQO5lrz+GLRNJ471avCxiuJEM1u1zE/OvG 8CpWecahIxIerHoxLL9R1gdT5bpYqFwM+c65Qy8R4q0wjUx5QXATQaC4ud6GV0VV cOh9Gm1AfTMZ5Aszy4fGufehupE6W8npxUPb3X7fJmjXjDY9A46NEItz+gNXscEP tNOtvUipuBRk3tiTL7HMF8Hd9KAnynbS96k44V8O6JwQp1XdnuBadBulGY/GAwGX xu4KG1EA0R/0n703QWxS9yeVTgzB8ctDDgqyaqnjMnIvEgAshqT8hxPEPsBZG/0e QvzFCM5+GLzO6cVE731bqLg3xN4Ha6DZcPu/puvMUxwKtLHJJy16FkZMe+zDR7vy 6JaWK4yyM/D71zw/oT3NFRUNEqjQntfyTiXDPuc0Qqtb4GqY78DKjoKaPZZ4H+ib 53jIZAVIMt1vowl2ZjdXiPADYeaB6ytBWCRnKvEXiq85lqn9dOWGAbPm51Dkfnog ckGwfqDdKUo8x1Ytt1fof2X/mNqmMdfEntgdeUvUytbPhASN7Gu+RLgn37E65i7X zle78gJhguT4FkNVx0nGNlX5HiqyLUMCJbVS5eLm0kFJeAfDndCQ0zu+PkKqk+ra d3bo3Fm8VntRR16pbQM0GENSkn1RfHMH5M5cskOMzsA09vprCqQ= =A2ES -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 20 15:28:58 2017 Received: (at 27421) by debbugs.gnu.org; 20 Jun 2017 19:28:58 +0000 Received: from localhost ([127.0.0.1]:58432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNOpd-0000PE-TN for submit@debbugs.gnu.org; Tue, 20 Jun 2017 15:28:58 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:35577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNOpc-0000P6-3R for 27421@debbugs.gnu.org; Tue, 20 Jun 2017 15:28:57 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 879AC207CD; Tue, 20 Jun 2017 15:28:55 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Tue, 20 Jun 2017 15:28:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=usfEwdfZBJ+SDwyfC709znksYJHZW4oGI2u7GhXRR 9Q=; b=b7wuAI8rfV08GyEiil4nBrKvFFxQ5/RjzqfiFaOw15gh53SbWXCUtUFrm i7lVOUzfCjo4V2d/olnsVXCXn/fYmpDRmkueo7RJnJlkBR9eLAWsdqiCM+hQDV1Q YReyo2/EbEGfKeXbJiZTmLMJ/xh+AJjcFN5sBcgSflVC4LskYwomwSak0SJ4dTtW pdTabCXua9cYq48O+h20OxeD5UAMpB+JsD7QaA8r2XxzpMZje+qPTicxUy+Ixvpy l5DpVYx6IFcHAGRm4/gpTFB9YH52zfHHKzglGeDchAXVDby0QkusAGHjbeTVVVu5 jTykPcsbRTe0/f75LhHhaAuGETX+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=usfEwdfZBJ+SDwyfC7 09znksYJHZW4oGI2u7GhXRR9Q=; b=Y8wXroc6EHQyguvwncihIn9VACXAK5ehvM 7w0n70qSISY8FwnQSfN7xntGZmPTnezP7ueJAz/MX8vk+AYpW0Sccm/JsFlGkA5w 92M1ZCFVl7mgptF1Tre8DWEiBY6h/zBtA+gLQlijti3H0jbjrC2PxY1iu2uHw64o xb8+6J6iUqVeE/1RnbW8249rZ0VGPi1yZ6un0ypdkf5rUbHgkr+cnVT3G2ZJJxkC Q/fZluymh1j6exrNVk7SmJwQQl3sxMmLWYD40o6p3WrW9zm2DVIl+6LYIZ8zubiQ ITDcK0qgeiTLJmVeYst5lDF6UuW3INBfZu4oZWPev33boSzZSDrA== X-ME-Sender: X-Sasl-enc: UISO9n1gv1mb6OmUnFNFh/GRhiNLkyKX+toMBTnIHOAK 1497986935 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 0A43D7E711; Tue, 20 Jun 2017 15:28:54 -0400 (EDT) From: Marius Bakke To: Kei Kebreau Subject: Re: [bug#27421] [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase. In-Reply-To: <87tw3datzg.fsf@openmailbox.org> References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-4-kei@openmailbox.org> <87d1a1f8n6.fsf@fastmail.com> <87tw3datzg.fsf@openmailbox.org> User-Agent: Notmuch/0.24.2 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Tue, 20 Jun 2017 21:28:53 +0200 Message-ID: <871sqepife.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421 Cc: 27421@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: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > Marius Bakke writes: > >> Kei Kebreau writes: >> >>> * gnu/packages/games.scm (openttd-engine): Rename package to openttd. >>> [arguments]: Add it. >>> [native-inputs]: Add openttd-opengfx. >> >> This should also mention that the (openttd) variable is now gone. >> However, I would prefer keeping "openttd-engine" and only add these >> changes to the inherited "openttd" package. What do you think? > > That would be a more logical progression given the comment about adding > openttd-opengfx. I've attached the change you're talking about. LGTM, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAllJd3UACgkQoqBt8qM6 VPoRVAf/THkNDgj1RrEhAP03bCy6lZlTD02NC8r954GHztUM4Hyxpm5FHHYq1weS Zxuy9H63SDai4WSLhTxX8BYZ0Vnz58o16ISFHqtc52sBeMqCR9U+xQOX67R1z2Eu jpLnTq+DiPf+zJgr/lwzW+gla50tP/ETeQ53uI8Np1tlYAIqk1z3VcibAXFac2hj ytLxeWVtZjwo9JHxKKgpTNdRGmyyEIXpaiyReAXv6D7tOXjkeqGjY9qFlZ5wtZ2+ +BIeA62pMDvMQ6jjFiOahWxOYGraR7+/uxW6GKiX9TdcpjIanvVNqeJNO+sSx/Aa KTsfBCfWgn8MKencuOSPcpft6ueMFw== =Gz1g -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 20 22:35:34 2017 Received: (at 27421-done) by debbugs.gnu.org; 21 Jun 2017 02:35:34 +0000 Received: from localhost ([127.0.0.1]:58689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNVUT-0001kg-UD for submit@debbugs.gnu.org; Tue, 20 Jun 2017 22:35:34 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:42016 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNVUR-0001kW-Tt for 27421-done@debbugs.gnu.org; Tue, 20 Jun 2017 22:35:32 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 8FB0E524D5D; Wed, 21 Jun 2017 01:51:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1498012530; bh=xAcCs6E34n9biVRJeuOJ6/jhXYJU0V5Z71bS27Pf8ek=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=eI/GEsT1b69y0nFzPttM8TS9GlrFKXNvEUiXgYHwjtFPdsP9ByvIlnsEtTSAs0umd zG438MgEcPGO74rlgpmOoevqTtlGhq8il2TF6Dl78b48D52KncXxLUW07nrBOqFALT ijEgqvm5a6iBgarOHrePy0F8hCd7yiU3iLu8fptc= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1498002683; bh=xAcCs6E34n9biVRJeuOJ6/jhXYJU0V5Z71bS27Pf8ek=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=tfZ2iOFQScNsYHyfUJDKROdqAU4edRn4hlftEzkcFFC85S68wKyH7SFO2xGQvd1ds pjvDB0yuZaFlPvJ5+QeYBzrbiebjVML2din1o3EmA6D5v671g/0ZF28oGgjoDygWnJ d5OKWFcIDAI9g02OnTEtV5lG0416PLK6zjwL5sSQ= To: Marius Bakke Subject: Re: [bug#27421] [PATCH 5/5] gnu: openttd-engine: Add 'install-data' phase. References: <20170618174519.32747-1-kei@openmailbox.org> <20170618174519.32747-4-kei@openmailbox.org> <87d1a1f8n6.fsf@fastmail.com> <87tw3datzg.fsf@openmailbox.org> <871sqepife.fsf@fastmail.com> Date: Tue, 20 Jun 2017 19:51:19 -0400 In-Reply-To: <871sqepife.fsf@fastmail.com> (Marius Bakke's message of "Tue, 20 Jun 2017 21:28:53 +0200") Message-ID: <87injqp6a0.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27421-done Cc: 27421-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: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> Marius Bakke writes: >> >>> Kei Kebreau writes: >>> >>>> * gnu/packages/games.scm (openttd-engine): Rename package to openttd. >>>> [arguments]: Add it. >>>> [native-inputs]: Add openttd-opengfx. >>> >>> This should also mention that the (openttd) variable is now gone. >>> However, I would prefer keeping "openttd-engine" and only add these >>> changes to the inherited "openttd" package. What do you think? >> >> That would be a more logical progression given the comment about adding >> openttd-opengfx. I've attached the change you're talking about. > > LGTM, thanks! All five patches pushed to master. Thanks for the review, Marius! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAllJtPcACgkQ5qXuPBlG eg1BlQ/9FzOQM9CPLm1th+QXVWkIkERvzdeie4fw070oO/NWW2gSg24bFEE+HGAz f6gaVn5Ar7IsLonB/FKCqX8NLy0RmEL6iMBi03tVzHeHZw/hTf9lmOQgIjTlwSW9 5Rw/08plUrO3x45lEBNqk71FfufJof4/uqr3v484QkyaYSqMgWsI1ukHtenasBVE pqChvQNmppGnQysfHi2jOkE98ag47R2UfGxu3A67eEravnxf+3HkM+Orq+fYD4mF Wgx59Ks9GvAU9Dny25bU6E22HFxqpGbVYHCmcnZ0lc6O4osA6L4EmQI/o79VPAxD 4ZLGQlH+7v5wO2jYcMe4bB5mR/gcjHtj+J4e98AcqIloltYX5nsGSZNPcTKqkUxf pGvMhJmpBImwqWW4jQDshak4GQ8LFG91fhfsFJWIN083j1t4vkP9bttanVZ0wK0Z 4zuCN70anYFbIX34MisolUDJ01n42vJVf+QMyY51DqCPEKS4eq4CGWoiBMJqzqa7 8nsf0cL8PrjkvRto9eMmraFPnim2Yixo7ryBftsWbXNXD2V9Pt3Zq3SVlQjCc+oR nzrGiFd0UNQ/1HqcMyhMBM7E7CtFdhVvlV8St03z5gMhPmci9dpfHOpAxGpWdb16 C3h2vwai2GcjAn7hO8RHm317mIibmuTMQAr1prgtfyO+GOLXjnc= =YHzj -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 14 19:44:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 19 Jul 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator