[bug#75499] [PATCH 0/3] gnu: librewolf: Update to 133.0.3-1.

[bug#75499] [PATCH 0/3] gnu: librewolf: Update to 133.0.3-1.

[Ian Eure]

Fairly straightforwaard update.  Paramaterized `make-librewolf-source' to
accept the l10n package.

Ian Eure (3):
  gnu: firefox-l10n: Update to d219efa7c64850dfb5904893e17a5431c7058192.
  gnu: librewolf: Update to 133.0.3-1.
  gnu: make-librewolf-source: Take l10n package as an arg.

 gnu/packages/librewolf.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

-- 
2.47.1

[bug#75499] [PATCH 1/3] gnu: firefox-l10n: Update to d219efa7c64850dfb5904893e17a5431c7058192.

[Ian Eure]

* gnu/packages/librewolf.scm (firefox-l10n): Update to d219efa7c64850dfb5904893e17a5431c7058192.

Change-Id: Ia4303f13a0cbf7c4908410b735b509a4a5f505cd
---
 gnu/packages/librewolf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 42bae0fbc0..2011e261e4 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -117,14 +117,14 @@ (define (librewolf-source-origin version hash)
 (define computed-origin-method (@@ (guix packages) computed-origin-method))
 
 (define firefox-l10n
-  (let ((commit "bdfd4e10606204450a3e88d219ecf2b252349c2b"))
+  (let ((commit "d219efa7c64850dfb5904893e17a5431c7058192"))
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/mozilla-l10n/firefox-l10n.git")
             (commit commit)))
       (file-name (git-file-name "firefox-l10n" commit))
-      (sha256 (base32 "0i31b1024jck6467j9phcqvac32psl4nkyb0nm4h9zzyj8zw31xp")))))
+      (sha256 (base32 "0g778fnxg5mkqm3rgryzl64f3n4pczngjdlby07vh2dycvmlyga8")))))
 
 (define* (make-librewolf-source #:key version firefox-hash librewolf-hash)
   (let* ((ff-src (firefox-source-origin
-- 
2.47.1

[bug#75499] [PATCH 2/3] gnu: librewolf: Update to 133.0.3-1.

[Ian Eure]

Upstream bugfix release.  There were no 133.0.1 or .2 Firefox releases,
133.0.3 follows 133.0.  This is straightforward update, other than switching
from gzip to pigz, which is a LibreWolf upstream change.

* gnu/packages/librewolf.scm (librewolf): Update to 133.0.3-1.

Change-Id: I40d305f16bd5a7b55f0d40a3e8885abd2cf2de0a
---
 gnu/packages/librewolf.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 2011e261e4..1d58191e0c 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -154,7 +154,7 @@ (define* (make-librewolf-source #:key version firefox-hash librewolf-hash)
                       #+(canonical-package xz)
                       #+(canonical-package sed)
                       #+(canonical-package grep)
-                      #+(canonical-package gzip)
+                      #+(canonical-package pigz)
                       #+(canonical-package tar)))
                (set-path-environment-variable
                 "PYTHONPATH"
@@ -203,17 +203,17 @@ (define rust-librewolf rust) ; 1.75 is the default in Guix, 1.65 is the minimum.
 ;; Update this id with every update to its release date.
 ;; It's used for cache validation and therefore can lead to strange bugs.
 ;; ex: date '+%Y%m%d%H%M%S'
-(define %librewolf-build-id "20241130102406")
+(define %librewolf-build-id "20241215105141")
 
 (define-public librewolf
   (package
     (name "librewolf")
-    (version "133.0-1")
+    (version "133.0.3-1")
     (source
      (make-librewolf-source
       #:version version
-      #:firefox-hash "0q6cqfnwc2x09frdvsndmhck8ixrnbl281j9rqw5w8bd7fd2qas9"
-      #:librewolf-hash "1xf7gx3xm3c7dhch9gwpb0xp11lcyim1nrbm8sjljxdcs7iq9jy4"))
+      #:firefox-hash "06ya18ma1gndci0aygz75hidn3kwa1kji78g8smh7fq0091aad7i"
+      #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.47.1

[bug#75499] [PATCH 3/3] gnu: make-librewolf-source: Take l10n package as an arg.

[Ian Eure]

* gnu/packages/librewolf.scm (make-librewolf-source): Take l10n package as an
arg.

Change-Id: I3c405edc07edb54e27afee16325c93a83d37ad79
---
 gnu/packages/librewolf.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 1d58191e0c..a4eb45f03e 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz>
-;;; Copyright © 2023 Ian Eure <ian@retrospec.tv>
+;;; Copyright © 2023, 2024, 2025 Ian Eure <ian@retrospec.tv>
 ;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
@@ -126,7 +126,7 @@ (define firefox-l10n
       (file-name (git-file-name "firefox-l10n" commit))
       (sha256 (base32 "0g778fnxg5mkqm3rgryzl64f3n4pczngjdlby07vh2dycvmlyga8")))))
 
-(define* (make-librewolf-source #:key version firefox-hash librewolf-hash)
+(define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
   (let* ((ff-src (firefox-source-origin
                   (car (string-split version #\-))
                   firefox-hash))
@@ -182,7 +182,7 @@ (define* (make-librewolf-source #:key version firefox-hash librewolf-hash)
                  (substitute* "scripts/librewolf-patches.py"
                    (("l10n_dir = Path(\"..\", \"l10n\")")
                     (string-append
-                     "l10n_dir = \"" #+firefox-l10n "\""))))
+                     "l10n_dir = \"" #+l10n "\""))))
 
                ;; Run the build script
                (invoke "make" "all")
@@ -213,7 +213,8 @@ (define-public librewolf
      (make-librewolf-source
       #:version version
       #:firefox-hash "06ya18ma1gndci0aygz75hidn3kwa1kji78g8smh7fq0091aad7i"
-      #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"))
+      #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"
+      #:l10n firefox-l10n))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.47.1

[bug#75499] QA review for 75499

[Rodion Goritskov]

user guix
usertag 75499 + reviewed-looks-good
thanks

Guix QA review form submission:
Builds, starts, works fine

Items marked as checked: Lint warnings, Package builds, Commit messages