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

Previous Next

Package: guix-patches;

Reported by: TakeV <takev <at> disroot.org>

Date: Fri, 28 Jul 2023 02:58:01 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64909 in the body.
You can then email your comments to 64909 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:
bug#64909; Package guix-patches. (Fri, 28 Jul 2023 02:58:01 GMT) Full text and rfc822 format available.
Acknowledgement sent to TakeV <takev <at> disroot.org>:
New bug report received and forwarded. Copy sent to liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org. (Fri, 28 Jul 2023 02:58:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: TakeV <takev <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: TakeV <takev <at> disroot.org>
Subject: [PATCH] * gnu/packages/game-development.scm (godot) [arguments,
 inputs]: use system brotli
Date: Thu, 27 Jul 2023 19:54:23 -0700

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
Information forwarded to liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:
bug#64909; Package guix-patches. (Fri, 28 Jul 2023 04:28:02 GMT) Full text and rfc822 format available.

Message #8 received at 64909 <at> debbugs.gnu.org (full text, mbox):

From: TakeV <takev <at> disroot.org>
To: 64909 <at> debbugs.gnu.org
Cc: TakeV <takev <at> disroot.org>
Subject: [PATCH vREVISION] gnu: godot: Use system brotli
Date: Thu, 27 Jul 2023 21:26:37 -0700

* gnu/packages/game-development.scm (godot) [arguments,inputs]: use system brotli
---
 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
Information forwarded to guix-patches <at> gnu.org:
bug#64909; Package guix-patches. (Sun, 30 Jul 2023 06:58:02 GMT) Full text and rfc822 format available.

Message #11 received at 64909 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: TakeV <takev <at> disroot.org>, 64909 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli
Date: Sun, 30 Jul 2023 08:57:51 +0200

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.

Cheers
Information forwarded to liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:
bug#64909; Package guix-patches. (Tue, 01 Aug 2023 01:31:02 GMT) Full text and rfc822 format available.

Message #14 received at 64909 <at> debbugs.gnu.org (full text, mbox):

From: TakeV <takev <at> disroot.org>
To: 64909 <at> debbugs.gnu.org
Cc: TakeV <takev <at> disroot.org>
Subject: [PATCH vREVISION] gnu: godot: Use system brotli.
Date: Mon, 31 Jul 2023 18:29:14 -0700

Updated the commit.

* gnu/packages/game-development.scm (godot)[source]: Do not preserve brotli.
[arguments]<#:scons-flags>: Add “builtin_brotli=no”.
[inputs]: Add brotli.
---
 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 f4b1a1e1e3..5771b7530f 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: 39fbc041f92489ec30075a85937c8a38723752dc
-- 
2.41.0
Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Sat, 05 Aug 2023 12:38:01 GMT) Full text and rfc822 format available.
Notification sent to TakeV <takev <at> disroot.org>:
bug acknowledged by developer. (Sat, 05 Aug 2023 12:38:02 GMT) Full text and rfc822 format available.

Message #19 received at 64909-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: TakeV <takev <at> disroot.org>, 64909-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli
Date: Sat, 05 Aug 2023 14:37:18 +0200

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
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sun, 03 Sep 2023 11:24:05 GMT) Full text and rfc822 format available.
This bug report was last modified 1 year and 290 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.