From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:51611) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ivHYt-0004RW-58 for guix-patches@gnu.org; Sat, 25 Jan 2020 04:17:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ivHYs-0001MM-0N for guix-patches@gnu.org; Sat, 25 Jan 2020 04:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ivHYr-0001M8-SL for guix-patches@gnu.org; Sat, 25 Jan 2020 04:17:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ivHYr-0007dY-Oe for guix-patches@gnu.org; Sat, 25 Jan 2020 04:17:01 -0500 Subject: [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2. Resent-Message-ID: References: <878slwucvg.fsf@araneo.si> <20200124150226.27294-1-timotej.lazar@araneo.si> From: Christopher Baines In-reply-to: <20200124150226.27294-1-timotej.lazar@araneo.si> Date: Sat, 25 Jan 2020 09:16:08 +0000 Message-ID: <87zheb6gmf.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Timotej Lazar Cc: 39263@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Timotej Lazar writes: > * gnu/packages/game-development.scm (godot): Update to 3.1.2. > [inputs]: Remove openssl, replaced by a (modified) bundled copy of mbedtl= s. > [arguments](configure-flags): Remove builtin_openssl flag. > [source]: Don=E2=80=99t try to remove the (now nonexistent) bundled opens= sl directory. > --- > gnu/packages/game-development.scm | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-develo= pment.scm > index ee8dea23b5..79e3f6dc6c 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -18,6 +18,7 @@ > ;;; Copyright =C2=A9 2019, 2020 Leo Prikler > ;;; Copyright =C2=A9 2019 Jethro Cao > ;;; Copyright =C2=A9 2020 Nicolas Goaziou > +;;; Copyright =C2=A9 2020 Timotej Lazar > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1503,7 +1504,7 @@ games.") > (define-public godot > (package > (name "godot") > - (version "3.0.6") > + (version "3.1.2") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -1512,7 +1513,7 @@ games.") > (file-name (git-file-name name version)) > (sha256 > (base32 > - "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf")) > + "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6")) > (modules '((guix build utils))) > (snippet > '(begin > @@ -1527,7 +1528,6 @@ games.") > "libvorbis" > "libvpx" > "libwebp" > - "openssl" > "opus" > "zlib")) > #t))))) > @@ -1550,7 +1550,6 @@ games.") > "builtin_libvorbis=3Dno" > "builtin_libvpx=3Dno" > "builtin_libwebp=3Dno" > - "builtin_openssl=3Dno" > "builtin_opus=3Dno" > "builtin_zlib=3Dno") > #:tests? #f ; There are no tests > @@ -1612,7 +1611,6 @@ games.") > ("libxinerama" ,libxinerama) > ("libxrandr" ,libxrandr) > ("mesa" ,mesa) > - ("openssl" ,openssl) > ("opusfile" ,opusfile) > ("pulseaudio" ,pulseaudio))) > (home-page "https://godotengine.org/") I did have a look if the package builds with the mbedtls-apache package, rather than using the included source code, and it looks to. Although I'm aware that [1] says there are modifications. 1: https://github.com/godotengine/godot/tree/master/thirdparty#mbedtls --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl4sB1hfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfByQ//YLy/AWsreva6V/6gzJE9SL0FJXCqjXHC8dDjwXmy/GusLGX+KSN+dqfi 0y12C056etUsWlxx13FDYuiboauj078bPQbAvEN48O9AsrW9TVl7QZcoB2tS+6Wo bbs5viq6zWSDqcoKd457IDG0/WY7fRQuuwLgDwz3i8nqQdctk+PPINgceDyZgYlW Vr2qQoqf8SrYqHCzOrOjxsr3mFT5lUe2pvoC+zxIEKVz1tgCMZ4hNFTiZxDkqvNq PXTf3qHK7AS0UpXMX2xjytb1s+RFtWHP8ZXJuJ0OZn2WnMvZYHdBvrvTFwShSGtK R2E06Vdc5aIgqPpiEnGSpDOgKZbEEQXLDrMtZegwyO6yztstrrtkKRDbXrYZne1A d342vqsIHuCnLypVmloOAHYN7/uoLum+z3dvBbxIU8WP2gFPvsy+BJcXOcs44PHb GoZ1jb/4fMKqJwO1ywgMYrvHMF/4iCp28lqOQdvyaAK3Rjd6LHIg1WcyvjFzYs+S y7hqsvwM3WspEzxsvjQ1r8Kb6IWkUMN4OULbDvAYkcknmKEz0edDFGnDpjMFEvil 20Q0VnBXLRt+QZF0kWG1Xh8X+2H5lzz7y1h3uIfZ1z4F2etzV9yrYtf5IEa6vEsu YQIzQRzZe7KxSpIzYbjJwd/JChAHa8hIuSLbf4n6dnnVs/A26zE= =Oq2w -----END PGP SIGNATURE----- --=-=-=--