Subject: bug#64909: closed (Re: [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 05 Aug 2023 12:38:02 +0000

Your bug report

#64909: [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
64909: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64909
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli
From: Liliana Marie Prikler <[email-masked]>
To: TakeV <[email-masked]>, [email-masked]
Cc: 宋文武 <[email-masked]>
Date: Sat, 05 Aug 2023 14:37:18 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Am Sonntag, dem 30.07.2023 um 08:57 +0200 schrieb Liliana Marie
Prikler:
> Am Donnerstag, dem 27.07.2023 um 21:26 -0700 schrieb TakeV:
> > * gnu/packages/game-development.scm (godot) [arguments,inputs]: use
> > system brotli
> > ---
> 
> In case someone else wants to push this, the proper message (minus
> leading spaces and missing sign-off) would be:
> 
>     gnu: godot: Use system brotli.
>     
>     * gnu/packages/game-development.scm (godot)[source]: Do not
> preserve brotli.
>     [arguments]<#:scons-flags>: Add “builtin_brotli=no”.
>     [inputs]: Add brotli.
> 
> Otherwise, I'm queuing this for Saturday.
queue.pop (this);

Cheers

Subject: [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli
From: TakeV <[email-masked]>
To: [email-masked]
Cc: TakeV <[email-masked]>
Date: Thu, 27 Jul 2023 19:54:23 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

I noticed this todo could be resolved, since the merge was built and
deployed upstream. 

---
 gnu/packages/game-development.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 127cbac127..84bbd68cce 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2017,10 +2017,6 @@ (define-public godot
                               "assimp"
                               "astcenc"
                               "basis_universal"
-                              ;; TODO: Can unbundle once
-                              ;; <https://github.com/godotengine/godot/pull/79101>
-                              ;; is merged
-                              "brotli"
                               ;; Godot needs ca-certificates.crt, but that is
                               ;; not available in build environment
                               "certs"
@@ -2067,6 +2063,7 @@ (define-public godot
                         "use_volk=no"
                         ;; Avoid using many of the bundled libs.
                         ;; Note: These options can be found in the SConstruct file.
+                        "builtin_brotli=no"
                         "builtin_embree=no"
                         "builtin_enet=no"
                         "builtin_freetype=no"
@@ -2193,6 +2190,7 @@ (define-public godot
      (list pkg-config))
     (inputs
      (list alsa-lib
+           brotli
            dbus
            embree
            enet

base-commit: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6
-- 
2.41.0