diff options
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 01647fedd9..71cffa64f5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,7 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.2.0-guix0-preview1") +(define %icecat-version "68.2.0-guix0-preview2") +(define %icecat-build-id "20191028000000") ;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' @@ -576,7 +577,7 @@ from forcing GEXP-PROMISE." (upstream-icecat-base-version "68.1.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "395cc0798600cde44a30abaa3f5d08ce8b68f782") + (gnuzilla-commit "aa7ab9483a64c43e77736917dd83841ccc437300") (gnuzilla-source (origin (method git-fetch) @@ -586,8 +587,10 @@ from forcing GEXP-PROMISE." (file-name (git-file-name "gnuzilla" upstream-icecat-base-version)) (sha256 (base32 - "1ll3j2kpsfp1f9dxy67fay1cidsng02l8a3a23wdjqkxgrg1cf4g")))) + "03jygq1zna621y0ba6370cff4v2g9l57g3015y3vxbahnmzn9msa")))) + (gnuzilla-fixes-patch + (local-file (search-patch "icecat-gnuzilla-fixes.patch"))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) @@ -634,6 +637,8 @@ from forcing GEXP-PROMISE." (with-directory-excursion "/tmp/gnuzilla" (make-file-writable "makeicecat") (invoke "patch" "--force" "--no-backup-if-mismatch" + "-p1" "--input" #+gnuzilla-fixes-patch) + (invoke "patch" "--force" "--no-backup-if-mismatch" "-p1" "--input" #+makeicecat-patch) (patch-shebang "makeicecat") (substitute* "makeicecat" @@ -772,10 +777,6 @@ from forcing GEXP-PROMISE." ;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) ;; ("icecat-use-system-media-libs.patch" ;; ,(search-patch "icecat-use-system-media-libs.patch")) - ("icecat-default-search-ddg.patch" - ,(search-patch "icecat-default-search-ddg.patch")) - ("icecat-disable-sync.patch" - ,(search-patch "icecat-disable-sync.patch")) ("patch" ,(canonical-package patch)) @@ -1008,6 +1009,7 @@ from forcing GEXP-PROMISE." (setenv "CONFIG_SHELL" bash) (setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13 (setenv "CC" "gcc") ; apparently needed when Stylo is enabled + (setenv "MOZ_BUILD_DATE" ,%icecat-build-id) ; avoid timestamp (mkdir "../build") (chdir "../build") (format #t "build directory: ~s~%" (getcwd)) @@ -1071,8 +1073,7 @@ from forcing GEXP-PROMISE." (pulseaudio-lib (string-append pulseaudio "/lib"))) (wrap-program (car (find-files lib "^icecat$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)) - `("MOZ_LEGACY_PROFILES" = ("1"))) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib))) #t)))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") |