From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0AauJVewcV8KVAAA0tVLHw (envelope-from ) for ; Mon, 28 Sep 2020 09:43:51 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eJqUIVewcV/NZgAA1q6Kng (envelope-from ) for ; Mon, 28 Sep 2020 09:43:51 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.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 04D8D940416 for ; Mon, 28 Sep 2020 09:43:51 +0000 (UTC) Received: from localhost ([::1]:53442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMphF-0001tJ-Ox for larch@yhetil.org; Mon, 28 Sep 2020 05:43:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMpgU-0001qw-KY for guix-patches@gnu.org; Mon, 28 Sep 2020 05:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMpgU-0005na-9e for guix-patches@gnu.org; Mon, 28 Sep 2020 05:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kMpgU-000687-74 for guix-patches@gnu.org; Mon, 28 Sep 2020 05:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43647] [PATCH 2/3] gnu: icedove: Update to 78.3.0. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Sep 2020 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43647 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mark H Weaver Cc: 43647@debbugs.gnu.org Received: via spool by 43647-submit@debbugs.gnu.org id=B43647.160128614723515 (code B ref 43647); Mon, 28 Sep 2020 09:43:02 +0000 Received: (at 43647) by debbugs.gnu.org; 28 Sep 2020 09:42:27 +0000 Received: from localhost ([127.0.0.1]:51441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMpfv-00067D-0s for submit@debbugs.gnu.org; Mon, 28 Sep 2020 05:42:27 -0400 Received: from mout.web.de ([212.227.15.14]:41407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMpfs-00066y-MG for 43647@debbugs.gnu.org; Mon, 28 Sep 2020 05:42:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1601286138; bh=bufH4uTSXCrML1goERJa3fxNrDZjhMLWPY1X0ygAdtM=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=V1Sh4gG02n9hHKH1N2bpfVeIKUwFtCgrnf5pLB+qo1tMUtYmjbgjLgw85iTxX38rn ala9WMl1eTpE49C/DYKOBSMIWyQAwQ00+Ae1ouFlO1JvSlhkDLhlHrdvg4C2BDvPCY 1um7rU6Qx/DIjJ9i+TVq3dI13iyTJVby6/8ahiYA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.25] ([88.152.185.253]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MZAp2-1k8aZi0dJM-00KxkQ; Mon, 28 Sep 2020 11:42:18 +0200 References: <20200927104111.2522-1-jonathan.brielmaier@web.de> <20200927104420.4091-1-jonathan.brielmaier@web.de> <20200927104420.4091-2-jonathan.brielmaier@web.de> <87mu1a7qfh.fsf@netris.org> From: Jonathan Brielmaier Message-ID: Date: Mon, 28 Sep 2020 11:41:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.3.0 MIME-Version: 1.0 In-Reply-To: <87mu1a7qfh.fsf@netris.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:B6hVXyzCozlgKahRdL1RcpnESH+84FiuLT9HAWZNizYDxPRerrn I+0rNyCdgNuwNxOGwFzGVaqdwsU9uoinNVoGCVtJDI0Ko6xXSiBTycubduNGqUSW+h9aETH 4YCMrI0X17iBHKp6RduyBb/6RFAtS4RnvEBdPbgwaQeSJE2pUExWe94okLMyeSxkklUk9Pn TCOX8+QVp96dDrOtJJWiA== X-UI-Out-Filterresults: notjunk:1;V03:K0:N43d16Ym/nA=:K3JzKLvdE5uimvkbp/GxxL VebSh9Dbs9Zu8/tAma6wmcntDnCcjzoaohBzHnhrbTXsf1dXtDNn0X/RH3I4QrdtQwxXvZ4eO ZNd6xSn0I6HfN42ZRmTiNLbisPYcRL+TMStrWpHi3IMY/BN9Lqwax5iP4L1bVBeicrXi0TkqQ lS5I5vyufUDtM8PucmXooSLyAk6L9MYfDSPSXbP0I6/CdU2pzD5bR5sEDQFcwTenNYNbnKi9i RFu/uPNnOXUm8HQJDOHH4teDZN397x5VfGNxdYwA63s/Ej42SAY3ExqZl8SH4Z7aGP8dXJbNp SBCbBa8HUmb5fEwkJ5AyYm1WShYYCrcuUTwwkHisUGuvczqd5STA9WbH+Z5SyS2yTUpmUS0X7 jKzjhY4jonIK9yFRFE9I9HVvfZ4+Ggos7E8ZOKXbi894ySyrg3NyUSFZPiNEuax1iXvvi75ot e680bbo91dC3dyDZ+zIeRX26/n0Ix/8i1XG23sE3pp7ERGVUFLSdZuwiUJirg4LQO1Jf2obNW 9uKKef3hGGnHZ+n5h9/EXuU0m9vPgkoP1GWkckhjN0ZHNsNuVPKM3odQDRoyD6ohUUQzOjgfI 6Up7XHfwnC4hBq5MyyJ8AZlfae3/dpm1CLR8B4zPdcCYw9i1mzyteeaZes72mTewciQgb3sgs e8Vaef6tseNFOJi0wPsED2+lqjlSW7pB8Ur8/d8Y1oT7A48COQZEHIToDwO2GfrfGNaaktc3N omylC8PvjoGO7MJlRuk/FPLGiRmY8+GyQ/SasBw7I0lt5tSEv4nyauJrWj6YS653sJAoqV3YV Qht0WsH87RZIIbsT+zLii5E5/zI55TTIsc2gHlXBN7/rjmB9pLzcyM8EFv0yPU1VjuLGFrlSo QOaN+Ag3PBQ+gouCnldmRCUoNl5cmxxHh7ils3kKKwjpFaOZxQEzlZvOjFqAzHllWD6pnbGBZ eH7mvJNqeOZ8jvyYaGTbouuxAQf0Htqbqz/mbUjlkbeBiScuzBA7/zHIbMN8++coybK0c6aZh oT6Iu/xn7/TCW7yvV6JG5kUUkdb+1NWfBbiev7uxcQYU0W53qp6ePCUzaDimkj7H1qc5BRneO Fem1b32Dn6+Rd9zTYgsaF2/drjI5mkSOaRkYWkOSWA5lhNwH8IRyf/wnq6/6EbyL1w3fcq7z7 8tg/8Jb4tL96YccZQfCMWCpyLr+B9Ddl8KqGYbn3P04cucalX++s8tuya7tDiSGfTKSkPe4yz cVQysaeTb43msc7FHX1GcJpsvTpHIof9LrQLIzg== X-Spam-Score: -1.2 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.2 (--) 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 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=web.de header.s=dbaedf251592 header.b=V1Sh4gG0; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.29 X-TUID: 1D/R3Zrfgyy6 >> (lambda _ >> (use-modules (guix build cargo-utils)) >> (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41= e4649b934ca495991b7852b855")) >> - (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock") >> - (("(\"checksum .* =3D )\".*\"" all name) >> - (string-append name "\"" null-hash "\""))) >> - (generate-all-checksums "third_party/rust")) >> + (for-each (lambda (file) >> + (format #t "patching checksums in ~a~%" fil= e) >> + (substitute* (find-files "." "Cargo.lock$") >> + (("^checksum =3D \".*\"") >> + (string-append "checksum =3D \"" null-ha= sh "\"")))) >> + (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 > 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 :)