From: Christopher Baines <mail@cbaines.net>
To: Timotej Lazar <timotej.lazar@araneo.si>
Cc: 39263@debbugs.gnu.org
Subject: [bug#39263] [PATCH 1/2] gnu: godot: Update to 3.1.2.
Date: Sat, 25 Jan 2020 09:16:08 +0000 [thread overview]
Message-ID: <87zheb6gmf.fsf@cbaines.net> (raw)
In-Reply-To: <20200124150226.27294-1-timotej.lazar@araneo.si>
[-- Attachment #1: Type: text/plain, Size: 2990 bytes --]
Timotej Lazar <timotej.lazar@araneo.si> writes:
> * 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 <leo.prikler@student.tugraz.at>
> ;;; Copyright © 2019 Jethro Cao <jethrocao@gmail.com>
> ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
> +;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
> ;;;
> ;;; 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/")
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
next prev parent reply other threads:[~2020-01-25 9:17 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 ` Christopher Baines [this message]
2020-01-28 18:25 ` [bug#39263] [PATCH v2 1/3] gnu: godot: Update to 3.1.2 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 ` [bug#39263] [PATCH v2 3/3] gnu: godot: List which third party files to keep Timotej Lazar
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=87zheb6gmf.fsf@cbaines.net \
--to=mail@cbaines.net \
--cc=39263@debbugs.gnu.org \
--cc=timotej.lazar@araneo.si \
/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).