From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:51105) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwVYs-0007bY-U9 for guix-patches@gnu.org; Tue, 28 Jan 2020 13:26:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwVYr-0002Jr-Ie for guix-patches@gnu.org; Tue, 28 Jan 2020 13:26:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55148) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwVYo-0002GG-Ro for guix-patches@gnu.org; Tue, 28 Jan 2020 13:26:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iwVYo-0007IG-OO for guix-patches@gnu.org; Tue, 28 Jan 2020 13:26:02 -0500 Subject: [bug#39263] [PATCH v2 3/3] gnu: godot: List which third party files to keep. Resent-Message-ID: From: Timotej Lazar Date: Tue, 28 Jan 2020 19:25:40 +0100 Message-Id: <20200128182540.16580-3-timotej.lazar@araneo.si> 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 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: 39263@debbugs.gnu.org Cc: Timotej Lazar 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