diff mbox series

[bug#67512,v4,1/4] gnu: Move icu4c-73 from gnuzilla to icu4c.

Message ID f526f09fb955d8b51aa470dcaa261d746a417ced.1707855137.git.ian@retrospec.tv
State New
Headers
Series Add LibreWolf |

Commit Message

Ian Eure Feb. 13, 2024, 8:34 p.m. UTC 
  * gnu/packages/icu4c.scm (icu4c-73): New variable.
* gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable.

Change-Id: I017e1416b70ecb94313aeb71aa4a0cafdfe0e9ab
---
 gnu/packages/gnuzilla.scm     | 27 +--------------------------
 gnu/packages/icu4c.scm        | 22 ++++++++++++++++++++++
 gnu/packages/tor-browsers.scm |  3 ++-
 3 files changed, 25 insertions(+), 27 deletions(-)

Comments

Mark H Weaver Feb. 14, 2024, 6:05 p.m. UTC | #1 
Ian Eure <ian@retrospec.tv> writes:
> * gnu/packages/icu4c.scm (icu4c-73): New variable.
> * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable.

The commit log should mention the changes to 'icecat-minimal' and
'make-torbrowser'.  Otherwise, looks good to me.

     Thanks,
       Mark
Clément Lassieur Feb. 16, 2024, 2:02 p.m. UTC | #2 
On Wed, Feb 14 2024, Mark H Weaver wrote:

> Ian Eure <ian@retrospec.tv> writes:
>> * gnu/packages/icu4c.scm (icu4c-73): New variable.
>> * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable.
>
> The commit log should mention the changes to 'icecat-minimal' and
> 'make-torbrowser'.  Otherwise, looks good to me.

I pushed this one (with small commit message updates), so we can have a
feeling that things are advancing :)

Thanks
Clément
Ian Eure Feb. 17, 2024, 4:07 p.m. UTC | #3 
Clément Lassieur <clement@lassieur.org> writes:

> On Wed, Feb 14 2024, Mark H Weaver wrote:
>
>> Ian Eure <ian@retrospec.tv> writes:
>>> * gnu/packages/icu4c.scm (icu4c-73): New variable.
>>> * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete 
>>> variable.
>>
>> The commit log should mention the changes to 'icecat-minimal' 
>> and
>> 'make-torbrowser'.  Otherwise, looks good to me.
>
> I pushed this one (with small commit message updates), so we can 
> have a
> feeling that things are advancing :)
>

Thank you.  Do you think the nss patch is also mergeable?

Thanks,

  — Ian
Clément Lassieur Feb. 21, 2024, 11:49 a.m. UTC | #4 
On Sat, Feb 17 2024, Ian Eure wrote:

> Clément Lassieur <clement@lassieur.org> writes:
>
>> On Wed, Feb 14 2024, Mark H Weaver wrote:
>>
>>> Ian Eure <ian@retrospec.tv> writes:
>>>> * gnu/packages/icu4c.scm (icu4c-73): New variable.
>>>> * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable.
>>>
>>> The commit log should mention the changes to 'icecat-minimal' and
>>> 'make-torbrowser'.  Otherwise, looks good to me.
>>
>> I pushed this one (with small commit message updates), so we can have a
>> feeling that things are advancing :)
>>
>
> Thank you.  Do you think the nss patch is also mergeable?

Do we know why this patch is necessary for librewolf and not for other
ESR based browsers?
Ian Eure Feb. 22, 2024, 1:07 a.m. UTC | #5 
Clément Lassieur <clement@lassieur.org> writes:

> On Sat, Feb 17 2024, Ian Eure wrote:
>
>> Clément Lassieur <clement@lassieur.org> writes:
>>
>>> On Wed, Feb 14 2024, Mark H Weaver wrote:
>>>
>>>> Ian Eure <ian@retrospec.tv> writes:
>>>>> * gnu/packages/icu4c.scm (icu4c-73): New variable.
>>>>> * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete 
>>>>> variable.
>>>>
>>>> The commit log should mention the changes to 'icecat-minimal' 
>>>> and
>>>> 'make-torbrowser'.  Otherwise, looks good to me.
>>>
>>> I pushed this one (with small commit message updates), so we 
>>> can have a
>>> feeling that things are advancing :)
>>>
>>
>> Thank you.  Do you think the nss patch is also mergeable?
>
> Do we know why this patch is necessary for librewolf and not for 
> other
> ESR based browsers?
>

LibreWolf is based on standard Firefox releases, not ESR; that may 
account for it, but I don’t know for sure.

Thanks,

  — Ian
Clément Lassieur Feb. 22, 2024, 10:21 a.m. UTC | #6 
On Wed, Feb 21 2024, Ian Eure wrote:

> Clément Lassieur <clement@lassieur.org> writes:
>
>> On Sat, Feb 17 2024, Ian Eure wrote:
>>
>>> Clément Lassieur <clement@lassieur.org> writes:
>>>
>>>> On Wed, Feb 14 2024, Mark H Weaver wrote:
>>>>
>>>>> Ian Eure <ian@retrospec.tv> writes:
>>>>>> * gnu/packages/icu4c.scm (icu4c-73): New variable.
>>>>>> * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable.
>>>>>
>>>>> The commit log should mention the changes to 'icecat-minimal' and
>>>>> 'make-torbrowser'.  Otherwise, looks good to me.
>>>>
>>>> I pushed this one (with small commit message updates), so we can have a
>>>> feeling that things are advancing :)
>>>>
>>>
>>> Thank you.  Do you think the nss patch is also mergeable?
>>
>> Do we know why this patch is necessary for librewolf and not for other
>> ESR based browsers?
>>
>
> LibreWolf is based on standard Firefox releases, not ESR; that may account for
> it, but I don’t know for sure.

I'm just confused by the description:

> +    (description
> +     "Full-featured browser client built from Firefox source tree, without
> +the official icon and the name \"firefox\".  This is the Extended Support
> +Release (ESR) version.")

Clément
Mark H Weaver Feb. 22, 2024, 2:34 p.m. UTC | #7 
Hi Ian,

Clément Lassieur <clement@lassieur.org> writes:

> I'm just confused by the description:
>
>> +    (description
>> +     "Full-featured browser client built from Firefox source tree, without
>> +the official icon and the name \"firefox\".  This is the Extended Support
>> +Release (ESR) version.")

The description above, apparently written by you, states that this
browser is "Full-featured", and the only differences mentioned between
Firefox and Librewolf are that it lacks the "official icon and the name
'firefox'".

Note that Firefox does not comply with the GNU FSDG.  For example,
Firefox supports EME, and that it also steers users towards nonfree
software, notably nonfree addons.  Therefore Firefox is not included in
Guix.

Can you tell me more about the differences between Firefox and
Librewolf?

      Thanks,
        Mark
Ian Eure Feb. 23, 2024, 12:56 a.m. UTC | #8 
Hi Mark,

Mark H Weaver <mhw@netris.org> writes:

> Hi Ian,
>
> Clément Lassieur <clement@lassieur.org> writes:
>
>> I'm just confused by the description:
>>
>>> +    (description
>>> +     "Full-featured browser client built from Firefox source 
>>> tree, without
>>> +the official icon and the name \"firefox\".  This is the 
>>> Extended Support
>>> +Release (ESR) version.")
>
> The description above, apparently written by you, states that 
> this
> browser is "Full-featured", and the only differences mentioned 
> between
> Firefox and Librewolf are that it lacks the "official icon and 
> the name
> 'firefox'".
>

Thank you for bringing this to my attention.  This is an artifact 
of the Firefox package definition I based this on, and isn’t an 
accurate description of LibreWolf.  I’ll correct this in the next 
version.


> Note that Firefox does not comply with the GNU FSDG.  For 
> example,
> Firefox supports EME, and that it also steers users towards 
> nonfree
> software, notably nonfree addons.  Therefore Firefox is not 
> included in
> Guix.
>
> Can you tell me more about the differences between Firefox and
> Librewolf?
>

I can’t enumerate every difference; if you have a question about 
specific feature(s), I’d be happy to answer that.  In general:

- LibreWolf permits use of their name and logo.
- Telemetry is disabled.
- User-hostile things like ads for Mozilla VPN are removed.
- DRM is disabled by default (but can be enabled by the user).
- Default settings have been adjusted for more security and/or 
  privacy.

This feature list covers most of the changes: 
https://librewolf.net/docs/features/

Additionally, the patch I submitted builds LibreWolf without EME 
support (which is what the other Firefox forks in Guix do); and 
uses GNU Mozzarella for extensions.

Thanks,

  — Ian
diff mbox series

Patch

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 5f77512427..094ff348e9 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -375,31 +375,6 @@  (define-public mozjs-78
      (list icu4c-69 readline zlib))))
 
 
-;;
-;; Needed for IceCat 115.
-;;
-(define icu4c-73-promise
-  (delay
-    (package
-      (inherit icu4c)
-      (version "73.1")
-      (source (origin
-                (method url-fetch)
-                (uri (string-append
-                      "https://github.com/unicode-org/icu/releases/download/release-"
-                      (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
-                      "/icu4c-"
-                      (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
-                      "-src.tgz"))
-                (sha256
-                 (base32
-                  "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
-                (patches
-                 (cons
-                  (search-patch
-                   "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
-                  (origin-patches (package-source icu4c)))))))))
-
 ;;;
 ;;; Localization helper procedures.
 ;;;
@@ -757,7 +732,7 @@  (define-public icecat-minimal
            ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
            ffmpeg-5
            libvpx
-           (force icu4c-73-promise)
+           icu4c-73
            pixman
            pulseaudio
            mesa
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 5aaf3a8361..0dfe63b20a 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -109,6 +109,28 @@  (define-public icu4c
     (license x11)
     (home-page "http://site.icu-project.org/")))
 
+(define-public icu4c-73
+  (package
+    (inherit icu4c)
+    (name "icu4c")
+    (version "73.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/unicode-org/icu/releases/download/release-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+                    "/icu4c-"
+                    (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+                    "-src.tgz"))
+              (sha256
+               (base32
+                "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))
+              (patches
+               (cons
+                (search-patch
+                 "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch")
+                (origin-patches (package-source icu4c))))))))
+
 (define-public icu4c-70
   (package
     (inherit icu4c)
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index c4ce997b99..ee5e072102 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -52,6 +52,7 @@  (define-module (gnu packages tor-browsers)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages hunspell)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libcanberra)
@@ -270,7 +271,7 @@  (define* (make-torbrowser #:key
            ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
            ffmpeg-5
            libvpx
-           (force (@@ (gnu packages gnuzilla) icu4c-73-promise))
+           icu4c-73
            pixman
            pulseaudio
            mesa