From patchwork Mon Sep 28 05:20:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 24360 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1C1A427BBE9; Mon, 28 Sep 2020 06:22:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9749627BBE8 for ; Mon, 28 Sep 2020 06:22:25 +0100 (BST) Received: from localhost ([::1]:40900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMlcG-0003vS-MY for patchwork@mira.cbaines.net; Mon, 28 Sep 2020 01:22:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMlbv-0003v3-Mw for guix-patches@gnu.org; Mon, 28 Sep 2020 01:22:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kMlbu-00007R-Bq for guix-patches@gnu.org; Mon, 28 Sep 2020 01:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kMlbu-00087p-7a for guix-patches@gnu.org; Mon, 28 Sep 2020 01:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43663] [PATCH]: Use system icu4c for Icecat and fix a small bug. Resent-From: "Zhu Zihao" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Sep 2020 05:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43663 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43663@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.160127047831179 (code B ref -1); Mon, 28 Sep 2020 05:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Sep 2020 05:21:18 +0000 Received: from localhost ([127.0.0.1]:51203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMlbC-00086p-73 for submit@debbugs.gnu.org; Mon, 28 Sep 2020 01:21:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:35498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kMlbA-00086h-Ax for submit@debbugs.gnu.org; Mon, 28 Sep 2020 01:21:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMlbA-0003rv-5Y for guix-patches@gnu.org; Mon, 28 Sep 2020 01:21:16 -0400 Received: from m13102.mail.163.com ([220.181.13.102]:50603) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kMlb2-0008UY-Ml for guix-patches@gnu.org; Mon, 28 Sep 2020 01:21:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:MIME-Version:Message-ID; bh=kQ+SZ w0VEwM0NOlHAK34NwzkFRbsqlXOeM4BovCTs4M=; b=Pl+puPtuuZuv/y/fcDLX+ CoSJ5bZQUhVY252crRWEg49A/VbhsRAX/mAtC9YZTcdZTGEI0bHsWsF2Kclg7y8X WRh13KGO9+DvauvVr5SO3QqkFXz3WI0Njlwp6/BUvHDRvMneuWo7GoVPXX4cHTdb visjqHpY1EivexvJuPNZ/E= Received: from all_but_last$163.com ( [112.93.132.201] ) by ajax-webmail-wmsvr102 (Coremail) ; Mon, 28 Sep 2020 13:20:57 +0800 (CST) X-Originating-IP: [112.93.132.201] Date: Mon, 28 Sep 2020 13:20:57 +0800 (CST) From: "Zhu Zihao" X-Priority: 3 X-Mailer: Coremail Webmail Server Version XT5.0.10 build 20190724(ac680a23) Copyright (c) 2002-2020 www.mailtech.cn 163com X-CM-CTRLDATA: pSDk7WZvb3Rlcl9odG09NTU1ODo1Ng== MIME-Version: 1.0 Message-ID: X-Coremail-Locale: zh_CN X-CM-TRANSID: ZsGowADn79O5cnFfgoOjAA--.61510W X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgWsr1aD6CEXhgABss X-Coremail-Antispam: 1U5529EdanIXcx71UUUUU7vcSsGvfC2KfnxnUU== Received-SPF: pass client-ip=220.181.13.102; envelope-from=all_but_last@163.com; helo=m13102.mail.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 01:21:00 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From f06dbc5e269efad5c726fc7cca951481304b0a7c Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 28 Sep 2020 13:15:14 +0800 Subject: [PATCH 1/2] gnu: icecat: Use system icu4c. * gnu/packages/gnuzilla.scm(icecat) [native-inputs]: Add icu4c-64. [arguments]: Add "--with-system-icu". --- gnu/packages/gnuzilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.28.0 diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 85ad9678d0..877f85db37 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -751,7 +751,7 @@ from forcing GEXP-PROMISE." ("libffi" ,libffi) ("ffmpeg" ,ffmpeg) ;; UNBUNDLE-ME! ("libvpx" ,libvpx) - ;; UNBUNDLE-ME! ("icu4c" ,icu4c) + ("icu4c" ,icu4c-67) ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) ("mesa" ,mesa) @@ -854,8 +854,8 @@ from forcing GEXP-PROMISE." ;; UNBUNDLE-ME! "--with-system-vorbis" ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released ;; UNBUNDLE-ME! "--with-system-libvpx" - ;; UNBUNDLE-ME! "--with-system-icu" - + "--with-system-icu" + ;; See ;; and related comments in the ;; 'remove-bundled-libraries' phase below. -- 2.28.0 From bbde65267b6d48b54cc3ace41395c4dad54a7fae Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 28 Sep 2020 13:16:48 +0800 Subject: [PATCH 2/2] gnu: icecat: Remove duplicated find-files * gnu/packages/gnuzilla.scm(icecat)[arguments]: In patch-cargo-checksums phase, replace "find-files" call with already found file name. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 877f85db37..5d9158689a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1012,7 +1012,7 @@ from forcing GEXP-PROMISE." (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) (for-each (lambda (file) (format #t "patching checksums in ~a~%" file) - (substitute* (find-files "." "Cargo.lock$") + (substitute* file (("^checksum = \".*\"") (string-append "checksum = \"" null-hash "\"")))) (find-files "." "Cargo.lock$"))