From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id QKiuNn9dyWWlVAEAe85BDQ:P1 (envelope-from ) for ; Mon, 12 Feb 2024 00:51:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id QKiuNn9dyWWlVAEAe85BDQ (envelope-from ) for ; Mon, 12 Feb 2024 00:51:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=retrospec.tv header.s=fm2 header.b=C8MzZbZy; dkim=fail ("body hash did not verify") header.d=messagingengine.com header.s=fm3 header.b=kog3J53J; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707695487; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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:dkim-signature; bh=N2G0lkSUKPbps8tpPG5w6IlEVgKkXY7B44fuCQnqmrw=; b=Yjwz5m1HQ0L1i5hVyZOn/Ycr60PoudXZOzfXrsT/RGuxBIUzuLtjA9/ujFG2s+ajuc6bfm AIaPzptyRd6JsW748I0gHEgMLRdj29gJ7FNNRtdeiNUwSPpRr82gtzYYmOmviYZq21zozO CreHBimX935dLAzcwaIERKXpdpEQialA1VXFqA+7T1BvnIolfqCmDqtM9wEbPqEFHMVnQU UwrFjz//yNGZWQg/Lh3XE+5V9UlA0Yfmfvg+wpWwxLy6244mHv9hDdnKStJy1WiKd8ZN8s J/yhgDfxVFmYWyRvco4zs82K0UBCI9RwOe9dAo4w1ydUmM6UQbOCDbo/uhZEsw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=retrospec.tv header.s=fm2 header.b=C8MzZbZy; dkim=fail ("body hash did not verify") header.d=messagingengine.com header.s=fm3 header.b=kog3J53J; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707695487; a=rsa-sha256; cv=none; b=mZjrRN+uI3qPpJU0DqNCRaUnBJmcETh1PN2bvGzUnUs2XonXUKlfIzh/hxmoGjpd9B7z6I tYKax19u4JQ4ffwAXwMDfmmYpDJMWTbPc77s0/PnuKLvlpYyDVvnNCkXK6dr0iQDWcjlrv ipFp6TXO98UruDhWmbjo/NxsRUuEZF7hth1ExTMCnxTsB71AZOIcP+tjCVxlXD7MYRoIkG ObeMdwxqT/NF+X7/R85bvy3pxAVP/rHG6swMQ1ROuT4OCJiLrUE4Of/bczCAinWYvajkAq hKJhK/DQ0gnioAJfpLsm3HFwWHP3Z/SeW6gbwqARKwSppt2k79pk/rnhOOeOvw== 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 8FA5341C0D for ; Mon, 12 Feb 2024 00:51:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZJb1-0004HF-5z; Sun, 11 Feb 2024 18:50:51 -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 1rZJaz-0004Gs-0X for guix-patches@gnu.org; Sun, 11 Feb 2024 18:50:49 -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 1rZJay-0007mm-OZ for guix-patches@gnu.org; Sun, 11 Feb 2024 18:50:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZJbC-0002Dg-Rv; Sun, 11 Feb 2024 18:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67512] [PATCH v3 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 23:51: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.17076954248423 (code B ref 67512); Sun, 11 Feb 2024 23:51:02 +0000 Received: (at 67512) by debbugs.gnu.org; 11 Feb 2024 23:50:24 +0000 Received: from localhost ([127.0.0.1]:60213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZJaZ-0002Bc-4h for submit@debbugs.gnu.org; Sun, 11 Feb 2024 18:50:23 -0500 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:41835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZJaR-0002Ap-JA for 67512@debbugs.gnu.org; Sun, 11 Feb 2024 18:50:21 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 7E6DF114009D; Sun, 11 Feb 2024 18:49:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 11 Feb 2024 18:49:53 -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=1707695393; x=1707781793; bh=RQcrtaZh5wOmaQ9Zp34NR jHAom07pHBNiZTxlYbuQyY=; b=C8MzZbZy/jwT7EL2dCTZ4tJAPy8zOrbRnSC2O joQirVlE1o8INXIxGpTs+IjFPpz5gQ03QABGeBOsMuqmCDB2JSwODX8vS4q6Xrar bd1XsBGRk7h3iKhoDZOhuYTSZGi3urOLfFhVhCYxhp96/lFxS/YEY9pQ6FhEZdOz w4MYmEmFrz9Pv4nOmnD+IACiQgYRZo56MI4YTJBG/gH+znv97gALJJJGU3Dknsi4 r4zx+WS/pzOvKYgyMsCK6kvy7ZMeBfkNUExVzSBi2m4aNBOoru2d8yWsFm2uMX6Z O4cz2FSmk0CWMZz1Lo25b2C7xtX0DF1+Ipgbzdld6jU2iSLQw== 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=1707695393; x=1707781793; bh=RQcrtaZh5wOmaQ9Zp34NRjHAom07 pHBNiZTxlYbuQyY=; b=kog3J53J8H7Tm37tQm0t8QuMi+pU4WVzOuNB4eozCboC nWQAj5GtPKxBCC+MU+zhKHJsnb4xiggPoIn2N5PFTfk/sgn6ONfLDaJVCBQ2CrAZ QExk0HUMZqvQtx6z0CEBZDr/xUaykf9yieOXJslw+25zEoNgK1jwY+6smXkAWq6S ij5JtKmaF4zIqXBh5wiepWpSrh3y0SonUyonFbyGA7xr7yCUvLa/FztJ8cX8tZzJ dcXjX7kPPoytn3B23Ipw/kCmiyRD+HJX/ZnstNAeNWoJHFn3rPMYvsM0HS+QJnE4 zBAox760LRZh0I0Rxp6HqEwTtrB/0wVl+nsCfhSltg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvgdduhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgggfestdekredtre dttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhv qeenucggtffrrghtthgvrhhnpefhheehfeevgefffffgkeelhfdtkeefheehtddtjeelie egleejudeljeetfeeukeenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhmohiiihhl lhgrrdhorhhgpdhitghuqdhprhhojhgvtghtrdhorhhgnecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 11 Feb 2024 18:49:52 -0500 (EST) From: Ian Eure Date: Sun, 11 Feb 2024 15:49:41 -0800 Message-ID: <20240211234948.7568-1-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+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: -1.27 X-Migadu-Scanner: mx13.migadu.com X-Spam-Score: -1.27 X-Migadu-Queue-Id: 8FA5341C0D X-TUID: Ca4Ce7lzjAzi * 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 -- 2.39.2