apteryx pushed a commit to branch core-updates
in repository guix.
commit c02257b6d1bade6efa528271b55bf8d8ab7b0296
Merge: c371555a4b 0fe2c78cac
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Thu Apr 13 13:45:35 2023 -0400
Merge staging branch.
Conflicts resolved in:
gnu/packages/engineering.scm
gnu/packages/gnuzilla.scm
gnu/packages/photo.scm
NEWS | 3 +
gnu/local.mk | 9 +-
gnu/packages/audio.scm | 63 +-
gnu/packages/benchmark.scm | 41 +-
gnu/packages/build-tools.scm | 2 +-
gnu/packages/c.scm | 79 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/cdrom.scm | 1 +
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 12 +-
gnu/packages/crates-graphics.scm | 7 +-
gnu/packages/crates-io.scm | 2485 ++++++++++++++------
gnu/packages/databases.scm | 108 +-
gnu/packages/electronics.scm | 22 +-
gnu/packages/fonts.scm | 60 +-
gnu/packages/fontutils.scm | 77 +-
gnu/packages/freedesktop.scm | 292 ++-
gnu/packages/gl.scm | 23 +-
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnunet.scm | 151 +-
gnu/packages/gnuzilla.scm | 183 +-
gnu/packages/golang.scm | 6 +-
gnu/packages/graphics.scm | 163 +-
gnu/packages/gstreamer.scm | 91 +-
gnu/packages/ibus.scm | 38 +-
gnu/packages/image.scm | 7 +-
gnu/packages/jami.scm | 70 +-
gnu/packages/kde-frameworks.scm | 14 +-
gnu/packages/less.scm | 5 +-
gnu/packages/libcanberra.scm | 6 -
gnu/packages/linux.scm | 8 +-
gnu/packages/lisp.scm | 7 -
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 44 +-
gnu/packages/nss.scm | 10 +-
.../patches/glslang-install-static-libs.patch | 61 +
.../patches/jami-libjami-headers-search.patch | 45 +-
gnu/packages/patches/libcdio-glibc-compat.patch | 43 +
gnu/packages/patches/mariadb-link-libatomic.patch | 83 -
.../patches/openboardview-use-system-mpc.patch | 42 +
.../patches/openboardview-use-system-utf8.patch | 48 -
.../patches/orangeduck-mpc-fix-pkg-config.patch | 25 +
.../python-afdko-suppress-copyright-test.patch | 20 -
.../patches/python2-pyopenssl-openssl-compat.patch | 51 -
.../patches/rust-openssl-sys-no-vendor.patch | 30 +-
gnu/packages/patches/webkitgtk-libelogind.patch | 38 +
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 4 +-
gnu/packages/photo.scm | 6 +-
gnu/packages/python-check.scm | 9 +-
gnu/packages/python-compression.scm | 16 +-
gnu/packages/python-crypto.scm | 278 +--
gnu/packages/python-web.scm | 17 +-
gnu/packages/python-xyz.scm | 106 +-
gnu/packages/qt.scm | 1193 +++++-----
gnu/packages/rails.scm | 6 +
gnu/packages/ruby.scm | 22 +-
gnu/packages/rust-apps.scm | 24 +-
gnu/packages/sdl.scm | 82 +-
gnu/packages/syndication.scm | 6 +-
gnu/packages/telephony.scm | 11 +-
gnu/packages/toolkits.scm | 58 +-
gnu/packages/unicode.scm | 18 +-
gnu/packages/version-control.scm | 4 +
gnu/packages/video.scm | 102 +-
gnu/packages/vulkan.scm | 258 +-
gnu/packages/web.scm | 18 +-
gnu/packages/webkit.scm | 62 +-
gnu/packages/xiph.scm | 8 +-
gnu/packages/xorg.scm | 212 +-
gnu/tests/databases.scm | 6 +-
guix/build/qt-utils.scm | 5 +-
72 files changed, 4173 insertions(+), 2953 deletions(-)
diff --cc gnu/packages/gnuzilla.scm
index 932c0f9951,af809d69c5..c17ce2719e
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1116,8 -1116,178 +1118,178 @@@ standards of the IceCat project."
"ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th"
"tl"
"tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
+ (define icecat-102.9.0-source
+ (let* ((base-version "102.9.0")
+ (version "102.9.0-guix0-preview1")
+ (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-source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/firefox/releases/";
+ upstream-firefox-version "/source/"
+ "firefox-" upstream-firefox-version ".source.tar.xz"))
+ (sha256
+ (base32
+ "1l8xlbba8sa9dg132k96ch8mz97i5lyhpvkxi8d85jh97xi79c1i"))))
+
+ ;; The upstream-icecat-base-version may be older than the
+ ;; base-version.
+ (upstream-icecat-base-version base-version)
+ (gnuzilla-commit "f55ede39713d1533734f37e39927cbb78abe1604")
+ (gnuzilla-source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://git.savannah.gnu.org/gnuzilla.git")
+ (commit gnuzilla-commit)))
+ (file-name (git-file-name "gnuzilla"
+ ;;upstream-icecat-base-version
+ (string-take gnuzilla-commit 8)))
+ (sha256
+ (base32
+ "0z15h3lxfn9pmj5bj62qim3h320dcd2v69xrg1phb7lh5gq0bylf"))))
+
+ ;; 'search-patch' returns either a valid file name or #f, so wrap it
+ ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
+ (makeicecat-patch
+ (local-file (assume-valid-file-name
+ (search-patch "icecat-makeicecat.patch")))))
+
+ (origin
+ (method computed-origin-method)
+ (file-name (string-append "icecat-" version ".tar.xz"))
+ (sha256 #f)
+ (uri
+ (delay
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (let ((firefox-dir
+ (string-append "firefox-" #$base-version))
+ (icecat-dir
+ (string-append "icecat-" #$version)))
+
+ (set-path-environment-variable
+ "PATH" '("bin")
+ (list #+python
+ #+(canonical-package bash)
+ #+(canonical-package coreutils)
+ #+(canonical-package findutils)
+ #+(canonical-package patch)
+ #+(canonical-package xz)
+ #+(canonical-package sed)
+ #+(canonical-package grep)
+ #+(canonical-package bzip2)
+ #+(canonical-package gzip)
+ #+(canonical-package tar)))
+
+ (set-path-environment-variable
+ "PYTHONPATH"
+ (list #+(format #f "lib/python~a/site-packages"
+ (version-major+minor
+ (package-version python))))
+ '#+(cons python-jsonschema
+ (map second
+ (package-transitive-propagated-inputs
+ python-jsonschema))))
+
+ ;; Needed by the 'makeicecat' script.
+ (setenv "RENAME_CMD" "rename")
+
+ ;; We copy the gnuzilla source directory because it is
+ ;; read-only in 'gnuzilla-source', and the makeicecat script
+ ;; uses "cp -a" to copy parts of it and assumes that the
+ ;; copies will be writable.
+ (copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
+ #:log (%make-void-port "w"))
+
+ (with-directory-excursion "/tmp/gnuzilla"
+ (make-file-writable "makeicecat")
+ (invoke "patch" "--force" "--no-backup-if-mismatch"
+ "-p1" "--input" #+makeicecat-patch)
+ (patch-shebang "makeicecat")
+ (substitute* "makeicecat"
+ (("^readonly 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 "readonly FFMAJOR=" #$major-version "\n"))
+ (("^readonly FFMINOR=.*")
+ (string-append "readonly FFMINOR=" #$minor-version "\n"))
+ (("^readonly FFSUB=.*")
+ (string-append "readonly FFSUB=" #$sub-version "\n"))
+ (("^readonly DATADIR=.*")
+ "readonly DATADIR=/tmp/gnuzilla/data\n")
+ (("^readonly SOURCEDIR=.*")
+ (string-append "readonly SOURCEDIR=" icecat-dir "\n"))
+ (("/bin/sed")
+ #+(file-append (canonical-package sed) "/bin/sed"))))
+
+ (format #t "Unpacking upstream firefox tarball...~%")
+ (force-output)
+ (invoke "tar" "xf" #+upstream-firefox-source)
+ (rename-file firefox-dir icecat-dir)
+
+ (with-directory-excursion icecat-dir
+ (format #t "Populating l10n directory...~%")
+ (force-output)
+ (mkdir "l10n")
+ (with-directory-excursion "l10n"
+ (for-each
+ (lambda (locale-dir)
+ (let ((locale
+ (string-drop (basename locale-dir)
+ (+ 32 ; length of hash
+ (string-length
"-mozilla-locale-")))))
+ (format #t " ~a~%" locale)
+ (force-output)
+ (copy-recursively locale-dir locale
+ #:log (%make-void-port "w"))
+ (for-each make-file-writable (find-files locale))
+ (with-directory-excursion locale
+ (when (file-exists? ".hgtags")
+ (delete-file ".hgtags"))
+ (mkdir-p "browser/chrome/browser/preferences")
+ (call-with-output-file
+
"browser/chrome/browser/preferences/advanced-scripts.dtd"
+ (lambda (port) #f)))))
+ '#+all-mozilla-locales)
+ (copy-recursively #+mozilla-compare-locales
+ "compare-locales"
+ #:log (%make-void-port "w"))
+ (delete-file "compare-locales/.gitignore")
+ (delete-file "compare-locales/.hgignore")
+ (delete-file "compare-locales/.hgtags")))
+
+ (format #t "Running makeicecat script...~%")
+ (force-output)
+ (invoke "bash" "/tmp/gnuzilla/makeicecat")
+
+ (format #t "Packing IceCat source tarball...~%")
+ (force-output)
+ (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args)))
+ (invoke "tar" "cfa" #$output
+ ;; Avoid non-determinism in the archive. We set the
+ ;; mtime of files in the archive to early 1980 because
+ ;; the build process fails if the mtime of source
+ ;; files is pre-1980, due to the creation of zip
+ ;; archives.
+ "--mtime=@315619200" ; 1980-01-02 UTC
+ "--owner=root:0"
+ "--group=root:0"
+ "--sort=name"
+ icecat-dir)))))))))
+
-(define %icedove-build-id "20230328000000") ;must be of the form
YYYYMMDDhhmmss
-(define %icedove-version "102.9.1")
+(define %icedove-build-id "20230411000000") ;must be of the form
YYYYMMDDhhmmss
+(define %icedove-version "102.10.0")
;; Provides the "comm" folder which is inserted into the icecat source.
;; Avoids the duplication of Icecat's source tarball.
