diff mbox series

[bug#64519] gnu: Add freetype-brotli.

Message ID 87sf9u1kvm.fsf@protonmail.com
State New
Headers show
Series [bug#64519] gnu: Add freetype-brotli. | expand

Commit Message

John Kehayias July 11, 2023, 4:19 p.m. UTC
Hi Ludo,

On Tue, Jul 11, 2023 at 03:51 PM, Ludovic Courtès wrote:

> Hi John,
>

[snip]

> Looks like the arguments and snippet are too different to be factorized
> via inheritance.  However, one could still inherit from the other to
> factorize license/synopsis/description?
>

Yes, thought of that afterwards and made that change locally now.

> Apart from this minor issue, LGTM!
>

I completely forgot there is another patch needed here, one to add freetype-brotli. That is just our freetype package with brotli added as a propagated-input for WOFF font support (if I recall). Attaching the patch now.

Actually I think our freetype package should do that as well, but since has nearly 18k dependents that should be grouped with other large changes. I brought this up on guix-devel [0] but didn't get any responses about this change. I think it is not controversial, just how to manage the rebuilds. Perhaps on the next mesa/related branch?

[0] <https://lists.gnu.org/r/guix-devel/2023-06/msg00113.html>

Thanks!
John

Comments

John Kehayias July 12, 2023, 7:09 p.m. UTC | #1
Hello,

On Tue, Jul 11, 2023 at 12:13 PM, John Kehayias wrote:

>
> I completely forgot there is another patch needed here, one to add
> freetype-brotli. That is just our freetype package with brotli added
> as a propagated-input for WOFF font support (if I recall). Attaching
> the patch now.
>
> Actually I think our freetype package should do that as well, but
> since has nearly 18k dependents that should be grouped with other
> large changes. I brought this up on guix-devel [0] but didn't get any
> responses about this change. I think it is not controversial, just how
> to manage the rebuilds. Perhaps on the next mesa/related branch?
>
> [0] <https://lists.gnu.org/r/guix-devel/2023-06/msg00113.html>
>

Maybe it should be called 'freetype-with-brotli' actually, in the
interim of being folded into freetype proper?

John
Ludovic Courtès July 14, 2023, 1:25 p.m. UTC | #2
Hi,

John Kehayias <john.kehayias@protonmail.com> skribis:

> I completely forgot there is another patch needed here, one to add freetype-brotli. That is just our freetype package with brotli added as a propagated-input for WOFF font support (if I recall). Attaching the patch now.

OK.

> Actually I think our freetype package should do that as well, but since has nearly 18k dependents that should be grouped with other large changes. I brought this up on guix-devel [0] but didn't get any responses about this change. I think it is not controversial, just how to manage the rebuilds. Perhaps on the next mesa/related branch?

Yes, you should check on IRC or guix-devel whether this change can be
piggybacked on an existing mass-rebuild branch.

> From f5622c12a84d208efefc53af88fe5f284485f2ff Mon Sep 17 00:00:00 2001
> Message-Id: <f5622c12a84d208efefc53af88fe5f284485f2ff.1689091993.git.john.kehayias@protonmail.com>
> From: John Kehayias <john.kehayias@protonmail.com>
> Date: Fri, 7 Jul 2023 12:05:16 -0400
> Subject: [PATCH] gnu: Add freetype-brotli.
>
> * gnu/packages/fontutils.scm (freetype-brotli): New variable.

[...]

> +(define-public freetype-brotli
> +  (package
> +    (inherit freetype)
> +    (name "freetype-brotli")

Maybe ‘freetype-with-brotli’ as you suggested.   Also please add a TODO
about the eventual merge of this into ‘freetype’.

Thanks!

Ludo’.
John Kehayias July 14, 2023, 3:12 p.m. UTC | #3
Hi,

On Fri, Jul 14, 2023 at 03:25 PM, Ludovic Courtès wrote:

> Hi,
>
> John Kehayias <john.kehayias@protonmail.com> skribis:
>
[snip]
>> Actually I think our freetype package should do that as well, but
>> since has nearly 18k dependents that should be grouped with other
>> large changes. I brought this up on guix-devel [0] but didn't get
>> any responses about this change. I think it is not controversial,
>> just how to manage the rebuilds. Perhaps on the next mesa/related
>> branch?
>
> Yes, you should check on IRC or guix-devel whether this change can be
> piggybacked on an existing mass-rebuild branch.
>

I'll see what is next. mesa-updates is built, but if that needs a
rebuild or other updates I can put it there. Otherwise the next large
branch job.

>> From f5622c12a84d208efefc53af88fe5f284485f2ff Mon Sep 17 00:00:00 2001
>> Message-Id:
>> <f5622c12a84d208efefc53af88fe5f284485f2ff.1689091993.git.john.kehayias@protonmail.com>
>> From: John Kehayias <john.kehayias@protonmail.com>
>> Date: Fri, 7 Jul 2023 12:05:16 -0400
>> Subject: [PATCH] gnu: Add freetype-brotli.
>>
>> * gnu/packages/fontutils.scm (freetype-brotli): New variable.
>
> [...]
>
>> +(define-public freetype-brotli
>> +  (package
>> +    (inherit freetype)
>> +    (name "freetype-brotli")
>
> Maybe ‘freetype-with-brotli’ as you suggested.   Also please add a TODO
> about the eventual merge of this into ‘freetype’.
>

Done.

Pushed as 49b0a5ee5f908d8efa8e792f8635f723fd1d26ed and 09e73683a2c303016fa57bf5d84a8e997d4c0a30

Thanks!
John
diff mbox series

Patch

From f5622c12a84d208efefc53af88fe5f284485f2ff Mon Sep 17 00:00:00 2001
Message-Id: <f5622c12a84d208efefc53af88fe5f284485f2ff.1689091993.git.john.kehayias@protonmail.com>
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 7 Jul 2023 12:05:16 -0400
Subject: [PATCH] gnu: Add freetype-brotli.

* gnu/packages/fontutils.scm (freetype-brotli): New variable.
---
 gnu/packages/fontutils.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 1b4e0064f4..ab81499dcb 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -16,6 +16,7 @@ 
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
 ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -124,6 +125,14 @@  (define-public freetype
     (license license:freetype)          ; some files have other licenses
     (home-page "https://freetype.org/")))
 
+(define-public freetype-brotli
+  (package
+    (inherit freetype)
+    (name "freetype-brotli")
+    (propagated-inputs
+     (modify-inputs (package-propagated-inputs freetype)
+       (prepend brotli)))))
+
 (define-public opentype-sanitizer
   (package
     (name "opentype-sanitizer")

base-commit: 7179d09d0d9762e7463c053ea958832944801ab0
-- 
2.40.1