[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top le
From: |
Maxim Cournoyer |
Subject: |
bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top level. |
Date: |
Sun, 19 Feb 2023 14:23:59 -0500 |
* gnu/packages/gnuzilla.scm (%icecat-base-version): New variable.
(%icecat-version): Define in terms of %icecat-base-version.
(icecat-source): Adjust to use the above newly introduced variables.
---
Changes in v4:
- Re-obfuscate upstream-firefox-source
gnu/packages/gnuzilla.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 3a742d06c6..bb379a7fb1 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -496,20 +496,19 @@ (define all-mozilla-locales
;; XXXX: Workaround 'snippet' limitations.
(define computed-origin-method (@@ (guix packages) computed-origin-method))
-(define %icecat-version "102.8.0-guix0-preview1")
+(define %icecat-base-version "102.8.0")
+(define %icecat-version (string-append %icecat-base-version "-guix0-preview1"))
(define %icecat-build-id "20230214000000") ;must be of the form YYYYMMDDhhmmss
;; 'icecat-source' is a "computed" origin that generates an IceCat tarball
;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat'
;; script from the upstream IceCat project.
(define icecat-source
- (let* ((base-version (first (string-split %icecat-version #\-)))
+ (let* ((major-version (first (string-split %icecat-base-version #\.)))
+ (minor-version (second (string-split %icecat-base-version #\.)))
+ (sub-version (third (string-split %icecat-base-version #\.)))
- (major-version (first (string-split base-version #\.)))
- (minor-version (second (string-split base-version #\.)))
- (sub-version (third (string-split base-version #\.)))
-
- (upstream-firefox-version (string-append base-version "esr"))
+ (upstream-firefox-version (string-append %icecat-base-version "esr"))
(upstream-firefox-source
(origin
(method url-fetch)
@@ -521,8 +520,9 @@ (define icecat-source
(base32
"0j6afrgfsmd0adbbmffw4p1f2hznpck9d36z3bsjx36f7cjgdy27"))))
- (upstream-icecat-base-version "102.8.0") ; maybe older than
base-version
- ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
+ ;; The upstream-icecat-base-version may be older than the
+ ;; %icecat-base-version.
+ (upstream-icecat-base-version "102.8.0")
(gnuzilla-commit "03d9e3db5affe21db077c410ec08c313d6aa280e")
(gnuzilla-source
(origin
@@ -553,7 +553,7 @@ (define icecat-source
#~(begin
(use-modules (guix build utils))
(let ((firefox-dir
- (string-append "firefox-" #$base-version))
+ (string-append "firefox-" #$%icecat-base-version))
(icecat-dir
(string-append "icecat-" #$%icecat-version)))
--
2.39.1
- bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 2/9] gnu: icedove: Compute a self-contained source., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 3/9] gnu: Define %icecat-base-version at the top level.,
Maxim Cournoyer <=
- bug#32026: [PATCH v4 9/9] gnu: icecat: Unbundle nss and nspr., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 8/9] gnu: icecat: Remove gtk+-2 input., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 4/9] gnu: Add icecat-l10n and icedove-l10n., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 6/9] gnu: Add language packs to icecat and icedove., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 5/9] gnu: icedove: Automatically load system-provided extensions., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 7/9] gnu: icedove: Use the locale of the system., Maxim Cournoyer, 2023/02/19
- bug#32026: [PATCH v4 1/9] gnu: Add a 'update-mozilla-locales' helper for maintenance., Mark H Weaver, 2023/02/19