From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 24 09:51:10 2020 Received: (at submit) by debbugs.gnu.org; 24 Jan 2020 14:51:10 +0000 Received: from localhost ([127.0.0.1]:53635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv0Ig-0002xS-C7 for submit@debbugs.gnu.org; Fri, 24 Jan 2020 09:51:10 -0500 Received: from lists.gnu.org ([209.51.188.17]:47221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv0Id-0002xJ-H7 for submit@debbugs.gnu.org; Fri, 24 Jan 2020 09:51:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47470) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iv0Ic-0000tO-9k for guix-patches@gnu.org; Fri, 24 Jan 2020 09:51:07 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iv0Ib-0001zv-96 for guix-patches@gnu.org; Fri, 24 Jan 2020 09:51:06 -0500 Received: from araneo.si ([90.157.193.204]:53996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iv0Ia-0001xU-M6 for guix-patches@gnu.org; Fri, 24 Jan 2020 09:51:05 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 0f95ad4c for ; Fri, 24 Jan 2020 14:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to :subject:date:message-id:mime-version:content-type; s=20180623; bh=Ly0fBmmH468Qp7O36z/CsbYGY7M=; b=NNmPeSv4FuFUAzIusFGyVnOTilvo F+P32hv4ORC5jfcUVxl6dYC/G8gXf9LkOzPYzz5kP+pEqpvyzeraJm7E6JdpSr8s qzqqgQh/3hmV537pxkpRKXdHmW+g73vMOAfGaPcYhgG2M1GTwNVXoLmTK2bYa2ul I3jloKn7/n40g+CLgqgflbVRA14zEulN9l8O6UllbgU+zz37d7MorRYGJLmJog5r xVs8KdsPdFQgUtTff1LYiSj2Be8SjE5V5YRciq17d0Uu2PxJn1pcZGqba1kI3JZD X2rpFQU/rgpoKJy8pbBqMzkh8pzVWNP/RP/5Q7A2yJZscFzd2rtGvTgGUA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id ce7fcbdd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 24 Jan 2020 14:51:00 +0000 (UTC) From: Timotej Lazar To: guix-patches@gnu.org Subject: [PATCH 0/2] Update Godot Date: Fri, 24 Jan 2020 15:50:59 +0100 Message-ID: <878slwucvg.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 90.157.193.204 X-Spam-Score: 0.3 (/) 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: -0.7 (/) Hi, these patches update Godot to latest stable version 3.1.2 and unbundle bullet, pcre2 and zstd libraries. Thanks! Timotej Lazar (2): gnu: godot: Update to 3.1.2. gnu: godot: Unbundle some dependencies. gnu/packages/game-development.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 24 10:03:03 2020 Received: (at 39263) by debbugs.gnu.org; 24 Jan 2020 15:03:03 +0000 Received: from localhost ([127.0.0.1]:54590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv0UB-0003Uh-03 for submit@debbugs.gnu.org; Fri, 24 Jan 2020 10:03:03 -0500 Received: from araneo.si ([90.157.193.204]:52418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv0U8-0003UH-MC for 39263@debbugs.gnu.org; Fri, 24 Jan 2020 10:03:01 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 625add73 for <39263@debbugs.gnu.org>; Fri, 24 Jan 2020 15:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=KGkY6IwY8WOgPiqaVQHXK 2ZTV3w=; b=qnCbYll+XJrV04uvQ0DBOwaJDBzh0esiYkj5wTi3sG9/IYkBeIVkk rBYk28n/6avHZ0XnvAIFGNlTIU1eBomGYsK2ITBXMvdJXIpXXNDsbVHnBmfCFjGl 1QK9BaY98d5J4ULPgD36wbnJpX0xeobCNMKwwQKspfV2t5zFP9l4sdAPlkDMLuvK iwwMQ0NCCwkH3+F/q6NhOjIJYS7xrM7OULnOcJsiWifQB8vjSpfz7FIrRnZpGoHG IPoqz0bMJ4KhiUG1EK+pFzQiSkdeG0MV2XOStEfMEvjwPE1LR0BOHkC41bsKU4qc N4+gW+CZFG5QZZlJ7ZR15/KtwksqL3vOQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id ae5fca69 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 24 Jan 2020 15:02:58 +0000 (UTC) From: Timotej Lazar To: 39263@debbugs.gnu.org Subject: [PATCH 1/2] gnu: godot: Update to 3.1.2. Date: Fri, 24 Jan 2020 16:02:25 +0100 Message-Id: <20200124150226.27294-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: Timotej Lazar 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 (-) * gnu/packages/game-development.scm (godot): Update to 3.1.2. [inputs]: Remove openssl, replaced by a (modified) bundled copy of mbedtls. [arguments](configure-flags): Remove builtin_openssl flag. [source]: Don’t try to remove the (now nonexistent) bundled openssl 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-development.scm index ee8dea23b5..79e3f6dc6c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 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=no" "builtin_libvpx=no" "builtin_libwebp=no" - "builtin_openssl=no" "builtin_opus=no" "builtin_zlib=no") #: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/") -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 24 10:03:07 2020 Received: (at 39263) by debbugs.gnu.org; 24 Jan 2020 15:03:07 +0000 Received: from localhost ([127.0.0.1]:54592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv0UE-0003Uy-OZ for submit@debbugs.gnu.org; Fri, 24 Jan 2020 10:03:06 -0500 Received: from araneo.si ([90.157.193.204]:52418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iv0UA-0003UH-1o for 39263@debbugs.gnu.org; Fri, 24 Jan 2020 10:03:03 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id f1005d6f for <39263@debbugs.gnu.org>; Fri, 24 Jan 2020 15:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=ZT6EOUFFIn+zlK67tltw/ JWyKAg=; b=q5ZnHddWw3dRUVfJM1qoRaamV2tRl8sbZHji2WaP9ROerAZCz+q+W 76FIMUJ8WwOzVGJsKcMNcRaFMhGyU9eq4yhF9EtptT/zppw1X8iv3ovdb9iijE9V M5yv/gqxfvCUGLDF6a5UmkpAfK2MIhl7Ri2LglN8gElyig4inm8ULYVkHrdBa4wG Tlf2lblPaFBS1yw2nmrt8kfkxc7W0CkjmpjA575mJlILmv6qCmw6R0KaLkJfDeeD g/dQmD0bp4UOBD2XsTvWGu8KhD6o6x1k4JxCWhxBgEmb4ZGXduLTRKdpYvlMXpSZ WIRJVxpJvaRudQMr4CNQLDurW4FaVyU3A== Received: by araneo.si (OpenSMTPD) with ESMTPSA id cd0d70b2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 24 Jan 2020 15:02:59 +0000 (UTC) From: Timotej Lazar To: 39263@debbugs.gnu.org Subject: [PATCH 2/2] gnu: godot: Unbundle some dependencies. Date: Fri, 24 Jan 2020 16:02:26 +0100 Message-Id: <20200124150226.27294-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124150226.27294-1-timotej.lazar@araneo.si> References: <20200124150226.27294-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: Timotej Lazar 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 (-) * gnu/packages/game-development.scm (godot)[inputs]: Add bullet, pcre2, zstd. [arguments](configure-flags): Use system libraries for the above. [source](snippet): Remove bundled copies. --- gnu/packages/game-development.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 79e3f6dc6c..9ded71375f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -1521,7 +1522,8 @@ games.") ;; of these may be modified; see "thirdparty/README.md". (with-directory-excursion "thirdparty" (for-each delete-file-recursively - '("freetype" + '("bullet" + "freetype" "libogg" "libpng" "libtheora" @@ -1529,7 +1531,9 @@ games.") "libvpx" "libwebp" "opus" - "zlib")) + "pcre2" + "zlib" + "zstd")) #t))))) (build-system scons-build-system) (arguments @@ -1541,6 +1545,7 @@ games.") '()) ;; Avoid using many of the bundled libs. ;; Note: These options can be found in the SConstruct file. + "builtin_bullet=no" "builtin_freetype=no" "builtin_glew=no" "builtin_libmpdec=no" @@ -1551,7 +1556,9 @@ games.") "builtin_libvpx=no" "builtin_libwebp=no" "builtin_opus=no" - "builtin_zlib=no") + "builtin_pcre2=no" + "builtin_zlib=no" + "builtin_zstd=no") #:tests? #f ; There are no tests #:phases (modify-phases %standard-phases @@ -1598,6 +1605,7 @@ games.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) + ("bullet" ,bullet) ("freetype" ,freetype) ("glew" ,glew) ("glu" ,glu) @@ -1612,7 +1620,9 @@ games.") ("libxrandr" ,libxrandr) ("mesa" ,mesa) ("opusfile" ,opusfile) - ("pulseaudio" ,pulseaudio))) + ("pcre2" ,pcre2) + ("pulseaudio" ,pulseaudio) + ("zstd" ,zstd "lib"))) (home-page "https://godotengine.org/") (synopsis "Advanced 2D and 3D game engine") (description -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 25 04:16:17 2020 Received: (at 39263) by debbugs.gnu.org; 25 Jan 2020 09:16:17 +0000 Received: from localhost ([127.0.0.1]:54957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivHY9-0007ca-1U for submit@debbugs.gnu.org; Sat, 25 Jan 2020 04:16:17 -0500 Received: from mira.cbaines.net ([212.71.252.8]:48032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivHY6-0007cQ-9r for 39263@debbugs.gnu.org; Sat, 25 Jan 2020 04:16:15 -0500 Received: from localhost (unknown [46.237.162.0]) by mira.cbaines.net (Postfix) with ESMTPSA id 3099D17A05; Sat, 25 Jan 2020 09:16:13 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 94d2c0b3; Sat, 25 Jan 2020 09:16:10 +0000 (UTC) References: <878slwucvg.fsf@araneo.si> <20200124150226.27294-1-timotej.lazar@araneo.si> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: Timotej Lazar Subject: Re: [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2. 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" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: 39263@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.0 (-) --=-=-= 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----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 25 04:18:38 2020 Received: (at 39263) by debbugs.gnu.org; 25 Jan 2020 09:18:38 +0000 Received: from localhost ([127.0.0.1]:54961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivHaQ-0007fm-IW for submit@debbugs.gnu.org; Sat, 25 Jan 2020 04:18:38 -0500 Received: from mira.cbaines.net ([212.71.252.8]:48040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ivHaO-0007fe-QW for 39263@debbugs.gnu.org; Sat, 25 Jan 2020 04:18:37 -0500 Received: from localhost (unknown [46.237.162.0]) by mira.cbaines.net (Postfix) with ESMTPSA id 5CF3917A05; Sat, 25 Jan 2020 09:18:36 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 47e0bd42; Sat, 25 Jan 2020 09:18:34 +0000 (UTC) References: <20200124150226.27294-1-timotej.lazar@araneo.si> <20200124150226.27294-2-timotej.lazar@araneo.si> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: Timotej Lazar Subject: Re: [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies. In-reply-to: <20200124150226.27294-2-timotej.lazar@araneo.si> Date: Sat, 25 Jan 2020 09:18:33 +0000 Message-ID: <87y2tv6gie.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: 39263@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.0 (-) --=-=-= Content-Type: text/plain Timotej Lazar writes: > * gnu/packages/game-development.scm (godot)[inputs]: Add bullet, pcre2, zstd. > [arguments](configure-flags): Use system libraries for the above. > [source](snippet): Remove bundled copies. > --- Generally, this is good :) > gnu/packages/game-development.scm | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm > index 79e3f6dc6c..9ded71375f 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -78,6 +78,7 @@ > #:use-module (gnu packages multiprecision) > #:use-module (gnu packages music) > #:use-module (gnu packages ncurses) > + #:use-module (gnu packages pcre) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages pulseaudio) > #:use-module (gnu packages python) > @@ -1521,7 +1522,8 @@ games.") > ;; of these may be modified; see "thirdparty/README.md". > (with-directory-excursion "thirdparty" > (for-each delete-file-recursively > - '("freetype" > + '("bullet" > + "freetype" > "libogg" > "libpng" > "libtheora" > @@ -1529,7 +1531,9 @@ games.") > "libvpx" > "libwebp" > "opus" > - "zlib")) > + "pcre2" > + "zlib" > + "zstd")) > #t))))) One thought I had here is that it would be more rigorous to have a list of directories that are kept, and anything not on the list is deleted. That way it's harder for new thirdparty dependencies to sneak in. Not something that necessarily needs changing now though. > (build-system scons-build-system) > (arguments > @@ -1541,6 +1545,7 @@ games.") > '()) > ;; Avoid using many of the bundled libs. > ;; Note: These options can be found in the SConstruct file. > + "builtin_bullet=no" > "builtin_freetype=no" > "builtin_glew=no" > "builtin_libmpdec=no" > @@ -1551,7 +1556,9 @@ games.") > "builtin_libvpx=no" > "builtin_libwebp=no" > "builtin_opus=no" > - "builtin_zlib=no") > + "builtin_pcre2=no" > + "builtin_zlib=no" > + "builtin_zstd=no") > #:tests? #f ; There are no tests > #:phases > (modify-phases %standard-phases > @@ -1598,6 +1605,7 @@ games.") > #t)))))) > (native-inputs `(("pkg-config" ,pkg-config))) > (inputs `(("alsa-lib" ,alsa-lib) > + ("bullet" ,bullet) > ("freetype" ,freetype) > ("glew" ,glew) > ("glu" ,glu) > @@ -1612,7 +1620,9 @@ games.") > ("libxrandr" ,libxrandr) > ("mesa" ,mesa) > ("opusfile" ,opusfile) > - ("pulseaudio" ,pulseaudio))) > + ("pcre2" ,pcre2) > + ("pulseaudio" ,pulseaudio) > + ("zstd" ,zstd "lib"))) > (home-page "https://godotengine.org/") > (synopsis "Advanced 2D and 3D game engine") > (description --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl4sB+lfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xf57w/+LVLq6V2+was9QUXBoyS6CkI88rrHj9wLUi+vCte9gh3h1AlrVmd/i6CQ SB8qauyUDJU1nve3oR+/0u2h6hYwrIdsgkkYZBwhsixyo/CN+A/YvPPheWHv9U2U FzVfbZ12TmNGLsbyO3Ywgkxtntwwo6MNwqJx2O5uBSH2Y3p35SsJSKnnmrVaV4kw jomAI3vLQhvVhyR80NZY5vMuB/47fWhvWgrCfC1QYWceYOJ13NCNs+DYEJq2xOjh a1S1VdiYFczOXQB7cDbUY/w0ZLsZdTYAEQ64SQ1PgzTIfN4KrpOZD00cRZJ9uFbb LEviOFTCSIlqAZpeoOR/r77Ux5DX2HdeHeLxUJiYIlOHmW1uFAJcJUe/rRmAJWKD sMTq5/6t6+FxQNMVpIhEzjryM5QylTojiNKQ2br1FDVn3BfZx5HXVMqrZSrF6GLi ZLeSbCiD16PanZU6JOAGGjRtXNFcUQMd33Ze5klhJdozIDi4yr8uIiY+w43dV4B8 /kCtGEnwsQ/xXgHfNhrajTLx9qMn/yVkxSj32A4tgx14TPLRyDOgp1sTD8Vyu4Xs eioBf3FqGrwR71fdi5rZFsZnT6q0rwUz5TYs/xa/xTp732LP+UqNh1Igz0b5U6Cq B3OOvYizrsXMEfSppYhWYLKlrg7DmBTMn5te5Lpn7Iahj1xTQI4= =T8ZV -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 28 13:18:15 2020 Received: (at 39263) by debbugs.gnu.org; 28 Jan 2020 18:18:15 +0000 Received: from localhost ([127.0.0.1]:32849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVRH-00070X-D9 for submit@debbugs.gnu.org; Tue, 28 Jan 2020 13:18:15 -0500 Received: from araneo.si ([90.157.193.204]:55246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVRE-00070H-JK for 39263@debbugs.gnu.org; Tue, 28 Jan 2020 13:18:13 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 8d6157c6; Tue, 28 Jan 2020 18:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type:content-transfer-encoding; s=20180623; bh=XmI3JVHC m9i/9PnxCdI7KGMSwQE=; b=fn+VlbL4X4KNsPer5bndbRWhh7PB2bers77PDAjF 4I4KthOUt6uATsScQPo4aIOB1braI6n0n/LgMw1864HNnAsmezircTno5qL7PMwS dinF827yeWwixA0WyTqdjNqEOw5Fhg2X1wa4AAfq+7VdDm4K0XNf8o6lMw2uNl3/ bxB8vy6iWswy8mGwPo1cC7jONOfQrKHikSrvap+0ElPfdOOXufYCFExY9C06qfqD QO/DJ6ZkLIab4pufTFivwlnMMPyO0lBdC/N4wkb4xkoLr5NsWNu4iIFVSr7QtzoW 2cd/IF3w8P4Y4MUb4KZY8S5EQwcptNuldlKjBjNoOoh5wQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id cc59875f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 28 Jan 2020 18:18:09 +0000 (UTC) From: Timotej Lazar To: Christopher Baines Subject: Re: [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies. In-Reply-To: <87y2tv6gie.fsf@cbaines.net> References: <20200124150226.27294-1-timotej.lazar@araneo.si> <20200124150226.27294-2-timotej.lazar@araneo.si> <87y2tv6gie.fsf@cbaines.net> Date: Tue, 28 Jan 2020 19:18:09 +0100 Message-ID: <875zgvtpge.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: 39263@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.0 (-) Thanks for the feedback! I am sending updated patches after this reply. Christopher Baines [2020-01-25 09:16:08+0000]: > 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. The two Godot patches for mbedtls don=E2=80=99t seem to be relevant to Guix= , so I replaced the bundled copy with the mbedtls-apache package. I don=E2=80=99t have a use case to test this, but the minimal example from the HTTPRequest tutorial seems to work OK with an HTTPS URI. Christopher Baines [2020-01-25 09:18:33+0000]: > One thought I had here is that it would be more rigorous to have a list > of directories that are kept, and anything not on the list is deleted. > That way it's harder for new thirdparty dependencies to sneak in. Makes sense. As you suggest, I flipped the logic for removing thirdparty files: whitelist preserved files and remove everything else. The snippet can only preserve direct children of the thirdparty/ directory, which keeps it simple but perhaps not flexible enough in the long run. Do we generally prefer whitelisting bundled files? Most packages I have seen (and written) do the opposite and list the files to remove. Maybe we could add a guideline somewhere? Or point me to the one I missed. :) From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 28 13:25:52 2020 Received: (at 39263) by debbugs.gnu.org; 28 Jan 2020 18:25:52 +0000 Received: from localhost ([127.0.0.1]:32880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVYe-0007HC-6X for submit@debbugs.gnu.org; Tue, 28 Jan 2020 13:25:52 -0500 Received: from araneo.si ([90.157.193.204]:55252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVYc-0007Gy-5l for 39263@debbugs.gnu.org; Tue, 28 Jan 2020 13:25:50 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 995f41ae for <39263@debbugs.gnu.org>; Tue, 28 Jan 2020 18:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=dJ3b/8Uu Sm6+qluA4ikO8cPLtQU=; b=gEkZ6fgN16UTk6YMH1POHsKjN9CQ65XUjN8ecN0h NY+ZYyHmnbuM2fUsl+EeYdueqWVwwHyAnypq7IeWfXxhwJgGk+rD06k+MjKH5BPC S2FCDSeGj4jYGCpTkcc9AwTnfV1tUhGXQ3p/H9Ro8AFv7s44VRIy32/GSGz6xh72 vjoPCewYHpG4IEzMXnXCAXM5Gtb9ZWBKp/YyLps27mWP8tFVqwMq0TDyfwNax/ss zpo7DzuvTMwe7+p8LL8yGc/00SHwgKjiy+5c7raiDGKrBIbOwqmh38XjM7Wutogc j9cl1rKdfO6/v7+sVA9uXT4+0d/2PCB/pns6FNwrsQBo+A== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 0364cc89 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 28 Jan 2020 18:25:46 +0000 (UTC) From: Timotej Lazar To: 39263@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: godot: Update to 3.1.2. Date: Tue, 28 Jan 2020 19:25:38 +0100 Message-Id: <20200128182540.16580-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.25.0 In-Reply-To: <878slwucvg.fsf@araneo.si> References: <878slwucvg.fsf@araneo.si> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: Timotej Lazar 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 (-) * gnu/packages/game-development.scm (godot): Update to 3.1.2. [inputs]: Remove openssl, replaced by a bundled copy of mbedtls. [arguments](configure-flags): Remove builtin_openssl flag. [source]: Don’t try to remove the (now nonexistent) bundled openssl 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-development.scm index 13006f3509..49e18602a0 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2019 Jethro Cao ;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 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=no" "builtin_libvpx=no" "builtin_libwebp=no" - "builtin_openssl=no" "builtin_opus=no" "builtin_zlib=no") #: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/") -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 28 13:25:54 2020 Received: (at 39263) by debbugs.gnu.org; 28 Jan 2020 18:25:54 +0000 Received: from localhost ([127.0.0.1]:32882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVYg-0007HV-Ho for submit@debbugs.gnu.org; Tue, 28 Jan 2020 13:25:54 -0500 Received: from araneo.si ([90.157.193.204]:55252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVYd-0007Gy-9S for 39263@debbugs.gnu.org; Tue, 28 Jan 2020 13:25:52 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 18f83c0c for <39263@debbugs.gnu.org>; Tue, 28 Jan 2020 18:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=ef4uUaKKP/FcW99tH2ER4 iTXV7g=; b=RELKzmBpL8Rjr88anYChDNAdoQha9K993RQUj9zBy5/3DW9vbfPiD K066SvWgd7AOa6K1GlSdWuNsQ5ZidKsFrOwpcokfbmK2+wiA2Ch5cNmYIhXUs1/K e2KC8Ghfe417OyJmrDaYiMNE+uDkCqNLAWfH+2mHt2GfV8Fm5+PESGc9RLgkhFR2 jaM0bBRCXiB267nnBJf2HupvXO5bk+p5+/w/jHuynIyx/tt5+BjUP0IzP60OLymB /iZtdh4ACIKaEZaL6A5EXyld0AvQ0ix1E0KgHvRMjr3DO5q3mpMC+FvUKQ+oUOCX 1H2Zi0llndXIHbo4qM1YjarMEJ07o1DPQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5bd614ef (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 28 Jan 2020 18:25:49 +0000 (UTC) From: Timotej Lazar To: 39263@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: godot: Unbundle some dependencies. Date: Tue, 28 Jan 2020 19:25:39 +0100 Message-Id: <20200128182540.16580-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128182540.16580-1-timotej.lazar@araneo.si> References: <878slwucvg.fsf@araneo.si> <20200128182540.16580-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: Timotej Lazar 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 (-) * gnu/packages/game-development.scm (godot)[inputs]: Add bullet, mbedtls-apache, pcre2 and zstd. [arguments](configure-flags): Use system libraries for the above. [source](snippet): Remove bundled copies. --- gnu/packages/game-development.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 49e18602a0..0ef9fcc7dd 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) #:use-module (gnu packages ncurses) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -1521,15 +1522,19 @@ games.") ;; of these may be modified; see "thirdparty/README.md". (with-directory-excursion "thirdparty" (for-each delete-file-recursively - '("freetype" + '("bullet" + "freetype" "libogg" "libpng" "libtheora" "libvorbis" "libvpx" "libwebp" + "mbedtls" "opus" - "zlib")) + "pcre2" + "zlib" + "zstd")) #t))))) (build-system scons-build-system) (arguments @@ -1541,6 +1546,7 @@ games.") '()) ;; Avoid using many of the bundled libs. ;; Note: These options can be found in the SConstruct file. + "builtin_bullet=no" "builtin_freetype=no" "builtin_glew=no" "builtin_libmpdec=no" @@ -1550,8 +1556,11 @@ games.") "builtin_libvorbis=no" "builtin_libvpx=no" "builtin_libwebp=no" + "builtin_mbedtls=no" "builtin_opus=no" - "builtin_zlib=no") + "builtin_pcre2=no" + "builtin_zlib=no" + "builtin_zstd=no") #:tests? #f ; There are no tests #:phases (modify-phases %standard-phases @@ -1598,6 +1607,7 @@ games.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) + ("bullet" ,bullet) ("freetype" ,freetype) ("glew" ,glew) ("glu" ,glu) @@ -1610,9 +1620,12 @@ games.") ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxrandr" ,libxrandr) + ("mbedtls" ,mbedtls-apache) ("mesa" ,mesa) ("opusfile" ,opusfile) - ("pulseaudio" ,pulseaudio))) + ("pcre2" ,pcre2) + ("pulseaudio" ,pulseaudio) + ("zstd" ,zstd "lib"))) (home-page "https://godotengine.org/") (synopsis "Advanced 2D and 3D game engine") (description -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 28 13:25:58 2020 Received: (at 39263) by debbugs.gnu.org; 28 Jan 2020 18:25:58 +0000 Received: from localhost ([127.0.0.1]:32886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVYj-0007Hk-Rs for submit@debbugs.gnu.org; Tue, 28 Jan 2020 13:25:58 -0500 Received: from araneo.si ([90.157.193.204]:55252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwVYh-0007Gy-IR for 39263@debbugs.gnu.org; Tue, 28 Jan 2020 13:25:56 -0500 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id db207e88 for <39263@debbugs.gnu.org>; Tue, 28 Jan 2020 18:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=CxQMPFqAtNXW7TCYR0ExR EZilTo=; b=FQfE2oJhoGk+b2b3EwEWC83hrcdRjBjGaV+GAqoXz7cB8w8JCgWRL wjVuT865w8YG5FVI9xDl1hfFQeW36GtSzgF8mqN3C+QVKGUJP6zA2Ig3+7JO60an hKerH+TBHUoMiY1t8w0f9SFknGp5NlgTlV0VdkOFQfzDwPPeKfd70oW48LyoeKuf QT2Twiqh9pGbsDW9d6hUHrEsjMCfZ3+jJxyMHfhDpo1x3caGUK4aRvik/9X5SGeo AaLLeSy686Fjbs/Dwgw7IPeHmXxv5/GRDz9d/ooxqEJSui9CrtZHq8QwSaTNZT2X CqZRo0Lt6acFADsQU/loeHZYtiytRW9rw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 2f435b16 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 28 Jan 2020 18:25:53 +0000 (UTC) From: Timotej Lazar To: 39263@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: godot: List which third party files to keep. Date: Tue, 28 Jan 2020 19:25:40 +0100 Message-Id: <20200128182540.16580-3-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128182540.16580-1-timotej.lazar@araneo.si> References: <878slwucvg.fsf@araneo.si> <20200128182540.16580-1-timotej.lazar@araneo.si> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 39263 Cc: Timotej Lazar 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 (-) Remove everything else to catch added dependencies in new versions. * gnu/packages/game-development.scm (godot)[source](snippet): Instead of removing (only) the unbundled libs, remove everything except the listed files. --- gnu/packages/game-development.scm | 51 ++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0ef9fcc7dd..517d91df54 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1515,27 +1515,42 @@ games.") (sha256 (base32 "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) (snippet '(begin - ;; Drop libraries that we take from Guix. Note that some - ;; of these may be modified; see "thirdparty/README.md". + ;; Keep only those bundled files we have not (yet) replaced + ;; with Guix versions. Note that some of these may be + ;; modified; see "thirdparty/README.md". (with-directory-excursion "thirdparty" - (for-each delete-file-recursively - '("bullet" - "freetype" - "libogg" - "libpng" - "libtheora" - "libvorbis" - "libvpx" - "libwebp" - "mbedtls" - "opus" - "pcre2" - "zlib" - "zstd")) - #t))))) + (let* ((preserved-files + '("README.md" + "b2d_convexdecomp" + "certs" + "cvtt" + "enet" + "etc2comp" + "fonts" + "glad" + "jpeg-compressor" + "libsimplewebm" + "libwebsockets" + "miniupnpc" + "minizip" + "misc" + "nanosvg" + "pvrtccompressor" + "recastnavigation" + "squish" + "thekla_atlas" + "tinyexr" + "xatlas"))) + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." preserved-files))))) + #t)))) (build-system scons-build-system) (arguments `(#:scons ,scons-python2 -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 29 03:00:33 2020 Received: (at 39263-done) by debbugs.gnu.org; 29 Jan 2020 08:00:33 +0000 Received: from localhost ([127.0.0.1]:33189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwiH3-0006Nd-C5 for submit@debbugs.gnu.org; Wed, 29 Jan 2020 03:00:33 -0500 Received: from mira.cbaines.net ([212.71.252.8]:35936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iwiH1-0006NV-VH for 39263-done@debbugs.gnu.org; Wed, 29 Jan 2020 03:00:32 -0500 Received: from localhost (unknown [46.237.162.0]) by mira.cbaines.net (Postfix) with ESMTPSA id D6E2216385; Wed, 29 Jan 2020 08:00:30 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 7daccf09; Wed, 29 Jan 2020 08:00:28 +0000 (UTC) References: <20200124150226.27294-1-timotej.lazar@araneo.si> <20200124150226.27294-2-timotej.lazar@araneo.si> <87y2tv6gie.fsf@cbaines.net> <875zgvtpge.fsf@araneo.si> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Baines To: Timotej Lazar Subject: Re: [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies. In-reply-to: <875zgvtpge.fsf@araneo.si> Date: Wed, 29 Jan 2020 08:00:27 +0000 Message-ID: <87v9ouofok.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 39263-done Cc: 39263-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.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Timotej Lazar writes: > Thanks for the feedback! I am sending updated patches after this reply. > > Christopher Baines [2020-01-25 09:16:08+0000]: >> 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. > > The two Godot patches for mbedtls don=E2=80=99t seem to be relevant to Gu= ix, so > I replaced the bundled copy with the mbedtls-apache package. I don=E2=80= =99t > have a use case to test this, but the minimal example from the > HTTPRequest tutorial seems to work OK with an HTTPS URI. Wonderful :) > Christopher Baines [2020-01-25 09:18:33+0000]: >> One thought I had here is that it would be more rigorous to have a list >> of directories that are kept, and anything not on the list is deleted. >> That way it's harder for new thirdparty dependencies to sneak in. > > Makes sense. As you suggest, I flipped the logic for removing thirdparty > files: whitelist preserved files and remove everything else. The snippet > can only preserve direct children of the thirdparty/ directory, which > keeps it simple but perhaps not flexible enough in the long run. Great, this looks really useful. > Do we generally prefer whitelisting bundled files? Most packages I have > seen (and written) do the opposite and list the files to remove. Maybe > we could add a guideline somewhere? Or point me to the one I missed. :) I don't know if it's written down somewhere, all I can say is it occurred to me when looking at the package definition. I've pushed the 3 latest patches you sent to master, so they're included in 18f8e935e85a99d5c284c0a6b719351a402ada21. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKSBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl4xO5xfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9XfuMQ/4nNxYIpA9DR5InMRzcOvXWDkkg2PH6prAXBYMMusC1DtgSoUUbqMqsarv RSE0m5vDXFQIgoE/c6XXMy7aGjJkPciigGZCCgtENy3s14kGVujzRnsyPBxl8a7J XWIwdZ5tazPMpsOowz6D6YZsCHLY6yoGip8pdO28Vwj4WUF6Kkq0Q00ePYlssTpN r8CwYdyc79B4r5sDkolLSwwnZZx/iUeLA7Gm7b85Pvd9+Bbeww3RKsu7RU814Sud weaA3oKZQl6pNIzT5AfIUW0p+TpS2LxJKW1EXT1WpB6qBTJphWzYtMBxbZx2EkGv z0AYHXpq2TQzcDAYGNTnPu7uP7xoT5SzODzh0yat2tnmGoXoySyDlroVS9AaITfA 9qdfMb97ZlGk2ka5b06HizitMFyQhbC5qbqgh0v0Ocqrjbnq9yuW8OQFwDVlYHvQ CIIiuvm/FtQivU0esdVZrDdwWd8Yv5panStGIKXHNHLlh7Vx/dBTkt72UeF0tQKY SZL71l6ZbFUNLNjD0pRhdlU+4YRi73S7QDoF0arFlT8EqDKpcf5bOJi+EB4h6P3T xpLY2KWWheke3WqKwNGIhirRuiUw2t92a3Yzc/6HQ3Nm2GOST77R8wWwjusXJZCY LBWoV+PRcddmSwROnOs3DxV0uuqw4qbMSO/cDGgOvxLcGqKJ7w== =Wj4Z -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Aug 17 22:08:36 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, 26 Feb 2020 12:24:05 +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