From: "Zhu Zihao" <all_but_last@163.com>
To: 43663@debbugs.gnu.org
Subject: [bug#43663] [PATCH]: Use system icu4c for Icecat and fix a small bug.
Date: Mon, 28 Sep 2020 13:20:57 +0800 (CST) [thread overview]
Message-ID: <d3b812c.457d.174d328250f.Coremail.all_but_last@163.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2722 bytes --]
From f06dbc5e269efad5c726fc7cca951481304b0a7c Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
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]<configure-flags>: Add "--with-system-icu".
---
gnu/packages/gnuzilla.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 <https://bugs.gnu.org/32833>
;; 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 <all_but_last@163.com>
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]<phases>:
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$"))
--
2.28.0
[-- Attachment #2: Type: text/html, Size: 5614 bytes --]
next reply other threads:[~2020-09-28 5:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 5:20 Zhu Zihao [this message]
2020-09-28 19:01 ` bug#43663: [PATCH]: Use system icu4c for Icecat and fix a small bug Mark H Weaver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d3b812c.457d.174d328250f.Coremail.all_but_last@163.com \
--to=all_but_last@163.com \
--cc=43663@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).