From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sMg6FS6YqV4xfQAA0tVLHw (envelope-from ) for ; Wed, 29 Apr 2020 15:07:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +LsNIDaYqV5CWQAAB5/wlQ (envelope-from ) for ; Wed, 29 Apr 2020 15:07:34 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 318789400A9 for ; Wed, 29 Apr 2020 15:07:33 +0000 (UTC) Received: from localhost ([::1]:36590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jToJB-0001PB-2h for larch@yhetil.org; Wed, 29 Apr 2020 11:07:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54162) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jToHl-0007vh-BB for guix-patches@gnu.org; Wed, 29 Apr 2020 11:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jToHj-0004V4-6g for guix-patches@gnu.org; Wed, 29 Apr 2020 11:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jToHi-0004Uw-Pl for guix-patches@gnu.org; Wed, 29 Apr 2020 11:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jToHi-0000MG-Kp for guix-patches@gnu.org; Wed, 29 Apr 2020 11:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40959] [PATCH 1/1] gnu: Add icedove. Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 15:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40959 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40959@debbugs.gnu.org Cc: malacoda@monarch-pass.net, gillmann@infotropique.org, Jonathan Brielmaier Received: via spool by 40959-submit@debbugs.gnu.org id=B40959.15881727211299 (code B ref 40959); Wed, 29 Apr 2020 15:06:02 +0000 Received: (at 40959) by debbugs.gnu.org; 29 Apr 2020 15:05:21 +0000 Received: from localhost ([127.0.0.1]:44284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jToH2-0000Kt-Q4 for submit@debbugs.gnu.org; Wed, 29 Apr 2020 11:05:21 -0400 Received: from sender4-of-o53.zoho.com ([136.143.188.53]:21313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jToGz-0000Kg-Gg for 40959@debbugs.gnu.org; Wed, 29 Apr 2020 11:05:18 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1588172714; cv=none; d=zohomail.com; s=zohoarc; b=kb7b7r8aLhFHrPJipnDL/xWOJ7FuLM+Keoo+CgId/BNPDN8/QRkq3IKw/BQQbr9lzyDbkUT6wERNOZaQSGEXVnl8qPNZCzmbYviTnTNeX9tZw2fUr/+Aa9WH2QPwNT5q5g+DS76irEKrFUGRKr4zgI4Ymns85YIeLOPKkIPhFx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588172714; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=5olpSr3ikpYN3BLFUyURQoEZoWYIAYXDebhSGA6VXs4=; b=Qg6qFCbbaFO28cuG3peLhE54OC/yL82KkE1cxNC7b6Eos88CTRHzyWXhqcyGWjn1SbEB8j2t7jULo9sEF/q6j7CDaGvNmANCGiRRYGq/YQNzbjh3a2PLGaf123nZZfMx98a+DuUqfntrgS6EPxlHk1UYgAcPaTk+lUFJCYoZq+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1588172714; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=5olpSr3ikpYN3BLFUyURQoEZoWYIAYXDebhSGA6VXs4=; b=Yra/A7UHlriVKTXFAibTok0PBmz+pLUuV3GWDtmASuml8aJE9P0pH+SkVtnUT1/R zEyeVUEPxYR6gRhKG5vGqWNX44vPLtbtSoDRkO7LgM8fGdbRAJa7/rycp8/XyNH6W45 GKn4oOzU2vTCDjIMJgMgeMwNBGSwshyDXFkdlai4= Received: from localhost (p54AD4F43.dip0.t-ipconnect.de [84.173.79.67]) by mx.zohomail.com with SMTPS id 1588172707740523.9415983331122; Wed, 29 Apr 2020 08:05:07 -0700 (PDT) References: <20200429105614.11517-1-jonathan.brielmaier@web.de> <20200429110018.11677-1-jonathan.brielmaier@web.de> User-agent: mu4e 1.2.0; emacs 26.3 From: Ricardo Wurmus In-reply-to: <20200429110018.11677-1-jonathan.brielmaier@web.de> X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Wed, 29 Apr 2020 17:05:04 +0200 Message-ID: <877dxyjpsv.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 1.99 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=elephly.net header.s=zoho header.b=Yra/A7UH; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [1.99 / 13.00]; GENERIC_REPUTATION(0.00)[-0.49336626656792]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.17), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; R_DKIM_REJECT(1.00)[elephly.net:s=zoho]; ARC_REJECT(2.00)[signature check failed: fail, {[1] = sig:zohomail.com:reject}]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; DKIM_TRACE(0.00)[elephly.net:-]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[84.173.79.67:received]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[rekado@elephly.net,guix-patches-bounces@gnu.org]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; URIBL_BLOCKED(0.00)[gnu.org:url,torproject.org:url]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[elephly.net]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; FREEMAIL_CC(0.00)[monarch-pass.net,infotropique.org,web.de]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[] X-TUID: fF7oDHPLUrgH Thank you for this patch. > + (arguments > + `(#:tests? #f ; no check target > + ;; XXX: There are RUNPATH issues such as > + ;; $prefix/lib/icecat-31.6.0/plugin-container NEEDing libmozalloc= .so, > + ;; which is not in its RUNPATH, but they appear to be harmless in > + ;; practice somehow. See . > + #:validate-runpath? #f The comment seems to have been copied from somewhere. I don=E2=80=99t think this package produces $prefix/lib/icecat-31.6.0/plugin-container The URL is also no longer reachable. > + (add-after 'unpack 'remove-bundled-libraries > + (lambda _ > + ;; Remove bundled libraries that we don't use. > + (for-each (lambda (file) > + (format #t "deleting '~a'...~%" file) > + (delete-file-recursively file)) > + '(;; UNBUNDLE-ME! icu > + ;; UNBUNDLE-ME! nss > + "modules/zlib")) > + #t)) This should be done in a snippet. > + (add-after 'patch-source-shebangs 'patch-cargo-checksums > + (lambda _ > + (use-modules (guix build cargo-utils)) > + (let ((null-hash > "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) What is this null-hash? > + (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock") > + (("(\"checksum .* =3D )\".*\"" all name) > + (string-append name "\"" null-hash "\""))) > + (for-each > + (lambda (filename) > + (delete-file filename) > + (let ((dir (dirname filename))) > + (display (string-append > + "patch-cargo-checksums: generate-checksums= for " > + dir "\n")) > + (generate-checksums dir))) > + (find-files "third_party/rust" ".cargo-checksum.json"))) > + #t)) Oh, there are a lot of things in third_party/rust=E2=80=A6 Can this be unb= undled? > + ; Fixes issue where each installation directory generates its o= wn profile. > + ; See e.g. https://trac.torproject.org/projects/tor/ticket/31457 > + (add-after 'patch-source-shebangs 'fix-profile-setting > + (lambda _ > + (let ((mozconfigure "comm/mail/moz.configure")) > + (substitute* mozconfigure > + (("'MOZ_DEDICATED_PROFILES', True") > + "'MOZ_DEDICATED_PROFILES', False"))))) This phase needs to end on #t. > + (replace 'configure > + (lambda* (#:key outputs configure-flags #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bash (which "bash")) > + (abs-srcdir (getcwd)) > + (srcdir (string-append "../" (basename abs-srcdir))) > + (flags `(,(string-append "--prefix=3D" out) > + ,@configure-flags)) > + (mozconfig (string-append (getcwd) "/.mozconfig"))) > + (setenv "SHELL" bash) > + (setenv "AUTOCONF" > + (string-append (assoc-ref %build-inputs > + "autoconf") > + "/bin/autoconf")) > + (setenv "CONFIG_SHELL" bash) > + (setenv "QA_CONFIGURE_OPTIONS" ".*") > + (setenv "MOZBUILD_STATE_PATH" > + (string-append (getcwd) "/mach_state")) > + (setenv "MOZCONFIG" > + (string-append (getcwd) "/.mozconfig")) > + (setenv "CC" "gcc") > + (setenv "MOZ_NOSPAM" "1") > + (setenv "PYTHON" > + (string-append (assoc-ref %build-inputs > + "python2") > + "/bin/python")) Looks like Python 3 could be used instead. Have you tried that? > + (delete-file-recursively "obj-x86_64-pc-linux-gnu") Can this be deleted in a snippet or is this generated in some earlier phase? Is the same directory generated on other architectures? > + (zero? (system* "./mach" "configure"))))) Please use (invoke =E2=80=A6) instead of (zero? (system* =E2=80=A6)). > + (replace 'build > + (lambda _ > + (zero? (system* "./mach" "build")))) Same here. > + (replace 'install > + (lambda _ > + (zero? (system* "./mach" "install")))) =E2=80=A6and here. > + (add-after 'install 'wrap-program > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (lib (string-append out "/lib")) > + (gtk (assoc-ref inputs "gtk+")) > + (gtk-share (string-append gtk "/share")) > + (pulseaudio (assoc-ref inputs "pulseaudio")) > + (pulseaudio-lib (string-append pulseaudio "/lib"))) > + (wrap-program (car (find-files lib "^thunderbird$")) > + `("XDG_DATA_DIRS" prefix (,gtk-share)) > + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib))) > + #t)))))) Why does thunderbird need wrapping with pulseaudio? > + ("python" ,python) > + ("python2" ,python-2.7) See above. We may be able to use Python 3 here. > + (home-page "https://www.thunderbird.net") > + (synopsis "Trademarkless version of Mozilla Thunderbird") Is the use of the name =E2=80=9CThunderbird=E2=80=9D a violation of Mozilla= =E2=80=99s trademark policies? -- Ricardo