From: Timotej Lazar <timotej.lazar@araneo.si>
To: 39263@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#39263] [PATCH v2 3/3] gnu: godot: List which third party files to keep.
Date: Tue, 28 Jan 2020 19:25:40 +0100 [thread overview]
Message-ID: <20200128182540.16580-3-timotej.lazar@araneo.si> (raw)
In-Reply-To: <20200128182540.16580-1-timotej.lazar@araneo.si>
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
prev parent reply other threads:[~2020-01-28 18:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 14:50 [bug#39263] [PATCH 0/2] Update Godot Timotej Lazar
2020-01-24 15:02 ` [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2 Timotej Lazar
2020-01-24 15:02 ` [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies Timotej Lazar
2020-01-25 9:18 ` Christopher Baines
2020-01-28 18:18 ` Timotej Lazar
2020-01-29 8:00 ` bug#39263: " Christopher Baines
2020-01-25 9:16 ` [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2 Christopher Baines
2020-01-28 18:25 ` [bug#39263] [PATCH v2 1/3] " Timotej Lazar
2020-01-28 18:25 ` [bug#39263] [PATCH v2 2/3] gnu: godot: Unbundle some dependencies Timotej Lazar
2020-01-28 18:25 ` Timotej Lazar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200128182540.16580-3-timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=39263@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).