From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:34355)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1j1GTL-00074C-9a
 for guix-patches@gnu.org; Mon, 10 Feb 2020 16:20:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1j1GTK-0007dd-3W
 for guix-patches@gnu.org; Mon, 10 Feb 2020 16:20:03 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:49648)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1j1GTJ-0007cb-SC
 for guix-patches@gnu.org; Mon, 10 Feb 2020 16:20:01 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1j1GTJ-0004Pc-O9
 for guix-patches@gnu.org; Mon, 10 Feb 2020 16:20:01 -0500
Subject: [bug#38687] [PATCH 2/2] gnu: Add libtcod.
Resent-Message-ID: <handler.38687.B38687.158136959316942@debbugs.gnu.org>
From: Marius Bakke <mbakke@fastmail.com>
In-Reply-To: <20200206201713.8535-2-goodoldpaul@autistici.org>
References: <20200206201713.8535-1-goodoldpaul@autistici.org>
 <20200206201713.8535-2-goodoldpaul@autistici.org>
Date: Mon, 10 Feb 2020 22:19:41 +0100
Message-ID: <87h7zy2l8y.fsf@devup.no>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Giacomo Leidi <goodoldpaul@autistici.org>, 38687@debbugs.gnu.org

--=-=-=
Content-Type: text/plain

Giacomo Leidi <goodoldpaul@autistici.org> writes:

> * gnu/packages/game-development.scm (libtcod): New variable.

[...]

> +         (add-before 'bootstrap 'remove-hardcoded-vendor-paths
> +           (lambda _
> +             (substitute* "sources.am"
> +                 (("\\.\\./\\.\\./src/vendor/lodepng\\.cpp \\\\\n") "")
> +                 (("\\.\\./\\.\\./src/vendor/stb\\.c \\\\")
> +                  "../../src/vendor/stb.c")
> +                 (("\\.\\./\\.\\./src/vendor/utf8proc/utf8proc\\.c") ""))
> +
> +               (substitute* "../../src/libtcod/sys_sdl_img_png.cpp"
> +                 (("\\.\\./vendor/") ""))
> +
> +               (substitute* '("../../src/libtcod/color/canvas.cpp"
> +                              "../../src/libtcod/sys_sdl_img_png.cpp"
> +                              "../../src/libtcod/tileset/truetype.cpp"
> +                              "../../src/libtcod/tileset/tilesheet.cpp")
> +                 (("\\.\\./\\.\\./vendor/") ""))
> +
> +               (substitute* "../../src/libtcod/console/printing.cpp"
> +                 (("\\.\\./\\.\\./vendor/utf8proc/") ""))
> +               #t)))))

Can you move the contents of this phase to the 'snippet' instead?  Since
they are related to the unbundling, and makes 'guix build --source
libtcod' easier to work with.

> +    (native-inputs
> +     `(("autoconf" ,autoconf)
> +       ("automake" ,automake)
> +       ("libtool" ,libtool)
> +       ("lodepng" ,lodepng)
> +       ("python" ,python)
> +       ("pkg-config" ,pkg-config)
> +       ("sdl2" ,sdl2)

sdl2 and lodepng should probably be regular inputs.

> +       ("stb-sprintf" ,stb-sprintf)
> +       ("stb-truetype" ,stb-truetype)))
> +    (inputs
> +     `(("utf8proc" ,utf8proc)
> +       ("zlib" ,zlib)))
> +    (home-page "https://github.com/libtcod/libtcod")
> +    (synopsis "Library specifically designed for writing roguelikes")
> +    (description
> +     "libtcod is a free, fast, portable and uncomplicated API for roguelike

s/free//  (everything in Guix is free software)

Otherwise LGTM!

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl5ByO0ACgkQoqBt8qM6
VPrq6wgAhw8IgoV/qMxlyST/nAOq6bHk9T8Qv9Fq8baIYTbTJr1pGE663xfd/PT6
fUSYrUxrWrMSG+fP7uE+MvbtAS0ke4xbHAOJK6XgjD4V8KsVjfscMyOfjpZrJHt5
CL0RryvywgKZIDi/FEghKVNLow/9MogqrQWt/3wsD0E07HyprvkIQszWZh38kZ2l
LH92EyPhO+4znPSlN0L8/TqSJRJZytOMjR7rAgd7xTQ62+5T0F+syY+hLY0st5ST
9ei6jvB7iRggvLSd9zJWNseltK1obFe1EyGfWBlwELpj8p6O8U0n55ynrc5q2XVj
U3gn3X6rP57XzMdx6+AzzoMZMVlu9g==
=5WDq
-----END PGP SIGNATURE-----
--=-=-=--