From patchwork Tue Feb 13 20:34:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 60288 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 413A027BBE9; Tue, 13 Feb 2024 20:35:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,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 E5FEC27BBE2 for ; Tue, 13 Feb 2024 20:35:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZzUW-0001nB-3w; Tue, 13 Feb 2024 15:34:56 -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 1rZzUM-0001hk-Dg for guix-patches@gnu.org; Tue, 13 Feb 2024 15:34:47 -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 1rZzUM-0007wS-5Z for guix-patches@gnu.org; Tue, 13 Feb 2024 15:34:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZzUc-0006K3-Bk; Tue, 13 Feb 2024 15:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67512] [PATCH v4 1/4] gnu: Move icu4c-73 from gnuzilla to icu4c. 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: Tue, 13 Feb 2024 20:35: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.170785648524235 (code B ref 67512); Tue, 13 Feb 2024 20:35:02 +0000 Received: (at 67512) by debbugs.gnu.org; 13 Feb 2024 20:34:45 +0000 Received: from localhost ([127.0.0.1]:47768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZzUL-0006Il-7K for submit@debbugs.gnu.org; Tue, 13 Feb 2024 15:34:45 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:53951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZzUH-0006Hx-GS for 67512@debbugs.gnu.org; Tue, 13 Feb 2024 15:34:42 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id B7F0E5C00B4; Tue, 13 Feb 2024 15:34:17 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 13 Feb 2024 15:34:17 -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:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1707856457; x= 1707942857; bh=enOsNQ8CRbPWW4n1cdI6D4rSUopgfZyrdG2iHfE31R0=; b=U fb0hQm8sOc0sWYAw8JQqAHnKReivYhrxpb5e1qpILMzP+yJ0xUhhvr+waIWx1VYH 3inc+omFV14enT573nAog5VuocRVYloWFm1po3SM9BqHTgYCObPAWuzFdJ1PbJtb Jps2OAGIEedcx0g5dnwh+7TyM7iTp2YQpHCR5vLckH/GkxvlpOUmK7gLYsalMIaW cxuop2uDf8Lv73lWklk7IQ1hGijln2qlKOnYK0h6qsoIdsYtdr0Oa/qK4bI8iKXu UWx+zOl/UyMvBJFNoLFUaJkvrbQYq6xxtFU1NBxgUsWuOxa7HoGRhjzPQVk996L6 +TdkXCZH6D91SN+wSnyMA== 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:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1707856457; x= 1707942857; bh=enOsNQ8CRbPWW4n1cdI6D4rSUopgfZyrdG2iHfE31R0=; b=c XclgmhLjvnKSumun34GslW/ikBS95OX4xagV8ERusiqa+3qxoX9qUzIFGf4aDI0b +BHsq2HLIVidMPjm6k9jTCFfo0ohgZT//lLK/zA4wELurwgAxGJENiRqeWQJgeNU be/dYgdf2poTytdrV0vSPrL+ttLV9k4EU54OEuEMCXjcryfew/vFjrgtc9ZHLUKh WNUIHbO0jwInj310XqMmb6goDUYFzsUis3wZqDFoKbNyofAp5Sy508ZsDPZ5ocPn X74D+K+TLCgyGMxwPYaJVeNUHh8WBg+vHY2D5ThDQEK9vtWNmoI6/YFAm50z68d+ 4jc4N1jSI3MBtcEPTFXWg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudehgddufeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggt rdhtvheqnecuggftrfgrthhtvghrnheptddtudeludeitedvgeffleefjefgteeuudduhf eivedvtdffieettdetueeuudeknecuffhomhgrihhnpehgihhthhhusgdrtghomhdpmhho iihilhhlrgdrohhrghdpihgtuhdqphhrohhjvggtthdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggt rdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 13 Feb 2024 15:34:16 -0500 (EST) From: Ian Eure Date: Tue, 13 Feb 2024 12:34:03 -0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 ++++++++++++++++++++++ gnu/packages/tor-browsers.scm | 3 ++- 3 files changed, 25 insertions(+), 27 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) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index c4ce997b99..ee5e072102 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -52,6 +52,7 @@ (define-module (gnu packages tor-browsers) #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) #:use-module (gnu packages libcanberra) @@ -270,7 +271,7 @@ (define* (make-torbrowser #:key ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). ffmpeg-5 libvpx - (force (@@ (gnu packages gnuzilla) icu4c-73-promise)) + icu4c-73 pixman pulseaudio mesa