From patchwork Sun Feb 11 19:20:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 60102 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 304B927BBE9; Sun, 11 Feb 2024 19:27:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D6DC727BBE2 for ; Sun, 11 Feb 2024 19:27:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZFTW-0007TZ-92; Sun, 11 Feb 2024 14:26:50 -0500 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 1rZFTU-0007SY-00 for guix-patches@gnu.org; Sun, 11 Feb 2024 14:26:48 -0500 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 1rZFTT-0002OM-O7 for guix-patches@gnu.org; Sun, 11 Feb 2024 14:26:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZFTi-00064P-5A; Sun, 11 Feb 2024 14:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67512] [PATCH v2 1/4] gnu: Move icu4c-73 from gnuzilla to icu4c. References: In-Reply-To: Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Sun, 11 Feb 2024 19:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67512 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67512@debbugs.gnu.org Cc: Ian Eure , =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier , Mark H Weaver Received: via spool by 67512-submit@debbugs.gnu.org id=B67512.170767958823237 (code B ref 67512); Sun, 11 Feb 2024 19:27:02 +0000 Received: (at 67512) by debbugs.gnu.org; 11 Feb 2024 19:26:28 +0000 Received: from localhost ([127.0.0.1]:41620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZFTA-00062e-8O for submit@debbugs.gnu.org; Sun, 11 Feb 2024 14:26:28 -0500 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:50905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZFT6-00061w-Q0 for 67512@debbugs.gnu.org; Sun, 11 Feb 2024 14:26:25 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.nyi.internal (Postfix) with ESMTP id 0277B13800B6; Sun, 11 Feb 2024 14:20:40 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 11 Feb 2024 14:20:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1707679239; x=1707765639; bh=u2o/XPEnETILpVZOJ8E6H LUPLkKhEIer6la1/DRlyBU=; b=kmYfZTgRHyhSlAEQ8IODjWSDS7IM+LbrACL+B 6Kn48GXyeKBzdto4U2TVpvdf1PA1tLnPtIpWdQcy8YYkPlYCIdBgHi7Khklfr5nf OFymVK9TcYYVm5RYvsyL3UHPbekvByc7M5wICTEe8G6gpyyBoaW5IVz48GUCb3fD xvW9mDN4OQhS0ZMfruSMlbnBpnqNcDTuosUB7rloIZzvtkMzmleySzh5DBCB7Sz2 s4hV8Ztjv+We4gGZM4tNCfowqlruc+w3HtbFbF7tl1hBbFh7x/NPt5VvIS+r9izO MNfQx++aA9AA00jz0y5qsacWKsiF+zPEOSzmmyjXOqHIreCig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1707679239; x=1707765639; bh=u2o/XPEnETILpVZOJ8E6HLUPLkKh EIer6la1/DRlyBU=; b=tLyqTwGXbyHWG+JeEZNqnkI292xjV8BoFrybza+/JWo+ PKK+ZViddbMNuJtLv7YpozoNIZgIuubigcKo29S6WUwafWIA/lnvkxTfHKLMjXeg vbO9TRpe/rgHEqLUvO4vs4UeCPF7LSH2Tsq2X/T7unzIMmvDZ89jM3MECWE6GP0w k2836S+7nIu6kg6qGec7TyIz/VEgqvP2DtYXe2U6pnquvqB497JkDGXGjR3VK/H0 U6W9XE96WX1OJD1EVSwftLq9xLy/fdfD3Qqdvgl2uVamw+IwEd++YfULEY2u8EKx BiXh5rFyKIWfyWydes9NswTtEVKf3oG5fpwFJhH0Yg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddugdduvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdht vheqnecuggftrfgrthhtvghrnhephfehheefveegffffgfeklefhtdekfeehhedttdejle eigeeljeduleejteefueeknecuffhomhgrihhnpehgihhthhhusgdrtghomhdpmhhoiihi lhhlrgdrohhrghdpihgtuhdqphhrohhjvggtthdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdht vh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 11 Feb 2024 14:20:39 -0500 (EST) From: Ian Eure Date: Sun, 11 Feb 2024 11:20:24 -0800 Message-ID: <20240211192031.32284-2-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/icu4c.scm (icu4c-73): New variable. * gnu/packages/gnuzilla.scm (icu4c-73-promise): Delete variable. Change-Id: I017e1416b70ecb94313aeb71aa4a0cafdfe0e9ab --- gnu/packages/gnuzilla.scm | 27 +-------------------------- gnu/packages/icu4c.scm | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5f77512427..094ff348e9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -375,31 +375,6 @@ (define-public mozjs-78 (list icu4c-69 readline zlib)))) -;; -;; Needed for IceCat 115. -;; -(define icu4c-73-promise - (delay - (package - (inherit icu4c) - (version "73.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/unicode-org/icu/releases/download/release-" - (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) - "/icu4c-" - (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) - "-src.tgz")) - (sha256 - (base32 - "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) - (patches - (cons - (search-patch - "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") - (origin-patches (package-source icu4c))))))))) - ;;; ;;; Localization helper procedures. ;;; @@ -757,7 +732,7 @@ (define-public icecat-minimal ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). ffmpeg-5 libvpx - (force icu4c-73-promise) + icu4c-73 pixman pulseaudio mesa diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 5aaf3a8361..0dfe63b20a 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -109,6 +109,28 @@ (define-public icu4c (license x11) (home-page "http://site.icu-project.org/"))) +(define-public icu4c-73 + (package + (inherit icu4c) + (name "icu4c") + (version "73.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/unicode-org/icu/releases/download/release-" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version) + "/icu4c-" + (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) + "-src.tgz")) + (sha256 + (base32 + "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) + (patches + (cons + (search-patch + "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") + (origin-patches (package-source icu4c)))))))) + (define-public icu4c-70 (package (inherit icu4c)