* [bug#43647] [PATCH 0/3] Update icedove to 78
@ 2020-09-27 10:41 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 1/3] gnu: Add nss@3.56 Jonathan Brielmaier
2020-09-28 18:56 ` bug#43647: [PATCH 0/3] Update icedove to 78 Mark H Weaver
0 siblings, 2 replies; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-09-27 10:41 UTC (permalink / raw)
To: 43647; +Cc: Jonathan Brielmaier
Hi,
this patch series updates icedove to 78.3.0. So the new ESR line based
on icecat 78. We need nss@3.56 to build icedove 78. The last patch removes
the temporary workarounds from Mark in c7011ff850420fdbe1319b3d218bd362f2f9d618.
I'm using the new icedove for several days and it's quite nice :)
Jonathan Brielmaier (3):
gnu: Add nss@3.56.
gnu: icedove: Update to 78.3.0.
gnu: Remove icecat-68 signs.
gnu/local.mk | 1 +
gnu/packages/gnuzilla.scm | 329 ++----------------
gnu/packages/nss.scm | 92 +++++
gnu/packages/patches/nss-3.56-pkgconfig.patch | 228 ++++++++++++
4 files changed, 346 insertions(+), 304 deletions(-)
create mode 100644 gnu/packages/patches/nss-3.56-pkgconfig.patch
--
2.28.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 1/3] gnu: Add nss@3.56.
2020-09-27 10:41 [bug#43647] [PATCH 0/3] Update icedove to 78 Jonathan Brielmaier
@ 2020-09-27 10:44 ` Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs Jonathan Brielmaier
2020-09-28 18:56 ` bug#43647: [PATCH 0/3] Update icedove to 78 Mark H Weaver
1 sibling, 2 replies; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-09-27 10:44 UTC (permalink / raw)
To: 43647; +Cc: Jonathan Brielmaier
Icedove 78 requires nss > 3.53. This version is the only one building
out-of-the-box.
* gnu/packages/nss.scm (nss-3.56): New variable.
* gnu/packages/patches/nss-3.56-pkgconfig.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
gnu/local.mk | 1 +
gnu/packages/nss.scm | 92 +++++++
gnu/packages/patches/nss-3.56-pkgconfig.patch | 228 ++++++++++++++++++
3 files changed, 321 insertions(+)
create mode 100644 gnu/packages/patches/nss-3.56-pkgconfig.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f3b5b17e84..da56f8a6ab 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1361,6 +1361,7 @@ dist_patch_DATA = \
%D%/packages/patches/nsis-env-passthru.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \
+ %D%/packages/patches/nss-3.56-pkgconfig.patch \
%D%/packages/patches/ntfs-3g-CVE-2019-9755.patch \
%D%/packages/patches/nvi-assume-preserve-path.patch \
%D%/packages/patches/nvi-dbpagesize-binpower.patch \
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index b19ad7e1e9..32267b0a83 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -191,3 +192,94 @@ applications. Applications built with NSS can support SSL v2 and v3, TLS,
PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other
security standards.")
(license license:mpl2.0)))
+
+(define-public nss-3.56
+ (package
+ (inherit nss)
+ (version "3.56")
+ (source (origin
+ (method url-fetch)
+ (uri (let ((version-with-underscores
+ (string-join (string-split version #\.) "_")))
+ (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
+ "releases/NSS_" version-with-underscores "_RTM/src/"
+ "nss-" version ".tar.gz")))
+ (sha256
+ (base32
+ "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq"))
+ ;; Create nss.pc and nss-config.
+ (patches (search-patches "nss-3.56-pkgconfig.patch"
+ "nss-increase-test-timeout.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Delete the bundled copy of these libraries.
+ (delete-file-recursively "nss/lib/zlib")
+ (delete-file-recursively "nss/lib/sqlite")
+ #t))))
+ (arguments
+ `(#:parallel-build? #f ; not supported
+ #:make-flags
+ (let* ((out (assoc-ref %outputs "out"))
+ (nspr (string-append (assoc-ref %build-inputs "nspr")))
+ (rpath (string-append "-Wl,-rpath=" out "/lib/nss")))
+ (list "-C" "nss" (string-append "PREFIX=" out)
+ "NSDISTMODE=copy"
+ "NSS_USE_SYSTEM_SQLITE=1"
+ (string-append "NSPR_INCLUDE_DIR=" nspr "/include/nspr")
+ ;; Add $out/lib/nss to RPATH.
+ (string-append "RPATH=" rpath)
+ (string-append "LDFLAGS=" rpath)))
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (ice-9 ftw)
+ (ice-9 match)
+ (srfi srfi-26))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (setenv "CC" "gcc")
+ ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
+ ,@(match (%current-system)
+ ((or "x86_64-linux" "aarch64-linux")
+ `((setenv "USE_64" "1")))
+ (_
+ '()))
+ #t))
+ (replace 'check
+ (lambda _
+ ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for testing.
+ ;; The later requires a working DNS or /etc/hosts.
+ (setenv "DOMSUF" "localdomain")
+ (setenv "USE_IP" "TRUE")
+ (setenv "IP_ADDRESS" "127.0.0.1")
+
+ ;; The "PayPalEE.cert" certificate expires every six months,
+ ;; leading to test failures:
+ ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
+ ;; work around that, set the time to roughly the release date.
+ (invoke "faketime" "2020-02-01" "./nss/tests/all.sh")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append (assoc-ref outputs "bin") "/bin"))
+ (inc (string-append out "/include/nss"))
+ (lib (string-append out "/lib/nss"))
+ (obj (match (scandir "dist" (cut string-suffix? "OBJ" <>))
+ ((obj) (string-append "dist/" obj)))))
+ ;; Install nss-config to $out/bin.
+ (install-file (string-append obj "/bin/nss-config")
+ (string-append out "/bin"))
+ (delete-file (string-append obj "/bin/nss-config"))
+ ;; Install nss.pc to $out/lib/pkgconfig.
+ (install-file (string-append obj "/lib/pkgconfig/nss.pc")
+ (string-append out "/lib/pkgconfig"))
+ (delete-file (string-append obj "/lib/pkgconfig/nss.pc"))
+ (rmdir (string-append obj "/lib/pkgconfig"))
+ ;; Install other files.
+ (copy-recursively "dist/public/nss" inc)
+ (copy-recursively (string-append obj "/bin") bin)
+ (copy-recursively (string-append obj "/lib") lib)
+ #t))))))))
diff --git a/gnu/packages/patches/nss-3.56-pkgconfig.patch b/gnu/packages/patches/nss-3.56-pkgconfig.patch
new file mode 100644
index 0000000000..42fff822bc
--- /dev/null
+++ b/gnu/packages/patches/nss-3.56-pkgconfig.patch
@@ -0,0 +1,228 @@
+Description: Create nss.pc and nss-config
+Author: Lars Wendler <polynomial-c@gentoo.org>
+Source: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch
+
+Modifications:
+ Change libdir from ${prefix}/lib64 to ${prefix}/lib/nss.
+ Remove optional patching in nss/Makefile.
+ Include -L$libdir in output from "nss-config --libs".
+
+Later adapted to apply cleanly to nss-3.53.
+
+--- nss-3.21/nss/config/Makefile
++++ nss-3.21/nss/config/Makefile
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ..
++DEPTH = ..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib/nss," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ cp nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ cp nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- nss-3.21/nss/config/nss-config.in
++++ nss-3.21/nss/config/nss-config.in
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++ nssutil
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nss=yes
++lib_nssutil=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs=-L$libdir
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ echo $libdirs
++fi
++
+--- nss-3.21/nss/config/nss.pc.in
++++ nss-3.21/nss/config/nss.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
++Cflags: -I${includedir}
++
+--- nss-3.21/nss/manifest.mn
++++ nss-3.21/nss/manifest.mn
+@@ -10,7 +10,7 @@
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd cpputil gtests
++DIRS = coreconf lib cmd cpputil gtests config
+
+ lib: coreconf
+ cmd: lib
--
2.28.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0.
2020-09-27 10:44 ` [bug#43647] [PATCH 1/3] gnu: Add nss@3.56 Jonathan Brielmaier
@ 2020-09-27 10:44 ` Jonathan Brielmaier
2020-09-27 23:25 ` Mark H Weaver
2020-09-27 10:44 ` [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs Jonathan Brielmaier
1 sibling, 1 reply; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-09-27 10:44 UTC (permalink / raw)
To: 43647; +Cc: Jonathan Brielmaier
* gnu/packages/gnuzilla.scm (icedove): Update to 78.3.0.
[source]: Use source from Icecat 78.
[arguments]: Use more flexible approach for generating cargo checksums
from icecat. Update files in 'rename-to-icedove phase. Remove gone
configure flags and rename `--disable-ion` to `--disable-jit`.
[inputs]: Update icu4c to version 67 and nss to 3.56.
[native-inputs]: Use ESR 78 mercurial repo for thunderbird soruces.
Update rust and cargo to 1.41, rust-cbindgen to 0.14 and
node to 10.22.
Tested-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
---
gnu/packages/gnuzilla.scm | 56 +++++++++++++++++----------------------
1 file changed, 25 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 85ad9678d0..873cccaa9c 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1430,12 +1430,12 @@ standards of the IceCat project.")
#t))))))))
;; Update this together with icecat!
-(define %icedove-build-id "20200825000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20200924000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove
(package
(name "icedove")
- (version "68.12.0")
- (source icecat-68-source)
+ (version "78.3.0")
+ (source icecat-source)
(properties
`((cpe-name . "thunderbird_esr")))
(build-system gnu-build-system)
@@ -1460,10 +1460,15 @@ standards of the IceCat project.")
(lambda _
(use-modules (guix build cargo-utils))
(let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
- (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
- (("(\"checksum .* = )\".*\"" all name)
- (string-append name "\"" null-hash "\"")))
- (generate-all-checksums "third_party/rust"))
+ (for-each (lambda (file)
+ (format #t "patching checksums in ~a~%" file)
+ (substitute* (find-files "." "Cargo.lock$")
+ (("^checksum = \".*\"")
+ (string-append "checksum = \"" null-hash "\""))))
+ (find-files "." "Cargo.lock$"))
+ (for-each generate-all-checksums
+ '("third_party/rust"
+ "toolkit/library/rust")))
#t))
;; Fixes issue where each installation directory generates its own profile.
;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457
@@ -1505,12 +1510,10 @@ standards of the IceCat project.")
(("mozilla.org") "guix.gnu.org")))
;; Remove other mentions of Thunderbird in user-visible text.
(with-directory-excursion "comm/mail/base/content"
- (substitute* '("newInstallPage.xhtml"
- "overrides/app-license-name.html"
- "newInstall.xul")
+ (substitute* '("overrides/app-license-name.html")
(("Thunderbird") "Icedove")))
(with-directory-excursion "comm/mail/components/"
- (substitute* '("mailGlue.js"
+ (substitute* '("MailGlue.jsm"
"extensions/schemas/addressBook.json"
"extensions/schemas/tabs.json"
"extensions/schemas/cloudFile.json"
@@ -1520,14 +1523,9 @@ standards of the IceCat project.")
"im/messages/mail/Info.plist"
"enterprisepolicies/moz.build"
"enterprisepolicies/helpers/moz.build"
- "enterprisepolicies/schemas/moz.build"
- "preferences/chat.inc.xul")
+ "enterprisepolicies/schemas/moz.build")
(("Thunderbird") "Icedove")))
- (substitute* "comm/calendar/lightning/lightning-packager.mk"
- (("ifeq \\(thunderbird")
- "ifeq (icedove"))
(substitute* '("comm/mailnews/base/prefs/content/accountUtils.js"
- "comm/mailnews/extensions/newsblog/content/feed-subscriptions.js"
"comm/common/src/customizeToolbar.js")
(("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e)
(format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e)))
@@ -1600,8 +1598,7 @@ standards of the IceCat project.")
"ac_add_options --disable-debug\n"
"ac_add_options --disable-debug-symbols\n"
"ac_add_options --disable-elf-hack\n"
- "ac_add_options --disable-gconf\n"
- "ac_add_options --disable-ion\n"
+ "ac_add_options --disable-jit\n"
"ac_add_options --disable-necko-wifi\n"
"ac_add_options --disable-official-branding\n"
"ac_add_options --disable-tests\n"
@@ -1609,16 +1606,13 @@ standards of the IceCat project.")
"ac_add_options --disable-webrtc\n"
"ac_add_options --enable-application=comm/mail\n"
"ac_add_options --enable-calendar\n"
- "ac_add_options --enable-content-sandbox\n"
"ac_add_options --enable-default-toolkit=\"cairo-gtk3\"\n"
"ac_add_options --enable-optimize\n"
"ac_add_options --enable-pulseaudio\n"
"ac_add_options --enable-release\n"
- "ac_add_options --enable-startup-notification\n"
"ac_add_options --enable-strip\n"
"ac_add_options --enable-system-ffi\n"
"ac_add_options --enable-system-pixman\n"
- "ac_add_options --enable-system-sqlite\n"
"ac_add_options --prefix=" out "\n"
"ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n"
"ac_add_options --with-distribution-id=org.gnu\n"
@@ -1689,7 +1683,7 @@ standards of the IceCat project.")
("gtk+" ,gtk+)
("gtk+-2" ,gtk+-2)
("hunspell" ,hunspell)
- ("icu4c" ,icu4c)
+ ("icu4c" ,icu4c-67)
("libcanberra" ,libcanberra)
("libevent" ,libevent)
("libffi" ,libffi)
@@ -1705,7 +1699,7 @@ standards of the IceCat project.")
("mesa" ,mesa)
("mit-krb5" ,mit-krb5)
("nspr" ,nspr)
- ("nss" ,nss)
+ ("nss" ,nss-3.56)
("pango" ,pango)
("pixman" ,pixman)
("pulseaudio" ,pulseaudio)
@@ -1720,28 +1714,28 @@ standards of the IceCat project.")
;; in the Thunderbird release tarball. We don't use the release
;; tarball because it duplicates the Icecat sources and only adds the
;; "comm" directory, which is provided by this repository.
- ,(let ((changeset "b41cdff70b185358d9c4c1d4a36cfad15a24f001"))
+ ,(let ((changeset "35e647ebd4fa09407a0fe151d3823b1b58172a2a"))
(origin
(method hg-fetch)
(uri (hg-reference
- (url "https://hg.mozilla.org/releases/comm-esr68")
+ (url "https://hg.mozilla.org/releases/comm-esr78")
(changeset changeset)))
(file-name (string-append "thunderbird-" version "-checkout"))
(sha256
(base32
- "1xvky8p5r41mxdyg9amydy94p51wmmdwdz0zq2vzspr9viixf7xm")))))
+ "0g27rapn1xf19i5pl2g12hndb55shzsk4vrrc6bnj4vf2q49zcwy")))))
("autoconf" ,autoconf-2.13)
- ("cargo" ,rust "cargo")
+ ("cargo" ,rust-1.41 "cargo")
("clang" ,clang)
("llvm" ,llvm)
("nasm" ,nasm)
- ("node" ,node)
+ ("node" ,node-10.22)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python)
("python2" ,python-2.7)
- ("rust" ,rust)
- ("rust-cbindgen" ,rust-cbindgen)
+ ("rust" ,rust-1.41)
+ ("rust-cbindgen" ,rust-cbindgen-0.14)
("which" ,which)
("yasm" ,yasm)))
(home-page "https://www.thunderbird.net")
--
2.28.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs.
2020-09-27 10:44 ` [bug#43647] [PATCH 1/3] gnu: Add nss@3.56 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0 Jonathan Brielmaier
@ 2020-09-27 10:44 ` Jonathan Brielmaier
2020-09-27 23:33 ` Mark H Weaver
1 sibling, 1 reply; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-09-27 10:44 UTC (permalink / raw)
To: 43647; +Cc: Jonathan Brielmaier
It was necessary for icedove@68 which is now based on icecat@78.
* gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove.
(all-mozilla-68-locales): Remove.
(%icecat-68-version): Remove.
(icecat-68-source): Remove.
---
gnu/packages/gnuzilla.scm | 273 --------------------------------------
1 file changed, 273 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 873cccaa9c..ddbc483d32 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1156,279 +1156,6 @@ standards of the IceCat project.")
(cpe-name . "firefox_esr")
(cpe-version . ,(first (string-split version #\-)))))))
-(define mozilla-68-compare-locales
- (origin
- (method hg-fetch)
- (uri (hg-reference
- (url "https://hg.mozilla.org/l10n/compare-locales/")
- (changeset "RELEASE_3_3_0")))
- (file-name "mozilla-68-compare-locales")
- (sha256 (base32 "0biazbq7vbi99b99rfn4szwyx032dkpi09c9z4zs6f1br0f86iy1"))))
-
-(define all-mozilla-68-locales
- (mozilla-locales
- ;; sha256 changeset locale
- ;;---------------------------------------------------------------------------
- ("0pybx6j2ycbrr1xmv0spv19sd8a1dyzcs8kf6pzn71w8y6kiagcf" "35959cf2343c" "ach")
- ("0dixmkha738w7fkx20nx95xkfyrqb9vczpy6m03qnqfvb76xaxj5" "e8dc1010f909" "af")
- ("124j09va25gwfxdzyfixrli0skxv53c7niagjyp7g3a3kcv2lbhc" "4c67f6b96a7b" "an")
- ("0flgqll3xx0ym0zj0w9j2jw3fmhs6h9m4l5da6m0bpnk5ff80r06" "34cbea5f44a5" "ar")
- ("0kdb1yqfbfz508f4p77z3p1v6fwy190vs5ipj58hgdixjgbxkqay" "b4790b27633c" "ast")
- ("1vm5xw6wg12pygswd3p0qpkaxyryah6nif5n15chb4sb42c1gqcm" "96d341bf49d4" "az")
- ("1j2qrrws51qij6haz5b77n5vzqhsxgs1ppqqw4mdrkacwvz4ciwh" "4adaede00646" "be")
- ("0ydr8f9lbd51prgcbjb5yacb461j8va0s5bqfs0rnglkvhmk6ard" "d1140972aefe" "bg")
- ("0wyw90zjp8kpd1gljng00in9wr2cf59ww6z002lgx5k4gibnqcfd" "2b3ce92c2310" "bn")
- ("0kkq621h1qdmimyrmms9g5p70m54z2ddw4cd962nqbkrnmabq9vn" "426896350893" "br")
- ("0vibhnb3cbpbgf10db04g6vm372kb9i27p0jkwif019f7qprswd8" "7463f339ce07" "bs")
- ("1l8cn2fqfvx7bswzfy9vavv8cd32ha9ygdxxdbxi64wcgw0f80bf" "dab3f05125e4" "ca")
- ("0fik17y8zyg9w82lq501ic73a53c0q9r8v4zgn9bnzgsygig8qpq" "ebb9d989275a" "cak")
- ("0sj29v6144h39wzb4rvxph3cwgvs4gzkgpr0463d3fcs6jdi0kjs" "522352780348" "cs")
- ("1nz8jlx62l69jcdi59hlk8jysm15sh3d1cxqginjmx7w351wsidm" "0791b954c333" "cy")
- ("1vc01q1vlq26xm1vm1x0119jawxxp975p9k8ashmiwncl1bvqb48" "121f5f876f4c" "da")
- ("1iqny61rg57banfbbskc2y3pr6d35fabnxmynv7vxm9jd86pndz3" "95fb3e99a2bc" "de")
- ("06v9j8acx5h8za7m65v6qm0wjbkx6vm46m8sigcp69phyg3fjc96" "90e681b74587" "dsb")
- ("0lbk90x2dxdbh63fycqxspx6jqq2zlzys6grg45balw8yyvzqrkz" "58ba4c13fd42" "el")
- ("0c2ypvy0z8g78s5158v6h9khckq1xps34r5wbiiciix289m43dgl" "8953d8c98a30" "en-CA")
- ("0z3riz3w2z6p710p90ridmwwam4snnz5mn90gd4jc1h2n7vc9mr0" "5a2b9bca3f52" "en-GB")
- ("102gn3h4ap8c3x1p7vfc88vapkfiz6264y6byhxy1axxjk3x3a77" "e87cb1c61d6e" "eo")
- ("148wj6wsx0aq7cpaxk8njj7cb1wfjr2m96dgxq6b3qcv781ldvjn" "5db15fdf95d5" "es-AR")
- ("0r11d8vzvbyz17n371byvkrnszcv1zhr7rg64i58xra3y6d7is7n" "ce2ee0e51a92" "es-CL")
- ("1xmqa8p7lpqvkgg879hfnmf6kxcpawjk8z31cdzfp1hrdlmxg8n7" "7346617620f3" "es-ES")
- ("0jxv3jh2018lnybr9mzqrffvwmr87yab9bh8lxqjj294fxw1hrxm" "687f05eb0c58" "es-MX")
- ("1rpgv7pajv4xldsn1xxsia5j72vn3x8zl5wmbzkyw56lvn9fckvf" "839a5029c496" "et")
- ("0hxp4fr3y05rkpamdb1hlmybn6d3bv3rcawjm3axbpqxbyfdpfzc" "54e8d87230c9" "eu")
- ("1y50knymnmcihw8bhvahicc386mjm6dx4hx0j6fv8sl23wzx2h9m" "c5ffca960f9c" "fa")
- ("0pj9zgi0c3yl3myhvb5afiijayp2lqzhlk630ahxn5hgjgkz0lx7" "75c000a8538d" "ff")
- ("199jg0zv7wp1cq0ik2hf84j99jx5vq2jwac0gaayvjzkh2z83jqr" "f11b2e689e7b" "fi")
- ("1vxkiwwni7470ywy99arxxa56ljkhjrhxslsp1l1l61g6gdbbspr" "49ec4f791806" "fr")
- ("0d8gwdcj0jpjv03nhjds8jrg86pg371xpylaibwri76wlyl7m54i" "faa761a5cfdc" "fy-NL")
- ("0nipbxx11a2sjadzhbi88vgknw5hzr4nqy2722q3kc1212jbi754" "5bd9466f9f9d" "ga-IE")
- ("0bay8mrm65cvmnvqpwqgzr0h3cb18ifzg5kbsbxcvdfm9xv0zi9g" "a4f6a47e82dd" "gd")
- ("00kn5w3nnpw1pxg6hhrn9asf9hgpjd6ia4038iwzcqs68w887qcy" "6c2aa01ada4e" "gl")
- ("0jj13i0ach85c975vaz2rr83mibs29ipssa7qsjkb0y2ch6xya1k" "c2d607e36cb5" "gn")
- ("1nhqbgzilcb0pr7941dxkhg079bf8v7ldikp1s5xli34wf9sabm2" "f34465d6ac1c" "gu-IN")
- ("11bh0541d996cfin1zy72l66753q94i4idgv2waf0h40h9g3z1bm" "c2ecb2762274" "he")
- ("1lslji7hh5lx5ig1xgfjh4cdindsgh3n2a7qlvzwz96gda43lvv4" "94d2bb10ee03" "hi-IN")
- ("1nx5yw00l25i3m3grdm29mi9mi7h0cy5qx02pypir754pk3hiwcc" "08df0d94edd5" "hr")
- ("19yc9dk2pwqycynmx58d1ik6x4mnyfxscgr6sg676dpl613xd7nq" "21b614e77025" "hsb")
- ("0l3z64jlx6b6ivk1b5hwqyx9hm1m5721ywnb2m4zmg3g9fw4vn7f" "f82cad7170af" "hu")
- ("1sn0dxbbf2zwcpybwcw77qb4p0hf6fxapnsnn4avaab5g55dlgz4" "d94c30920396" "hy-AM")
- ("0c92cqxrhv4317kirmhpjk7mrq44yn6fp3v6syxnhz7xwxnhshjm" "6a5f176b0626" "ia")
- ("03gyg9gqsd6pwb9nydglhm46fi2wk2p2qygmhmrf8hnav3ba7n0r" "94e4302e0f85" "id")
- ("0ky8aaps92mn56rvkwn0i13wg8av8hzi1fvr0ahqhjcpj5sfgdwq" "eca348a59888" "is")
- ("01py0sfg7nljcsgpivryrvai4p4wzbcvhgc2ymr19r579nv1vw7g" "d541a6197359" "it")
- ("0iv7vmj43njmi7g1gjzsv68ax4j502d2wnkvbfz1rx11lrqs7yw1" "a5ab3a1d95b7" "ja")
- ("1sr9ccshcw6agbj4hbnpblxixb1jz0m36glas6f9ahxmi7m605si" "63763ffa5a94" "ja-JP-mac")
- ("1as33pzcsdkynrj16dv7w642vl6plbhk650am4l5djwm64f2rgms" "aa83e8555ddc" "ka")
- ("1jwaqb5qps3i5y9iw8l2hrwa0n8lfnx1k9x0p54y3jkh6p3q3fzc" "0e0e25c26247" "kab")
- ("0cjfiwv0q5i8d7fpwb4m2w5ahq687dqjlwlicgpa443yi2zsxr4s" "33117723ceb1" "kk")
- ("0k5b56cv39aaxf9r0p9c27f3fp6yq2ffd4w6qmd0ibpl69sm629d" "aff7b2a7825e" "km")
- ("1a0zg96jgq4zn9cz0h2qwc0vv1fbkfzs5qrgabg62wqgz286jvvv" "ea91638cb1dd" "kn")
- ("0jhmv2n3yx55r6fg3myg7j1c1nhsv25g016m6lh2j023xbr723gp" "88821009b5b3" "ko")
- ("06bybgv4m4i7r9p0qld65j31vbrnljhsdj649dl93msv2r69ilif" "88685d5f07b3" "lij")
- ("1bzjf8smw6ngi88j5g3fawrg54m8fifbhshwjbgkpj7rnrpjgh4w" "e046c7ffa7d0" "lt")
- ("18dmzmpavijb7fwzffas0j5nb6byqp8h6ki7hhf6qb35diqgfq6n" "c520ef4f576c" "lv")
- ("055zf7xj5h1h8mzxj1cjzhngpcvg2p5vs2dmffsa5zfprj02d0dm" "9e43723f18ad" "mk")
- ("1496fbyyzcl075gzcd3xy50h9jyhnzgb544k1scji56yhyfajacb" "ce615fef92c1" "mr")
- ("1wc1q8ksry181pvnysqsq4dhhsg5adw5vgqafmmq5sf6i2bwn2z0" "4fefe88cfaee" "ms")
- ("0awf6mrdwdhy2yvxynssvp1zg1nc2fqbmg2d2bhjcib69zx944xw" "3987a06866fd" "my")
- ("1hycvz7i4jd40hfs5abx6sgfdkafg0jhdgqih9b7lb08aqcl35pj" "2b3b8997d9a1" "nb-NO")
- ("048z1ib46izwryyy8l1x71kq4775n7l2ilbskhsyrbxqryma13k8" "f25324281615" "ne-NP")
- ("1qkxqpyr4la9bn1bqsgc2h9869arglh9n2kwpkq6722jzdbynkz2" "04c7d32c57f6" "nl")
- ("08gnmdll55dbqj7qs63gq1kljbvg24nzns6q4m0av3sszsic0jv5" "5587520e5019" "nn-NO")
- ("1yh2p4ipj5p2b7gh0xxj0n7ndvwn5bw2773ibrh7vz932mkzhhjn" "499386b02695" "oc")
- ("0kjbnixjzv9hvyba4ll20gs76vx84pviy134fvpjp9lfjpnpib55" "31c01c325675" "pa-IN")
- ("0g61imvr4639bbydyi0kwc1il7l1gzlfij4ywx7hdcmq2x6vgb9v" "fb5f3b8dea09" "pl")
- ("13n68d7z94d7943m6fwl4kizbqm3wp82xz69vng4w9vyqlvv7d41" "9a541cbdc748" "pt-BR")
- ("1j8afvrl1afmj2zixrp91rrhag5w4xw90raca1ic6mxyih9kvdi4" "edc959a685c2" "pt-PT")
- ("0wf4a6q9nvcmam2g8ksbymjdnrz59pdr5nirfpjprfhifjmxx4nn" "d2699db715cd" "rm")
- ("1k9qalir5pbh490w1mxyq31yhy9hbxsyrrk11hwlwlgn6syp9nvp" "b5460a9017bc" "ro")
- ("1avy6wyfa5lbvy36wai6mwhhh6x1y8a0jyjk8hvjn52yfxj1gypk" "59ffa8ad047a" "ru")
- ("1cakhm4jxcw1ij0l1vhxw74hsp5wg68i3319dkdncyyc5a2s1qv9" "8b3c8a7ebdfa" "si")
- ("0s534r09bqdfvw3q17y9b1035kzzlafjv656v73mqhyz3fkffsx5" "cb39dc77980e" "sk")
- ("1s58vgmnb9aiaiaqwwcivq3iyzpzj527w2aqh2nrh6xmaw7f43sr" "17d7969b1d9a" "sl")
- ("147qm7x5z8rkf24jpqvkdlqg0fjz1l3zwnaxvkh9y2jpzv7m0x7z" "c55b0e9ff99d" "son")
- ("0nn4r1rxi8cy7x9nmn5ljd8gcsn2rjl2ma2j7waxkafkm4rs6n20" "2bb3808072da" "sq")
- ("0jsb01b94z7qbm59yaj56nb7yx7a6hpgw8v6nzwhbvmnmcsird4p" "c323c0d02d61" "sr")
- ("1n7vv9y4sk3gig56rgfd2jk8jr2160grxk31bd1wkm7fvbndd259" "4220ce487cbc" "sv-SE")
- ("06270mq7gajxfrsb8gqd25v2dac68ask5vvlh6kkkp3hrgy02vid" "6a1dbc2fe1d3" "ta")
- ("10az7pd3npa7n8wq0qywvsj2qrx9592i2wffs3rnc1fviv1i1q0y" "028505b5ecd1" "te")
- ("0yj0c3iyibb3jyypvyiyhbr9asxa48v0nq21kcf9gphi8fnyp5if" "e44d38b6a67b" "th")
- ("1qc4nvhw834lx7p304fxma0fjdr4xfj4lf69dhh6biqz795lx45p" "1e0771d95708" "tr")
- ("1g4y2yq5xp61ncy7c08j7fqqr1jc0m1hjxmbg5659wzif3b3dkg4" "e3c96943e98f" "uk")
- ("1zbi28z1c3p5il7ndixyjsv4nrimzq36zjvlmq10am38ycqr9df8" "f35da1b02691" "ur")
- ("1jrxjjj8k771y0wljqbadxdj4pasg0771jmg4l3hvpgs929i3j9g" "6fd2084b3efe" "uz")
- ("1f8sqgxzgqmw6vzjv3f49lg43q09i3j62f471864vr71815agl8n" "33b5dfd0cd63" "vi")
- ("0ssnsbxw3q5k88fa081gkn1mbqn4j7bm6vb7yvz6h44j214xkz9x" "2d87c0740715" "xh")
- ("0kd3mrvvgczhsmw4rvpxxxc71bb469ayr8r4azf7gc0y5nmlm950" "a2b6625688d3" "zh-CN")
- ("0qy1asyfplkyc89z3g3gfm7b32aka92350b3ayv9d9dcgwxmfdwz" "4d6e959a13d1" "zh-TW")))
-
-(define %icecat-68-version "68.12.0-guix0-preview1")
-
-;; 'icecat-68-source' is a "computed" origin that generates an IceCat 68
-;; tarball from the corresponding upstream Firefox ESR tarball, using the
-;; 'makeicecat' script from the upstream IceCat project.
-(define icecat-68-source
- (let* ((base-version (first (string-split %icecat-68-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-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
- "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf"))))
-
- (upstream-icecat-base-version "68.12.0") ; maybe older than base-version
- ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
- (gnuzilla-commit "15a7c3d991a670b6489d4f432b52a188358f4ca5")
- (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
- "0n7p067yay413iy0gzprz0xrdkcxj5f8ywhkcghhhzw1nwajckba"))))
-
- (makeicecat-patch
- (local-file (search-patch "icecat-68-makeicecat.patch")))
- (gnuzilla-fixes-patch
- (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch"))))
-
- (origin
- (method computed-origin-method)
- (file-name (string-append "icecat-" %icecat-68-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-" #$%icecat-68-version)))
-
- (mkdir "/tmp/bin")
- (set-path-environment-variable
- "PATH" '("bin")
- (list "/tmp"
- #+(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)
- #+rename))
-
- (symlink #+(file-append rename "/bin/rename")
- "/tmp/bin/prename")
-
- ;; 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)
- (invoke "patch" "--force" "--no-backup-if-mismatch"
- "-p1" "--input" #+gnuzilla-fixes-patch)
- (patch-shebang "makeicecat")
- (substitute* "makeicecat"
- (("^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"))
- (("^FFSUB=.*")
- (string-append "FFSUB=" #$sub-version "\n"))
- (("^DATA=.*")
- "DATA=/tmp/gnuzilla/data\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-68-locales)
- (copy-recursively #+mozilla-68-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)
- (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)
-
- #t))))))))
-
;; Update this together with icecat!
(define %icedove-build-id "20200924000000") ;must be of the form YYYYMMDDhhmmss
(define-public icedove
--
2.28.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0.
2020-09-27 10:44 ` [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0 Jonathan Brielmaier
@ 2020-09-27 23:25 ` Mark H Weaver
2020-09-28 9:41 ` Jonathan Brielmaier
0 siblings, 1 reply; 9+ messages in thread
From: Mark H Weaver @ 2020-09-27 23:25 UTC (permalink / raw)
To: Jonathan Brielmaier; +Cc: 43647
Hi Jonathan,
> * gnu/packages/gnuzilla.scm (icedove): Update to 78.3.0.
> [source]: Use source from Icecat 78.
> [arguments]: Use more flexible approach for generating cargo checksums
> from icecat. Update files in 'rename-to-icedove phase. Remove gone
> configure flags and rename `--disable-ion` to `--disable-jit`.
> [inputs]: Update icu4c to version 67 and nss to 3.56.
> [native-inputs]: Use ESR 78 mercurial repo for thunderbird soruces.
> Update rust and cargo to 1.41, rust-cbindgen to 0.14 and
> node to 10.22.
>
> Tested-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Thanks very much for this, Jonathan!
It looks good to me except for one minor issue which is my fault:
> diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
> index 85ad9678d0..873cccaa9c 100644
> --- a/gnu/packages/gnuzilla.scm
> +++ b/gnu/packages/gnuzilla.scm
[...]
> (lambda _
> (use-modules (guix build cargo-utils))
> (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
> - (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
> - (("(\"checksum .* = )\".*\"" all name)
> - (string-append name "\"" null-hash "\"")))
> - (generate-all-checksums "third_party/rust"))
> + (for-each (lambda (file)
> + (format #t "patching checksums in ~a~%" file)
> + (substitute* (find-files "." "Cargo.lock$")
> + (("^checksum = \".*\"")
> + (string-append "checksum = \"" null-hash "\""))))
> + (find-files "." "Cargo.lock$"))
> + (for-each generate-all-checksums
> + '("third_party/rust"
> + "toolkit/library/rust")))
> #t))
This change was inherited from a change I made in the IceCat 78 update
(commit c7011ff850420fdbe1319b3d218bd362f2f9d618), and as Zhu Zihao
<all_but_last@163.com> recently pointed out on guix-devel, it has a
problem which turns out to be harmless but wasteful: the argument to the
second call to 'substitute*' should be 'files' instead of
(find-files "." "Cargo.lock$").
I'm currently testing the 'icedove' build with this minor fix applied.
Thank you!
Mark
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs.
2020-09-27 10:44 ` [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs Jonathan Brielmaier
@ 2020-09-27 23:33 ` Mark H Weaver
2020-09-28 9:42 ` Jonathan Brielmaier
0 siblings, 1 reply; 9+ messages in thread
From: Mark H Weaver @ 2020-09-27 23:33 UTC (permalink / raw)
To: Jonathan Brielmaier; +Cc: 43647
Hi Jonathan,
Jonathan Brielmaier <jonathan.brielmaier@web.de> wrote:
> It was necessary for icedove@68 which is now based on icecat@78.
>
> * gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove.
> (all-mozilla-68-locales): Remove.
> (%icecat-68-version): Remove.
> (icecat-68-source): Remove.
This commit looks good, except that it should also remove
icecat-68-makeicecat.patch and update gnu/local.mk accordingly. Also,
maybe the last word of "gnu: Remove icecat-68 signs" should be changed
to "source".
Unless I hear otherwise, I'll probably go ahead and push your commits
with the minor fixes that I've suggested, after I finish building it.
Thanks!
Mark
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0.
2020-09-27 23:25 ` Mark H Weaver
@ 2020-09-28 9:41 ` Jonathan Brielmaier
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-09-28 9:41 UTC (permalink / raw)
To: Mark H Weaver; +Cc: 43647
>> (lambda _
>> (use-modules (guix build cargo-utils))
>> (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
>> - (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
>> - (("(\"checksum .* = )\".*\"" all name)
>> - (string-append name "\"" null-hash "\"")))
>> - (generate-all-checksums "third_party/rust"))
>> + (for-each (lambda (file)
>> + (format #t "patching checksums in ~a~%" file)
>> + (substitute* (find-files "." "Cargo.lock$")
>> + (("^checksum = \".*\"")
>> + (string-append "checksum = \"" null-hash "\""))))
>> + (find-files "." "Cargo.lock$"))
>> + (for-each generate-all-checksums
>> + '("third_party/rust"
>> + "toolkit/library/rust")))
>> #t))
>
> This change was inherited from a change I made in the IceCat 78 update
> (commit c7011ff850420fdbe1319b3d218bd362f2f9d618), and as Zhu Zihao
> <all_but_last@163.com> recently pointed out on guix-devel, it has a
> problem which turns out to be harmless but wasteful: the argument to the
> second call to 'substitute*' should be 'files' instead of
> (find-files "." "Cargo.lock$").
>
> I'm currently testing the 'icedove' build with this minor fix applied.
I saw this proposal already on the ML and it's a good one :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs.
2020-09-27 23:33 ` Mark H Weaver
@ 2020-09-28 9:42 ` Jonathan Brielmaier
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Brielmaier @ 2020-09-28 9:42 UTC (permalink / raw)
To: Mark H Weaver; +Cc: 43647
On 28.09.20 01:33, Mark H Weaver wrote:
> Hi Jonathan,
>
> Jonathan Brielmaier <jonathan.brielmaier@web.de> wrote:
>
>> It was necessary for icedove@68 which is now based on icecat@78.
>>
>> * gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove.
>> (all-mozilla-68-locales): Remove.
>> (%icecat-68-version): Remove.
>> (icecat-68-source): Remove.
>
> This commit looks good, except that it should also remove
> icecat-68-makeicecat.patch and update gnu/local.mk accordingly. Also,
> maybe the last word of "gnu: Remove icecat-68 signs" should be changed
> to "source".
>
> Unless I hear otherwise, I'll probably go ahead and push your commits
> with the minor fixes that I've suggested, after I finish building it.
That would be nice :)
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#43647: [PATCH 0/3] Update icedove to 78
2020-09-27 10:41 [bug#43647] [PATCH 0/3] Update icedove to 78 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 1/3] gnu: Add nss@3.56 Jonathan Brielmaier
@ 2020-09-28 18:56 ` Mark H Weaver
1 sibling, 0 replies; 9+ messages in thread
From: Mark H Weaver @ 2020-09-28 18:56 UTC (permalink / raw)
To: Jonathan Brielmaier; +Cc: 43647-done
Hi Jonathan,
Jonathan Brielmaier <jonathan.brielmaier@web.de> wrote:
> this patch series updates icedove to 78.3.0. So the new ESR line based
> on icecat 78. We need nss@3.56 to build icedove 78. The last patch removes
> the temporary workarounds from Mark in c7011ff850420fdbe1319b3d218bd362f2f9d618.
I pushed these to 'master', with the minor tweaks mentioned in my
earlier emails, and indentation changes in the nss@3.56 patch, as
commits:
1896c0c6ea3597c917bb57d41a7ca0ba29dbf3b1 gnu: Add nss@3.56.
597aa644afd5cc89c6224e9fbe61e6e03ccf465b gnu: icedove: Update to 78.3.0.
e6485333117f14492c19d974bf520a619bffb51f gnu: Remove icecat-68 source.
Thank you!
Mark
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-09-28 18:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-27 10:41 [bug#43647] [PATCH 0/3] Update icedove to 78 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 1/3] gnu: Add nss@3.56 Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0 Jonathan Brielmaier
2020-09-27 23:25 ` Mark H Weaver
2020-09-28 9:41 ` Jonathan Brielmaier
2020-09-27 10:44 ` [bug#43647] [PATCH 3/3] gnu: Remove icecat-68 signs Jonathan Brielmaier
2020-09-27 23:33 ` Mark H Weaver
2020-09-28 9:42 ` Jonathan Brielmaier
2020-09-28 18:56 ` bug#43647: [PATCH 0/3] Update icedove to 78 Mark H Weaver
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.