From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0OZsDqNg7mSMhAEA9RJhRA:P1 (envelope-from ) for ; Tue, 29 Aug 2023 23:18:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0OZsDqNg7mSMhAEA9RJhRA (envelope-from ) for ; Tue, 29 Aug 2023 23:18:27 +0200 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 CEAEA363CE for ; Tue, 29 Aug 2023 23:18:26 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693343907; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Q0fWws41v2h8OvGzQscoPZu9nCVFLOO4bVahE2fLAyE=; b=k70il68xRAsi1DCwWvRnJcg0oZ47FjLpl4C0JUP6Lv7xoNkwK4dvBARca9SoLpQbG+rOUv NKpt9MvvbS20OpFd5XVb7fRPm0J8LkZde3orlwD0XPMo+L/1GdOuGlr19q6oBsA+P75pOh 2JfEGEV7nx+oLJ63M/+MoTawvUigkfB1r+cpOGtp1ZyB4QU8TnrZL3tH+O+rn8cDVUmBCS G7oaT/9gDL1rhKHU1Nw07HjV/1by4UNfcBiHlsQOevnxaZgCq5n028Xk9zvRVeWCLd9/AF oNd70P1VwnGzRVvyFifbM1hXKODmuBlEF+yWkyn3zKmrKKLPlbrExMg1tVdNVw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693343907; a=rsa-sha256; cv=none; b=r0Rz2zNRqPvsriMkVqrAJpamwXb5FtZCwELpNwXITIXE283BHI4Zad4C6V5OnrJ+4kY8i6 Uc77GAYGPPxh8xwqRC6N5LQIXmrC2MG9BWOqXMHMhaIGoAJyHGtibq6/tURqqvS+U/XJjb 0RwrbC20p7yxafRsA1+F9+g6gbgKhMGZaSzwaKOszoBDPd1jiWU7bNcLmdiGpbB3abX8F0 Gja8xflO54m6Bctod3DbPwnIikA8HoBq0DTniqHgvV+0759bxCElmQtbUsBM1Rb6nXI+1T 1Bbf7aHHeefWvKBbxb2dwbRHk8GOFmT2HLc1PXKl2EpjwR5pS4Ak9sUaEdRbig== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qb66F-0001dD-MJ; Tue, 29 Aug 2023 17:18:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qb61A-0000RQ-2B for guix-patches@gnu.org; Tue, 29 Aug 2023 17:12:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qb619-00045p-Ph for guix-patches@gnu.org; Tue, 29 Aug 2023 17:12:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qb61G-0008Jn-KO for guix-patches@gnu.org; Tue, 29 Aug 2023 17:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60571] [PATCH v3 1/3] gnu: Add icu4c-for-skia. References: <87pmbtfge5.fsf@ngraves.fr> In-Reply-To: <87pmbtfge5.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 21:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60571@debbugs.gnu.org Cc: ngraves@ngraves.fr, maxim.cournoyer@gmail.com Received: via spool by 60571-submit@debbugs.gnu.org id=B60571.169334352631899 (code B ref 60571); Tue, 29 Aug 2023 21:13:02 +0000 Received: (at 60571) by debbugs.gnu.org; 29 Aug 2023 21:12:06 +0000 Received: from localhost ([127.0.0.1]:51719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60M-0008IP-2f for submit@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:06 -0400 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:38035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb60G-0008Hh-Mq for 60571@debbugs.gnu.org; Tue, 29 Aug 2023 17:12:04 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.138.246]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 1380725F47 for <60571@debbugs.gnu.org>; Tue, 29 Aug 2023 21:11:52 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-5lk5p (unknown [10.110.103.92]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BA59C1FD1E; Tue, 29 Aug 2023 21:11:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-5lk5p with ESMTPSA id 4imFKBdf7mQEBgMAWEbJRA (envelope-from ); Tue, 29 Aug 2023 21:11:51 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Tue, 29 Aug 2023 23:11:37 +0200 Message-ID: <4a4bbbda4ea4bfbf65915cf0ce29be066f0c6916.1693343499.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 6852226835796845249 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudefiedgudehlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepheduhedtudeijeetheetjeehtdegfeeifeeugeekieelheekvdfhvdehkeeikedunecuffhomhgrihhnpehgohhoghhlvghsohhurhgtvgdrtghomhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeitdehjeduseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.22 X-Spam-Score: -2.22 X-Migadu-Queue-Id: CEAEA363CE X-Migadu-Scanner: mx2.migadu.com X-TUID: c0hUdWCj+ua9 * gnu/packages/icu4c.scm (icu4c-for-skia): New variable. --- gnu/packages/icu4c.scm | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index ba8b4915f2..9d1d461d17 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2023 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +28,17 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) + #:use-module (gnu packages cpio) #:use-module (gnu packages java) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -240,3 +244,75 @@ (define-public java-icu4j globalisation support for software applications. This package contains the Java part.") (license x11))) + +(define-public icu4c-for-skia + ;; The current version of skia needs this exact commit + ;; for its test dependencies. + (let ((commit "a0718d4f121727e30b8d52c7a189ebf5ab52421f") + (revision "0")) + (package + (inherit icu4c) + (name "icu4c-for-skia") + (version "skia") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/chromium/deps/icu.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qxws2p91f6dmhy7d3967r5ygz06r88pkmpm97px067x0zzdz384")))) + (arguments + (list + #:make-flags #~(list (string-append "DESTDIR=" #$output)) + #:configure-flags #~'("--prefix=" "--exec-prefix=") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source + (lambda _ (chdir "source"))) + (replace 'configure + (lambda* (#:key inputs parallel-build? configure-flags + #:allow-other-keys) + (setenv "CONFIG_SHELL" (which "sh")) + (setenv "OPTS" (string-join configure-flags)) + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests"))) + (add-after 'install 'install-cleanup + (lambda* (#:key make-flags #:allow-other-keys) + (with-directory-excursion "data" + (apply invoke "make" "clean" make-flags)))) + (add-after 'install-cleanup 'configure-filtered-data + (lambda* (#:key configure-flags #:allow-other-keys) + (setenv "OPTS" (string-join configure-flags)) + (setenv "ICU_DATA_FILTER_FILE" + (string-append (getcwd) "/../filters/common.json")) + (invoke "./runConfigureICU" "Linux/gcc" + "--disable-layout" "--disable-tests"))) + (add-after 'configure-filtered-data 'build-filtered-data + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (let ((job-count (if parallel-build? + (number->string (parallel-job-count)) + "1"))) + (apply invoke "make" "-j" job-count make-flags) + (setenv "DESTDIR" #$output) + (invoke "bash" "../scripts/copy_data.sh" "common")))) + (add-after 'build-filtered-data 'install-scripts-and-data + (lambda _ + (let* ((share (string-append #$output "/share")) + (scripts (string-append share "/scripts")) + (data (string-append share "/data/common"))) + ;; Install scripts. + (mkdir-p scripts) + (copy-recursively "../scripts/" scripts) + ;; Install data. + (mkdir-p data) + (copy-recursively "./dataout/common/data/out/tmp" data) + (symlink (string-append data "/icudt69l.dat") + (string-append data "/icudtl.dat"))))) + (add-before 'check 'disable-failing-uconv-test + (lambda _ + (substitute* "extra/uconv/Makefile.in" + (("check: check-local") + ""))))))) + (native-inputs (list python cpio pkg-config))))) base-commit: cf6abf50dbbbd95fef465ab4bb3b608843ac47e1 prerequisite-patch-id: cccdad83975cbf04d7bd618c2c1a4b4de6fa7fd2 prerequisite-patch-id: 6f28833d2efa054d55126980f87ba4d2fdd13c6d prerequisite-patch-id: afc6cadece838372370f7093f863ce8eaae7bc55 prerequisite-patch-id: b9330c12700355319c104aa3b493eafe03cbb619 prerequisite-patch-id: 46fa9c5a48fcc5b13409049b14b6e7314a6d6956 prerequisite-patch-id: 846f8b50b8de749caaa459b874087d06e15e0a80 prerequisite-patch-id: 023101e5a315951ce9786fb8230955c97001dac9 prerequisite-patch-id: d4b0193f128d8236026e079e746ea0cf6c4c0af0 prerequisite-patch-id: d73442d6d7c88e7375e9de0a9cd655cacb7766f9 prerequisite-patch-id: d8a56dd7bc6c1c3ba3ac0f77b2402b9c6469cfb2 prerequisite-patch-id: 3bc2b2eecd799be8d8b0f96b850ef83a6306dab7 prerequisite-patch-id: 798d4a277eff03a59339af4ebe19406682f361ab prerequisite-patch-id: 3f65e9cdab64edeacfeb5748cd4fb130839b2b30 prerequisite-patch-id: 6f8225b63a1dd1866b05bb91544e49d7c096601c prerequisite-patch-id: ff71ec9bdf6337390a720db4535268af271e32df prerequisite-patch-id: c6b40cc38f5bdfab229ac3d7ed4346c5d9f1b2f7 prerequisite-patch-id: 9ab6dade9e641d5e667ba6a61dbfbb3d32c943a6 prerequisite-patch-id: 4fcae29a8f6dd95716669680141da315acaf6e59 prerequisite-patch-id: 0a5a6da0061188dc9be59bc9829db53288307c58 prerequisite-patch-id: 83c4b7d9d831990e4d37ba89c584d773c872ba6b prerequisite-patch-id: 1c8dddf99041cf399b8836e3ad6721d7bbcebb7c prerequisite-patch-id: 773df13cc85606b205d1d914e59525b7a6820a1d prerequisite-patch-id: 6f8974ce8c0a3a25721a41781f9b0dfd61e96cf4 prerequisite-patch-id: d219948d28923c5ccd34b63f988032df33f2f336 prerequisite-patch-id: 0bd75bb28df9ccf3405caf8217d708afc978047d prerequisite-patch-id: 26476dd782cf8f5e427d4bd36ac85957538a0aa3 prerequisite-patch-id: b5f87c460fd984c41fbb52e7e0dc305c20c46f22 prerequisite-patch-id: 5502b9c6a64abaca6a9921f25cd324869d26aa1e prerequisite-patch-id: a7e84bb368349566e9a6fdbe49a371fdb464bb1e prerequisite-patch-id: a84a766ceef6bedd5da3f9512c87a2c2a11ff33f prerequisite-patch-id: 0175b2b1cbbc15c1c775147821715bca9e3303a3 prerequisite-patch-id: 9c20b408ac8aa275ecba58383d83be5cef7647df prerequisite-patch-id: 836749cd3bd3b86f64de637c3c2df48a3608f09f prerequisite-patch-id: 28ea1ddbef32a1bc9e908f3f9c7466953c60f13d prerequisite-patch-id: 52a78e387e36e6408d7147950195d552e4e41528 prerequisite-patch-id: 87fee01a70d4b8cbfca44cc0a9c9f54471a92d18 prerequisite-patch-id: 8c8cdb345e815fc3332805ca224103f185d4a568 prerequisite-patch-id: 3434c5caf1eba9e9a64c673681e5911d2c1d9232 prerequisite-patch-id: c45bf303726fb3dacee01a66c0ff75105a81164d prerequisite-patch-id: d44a1adb0404f23522aac21fa8a7f26be7ddabdc prerequisite-patch-id: e422fe29bbcef80260b190637faa1a4953c3f1cb prerequisite-patch-id: 285479a1a1e46e6f0f8aba5429edfa400c81b32b prerequisite-patch-id: 30fcff6f8c9328c71d3fca609cddde0b56973bb7 prerequisite-patch-id: 70bb47ccac3375de893e4e640ce7c59369a05a39 prerequisite-patch-id: cc3d79386ca4a93146dc195cd5732764f1ac447f prerequisite-patch-id: 2686866ec4bf08c7faa05b17cb84d9e0c13ec12c prerequisite-patch-id: 369b61e07e3c90151a5414b784513b9ae3d3e978 prerequisite-patch-id: 065651c3a8cee63b725d7f86c080c274b494627e prerequisite-patch-id: 1ee71844f0c9a0112a456e5b76079239906a7fb8 prerequisite-patch-id: c7b3d9c5bff04c16576781eff50ce37f7c49131c prerequisite-patch-id: c8b8fe8dc51fea0b8a2626cf7031f01b6000e023 prerequisite-patch-id: 182e25335d4c357001f4f8bed2b3f89b91d9cae5 prerequisite-patch-id: c0ea00d5f4c6a83642a92c9341f0288fbfe3095a prerequisite-patch-id: 795d31cc33a24a6a57e67af31b65acd8faa8187c prerequisite-patch-id: 358af8aa7fa71b5cb8fbe6dde29d141bb7c57f1e prerequisite-patch-id: b9ab3ee98a9d4ca518a4d99042982d64fbce5d05 prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2 prerequisite-patch-id: c6bbe6026bfcd2c9ff6e06efc5b8424a6943d1bf prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4 prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707 prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e prerequisite-patch-id: 45e65ea00ece53f3496251401acd464081f8ca7a prerequisite-patch-id: c3bc83367aa2aab9f121fe3bdbbd9e48dee860ea prerequisite-patch-id: c12968d02d99c253f858586a86b16fa32d41f1c1 prerequisite-patch-id: 09d995d48139f8e61183d5634cda13a01cdb50f7 prerequisite-patch-id: 86baa45ec2aad977c8c8135f7613aa391155de6d prerequisite-patch-id: 3425fbbff6a603d60b4e143ea2141aabf4ddc92c prerequisite-patch-id: c373c01aab5dcba3503a97d51c62a595147a041c prerequisite-patch-id: cda857c790b88c681c4e713c5f71e40291970daf -- 2.41.0