[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: icecat-source: Make sure 'makeicecat' is the right version.
From: |
guix-commits |
Subject: |
02/03: gnu: icecat-source: Make sure 'makeicecat' is the right version. |
Date: |
Mon, 6 May 2019 10:37:15 -0400 (EDT) |
mhw pushed a commit to branch master
in repository guix.
commit 3e605b6998b6b5d748835bae6994a0ff01b0bd18
Author: Mark H Weaver <address@hidden>
Date: Mon May 6 10:20:32 2019 -0400
gnu: icecat-source: Make sure 'makeicecat' is the right version.
* gnu/packages/gnuzilla.scm (icecat-source): Check to make sure the
value of FFMAJOR in the 'makeicecat' script matches the major version
of IceCat being generated.
---
gnu/packages/gnuzilla.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 87e5193..c9b14cf 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -528,7 +528,13 @@ from forcing GEXP-PROMISE."
"-p1" "--input" #+makeicecat-patch)
(patch-shebang "makeicecat")
(substitute* "makeicecat"
- (("^FFMAJOR=.*")
+ (("^FFMAJOR=(.*)" all ffmajor)
+ (unless (string=? #$major-version
+ (string-trim-both ffmajor))
+ ;; The makeicecat script cannot be expected to work
+ ;; properly on a different version of Firefox, even if
+ ;; no errors occur during execution.
+ (error "makeicecat major version mismatch"))
(string-append "FFMAJOR=" #$major-version "\n"))
(("^FFMINOR=.*")
(string-append "FFMINOR=" #$minor-version "\n"))