From patchwork Sat Jan 11 17:29:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 36974 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 5246427BBE2; Sat, 11 Jan 2025 17:30:27 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 C969027BBE9 for ; Sat, 11 Jan 2025 17:30:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWfJH-0005kU-D2; Sat, 11 Jan 2025 12:30:07 -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 1tWfJF-0005jR-44 for guix-patches@gnu.org; Sat, 11 Jan 2025 12:30:05 -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 1tWfJE-0003dd-PD for guix-patches@gnu.org; Sat, 11 Jan 2025 12:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xw1kS8U4V2XzD2nszAJoh3A5otd7mqulYBwvXvjx+3s=; b=PU0zsiAtxjQP3axaBlOQv2undkSyjvmkaiuuUspYhjwu23e5JruzMqg6JXphuk482jmUzvwGIpltgxtCl+moenXpXo+afis48v3MJIlwSDRtRJv2BFwzLDmWX7n8R4xdKFgXEXudhibuddlRNCbHngyGnk+1cjaa79KAPRMeHDKhkRBWp+r8Gf+ogxszfNLrUulUT2ZPRmbKct+9FB1bnMkczx6gWkrNFrGyFSY+jGQ4UxonBTn7uMFYfWyrGIC8nRhKWDPT4qiy/Jp6PHPsbjHkYCkjcWRs/yOJPXqwC14wjWDD1bQ3122ZNfL20tl+DVV4QTGqvcSh83DBgvFUJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWfJE-0001I0-IA for guix-patches@gnu.org; Sat, 11 Jan 2025 12:30:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75499] [PATCH 3/3] gnu: make-librewolf-source: Take l10n package as an arg. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Jan 2025 17:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75499 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75499@debbugs.gnu.org Cc: Ian Eure Received: via spool by 75499-submit@debbugs.gnu.org id=B75499.17366165954857 (code B ref 75499); Sat, 11 Jan 2025 17:30:04 +0000 Received: (at 75499) by debbugs.gnu.org; 11 Jan 2025 17:29:55 +0000 Received: from localhost ([127.0.0.1]:44686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWfJ4-0001GC-Pa for submit@debbugs.gnu.org; Sat, 11 Jan 2025 12:29:55 -0500 Received: from fout-a3-smtp.messagingengine.com ([103.168.172.146]:52143) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWfIx-0001FG-5I for 75499@debbugs.gnu.org; Sat, 11 Jan 2025 12:29:48 -0500 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id F14EC1380240; Sat, 11 Jan 2025 12:29:41 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Sat, 11 Jan 2025 12:29:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1736616581; x=1736702981; bh=xw1kS8U4V2XzD2nszAJoh3A5otd7mqulYBwvXvjx+3s=; b= X3yr4YFk39Ut6qo9verGh53S6fXCSYmJ2BSRLbvMf3cyrSqZaX4gUiVE1cOk87kc ONJnM48vTtFlXmsTes5Kr0CoX7JGsukJAqRBJtajFU+7U9nw21dkHjM/RWZDPULM v/mkrzG4VYxP9pZTK3GkMTKAJFTtV/hXorrTA971nr85uk52uQpmh/O5v89oRRly utj26Dr/F8ZqsrRTmwPv+oMC8zuRVo7WTE7pEK4kaT7ZZlLp0lfsxAZvi3Oq7hU5 8tRnS2kHOrAYXWHIMJBbiPBt2eu+7Q3bkTHgsP8hjx+C1oNhpGKbnAk//Ieccywk 5NglgSWQkzW4QIlPBJADfw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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-sender:x-me-sender:x-sasl-enc; s=fm2; t=1736616581; x= 1736702981; bh=xw1kS8U4V2XzD2nszAJoh3A5otd7mqulYBwvXvjx+3s=; b=t Do7ghFSDde2V9qJFqlhHiCYyBYcWjDxITje2KfWSCvPFSZgG9VkJdIsY0B4ZGhcu EWZA/PDOm92riuU9IK0CbC7qXgUwYJkW0fc10qINa6k1SmLGgLiCqeDeaBawFMZg A6JRtK0PFIotUNNDQmpHmQ07w7WCQT8JPXmgTZQ6Xt7UvdWMpvIJ2ug1NrjIOuRM 8hSCf8xq+EmFC2jwR9p9MJLMH9cjNgKnUqJTKngZ1QUvS30M8009FJoKLuIka1mg mqjQg01myTMrIwB9ER7ikjOkr9edj8zSTyPd7jZeN15hhkg5EFFrnVMDFaxJRKeU B+27Hq2K20Pm7mY2m4gyQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudehtddgleekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefggeehudelleeggf evueehffefgeevieejiedtteduleeluefhjeeiudfhudffteenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrd htvhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohep jeehgeelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvg htrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 11 Jan 2025 12:29:41 -0500 (EST) From: Ian Eure Date: Sat, 11 Jan 2025 09:29:35 -0800 Message-ID: <20250111172936.3737-3-ian@retrospec.tv> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250111172936.3737-1-ian@retrospec.tv> References: <20250111172936.3737-1-ian@retrospec.tv> 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/librewolf.scm (make-librewolf-source): Take l10n package as an arg. Change-Id: I3c405edc07edb54e27afee16325c93a83d37ad79 --- gnu/packages/librewolf.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 1d58191e0c..a4eb45f03e 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2021, 2022, 2023 John Kehayias ;;; Copyright © 2022 Pierre Langlois ;;; Copyright © 2023 Tomas Volf -;;; Copyright © 2023 Ian Eure +;;; Copyright © 2023, 2024, 2025 Ian Eure ;;; Copyright © 2024 Remco van 't Veer ;;; Copyright © 2024 Ashvith Shetty ;;; @@ -126,7 +126,7 @@ (define firefox-l10n (file-name (git-file-name "firefox-l10n" commit)) (sha256 (base32 "0g778fnxg5mkqm3rgryzl64f3n4pczngjdlby07vh2dycvmlyga8"))))) -(define* (make-librewolf-source #:key version firefox-hash librewolf-hash) +(define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n) (let* ((ff-src (firefox-source-origin (car (string-split version #\-)) firefox-hash)) @@ -182,7 +182,7 @@ (define* (make-librewolf-source #:key version firefox-hash librewolf-hash) (substitute* "scripts/librewolf-patches.py" (("l10n_dir = Path(\"..\", \"l10n\")") (string-append - "l10n_dir = \"" #+firefox-l10n "\"")))) + "l10n_dir = \"" #+l10n "\"")))) ;; Run the build script (invoke "make" "all") @@ -213,7 +213,8 @@ (define-public librewolf (make-librewolf-source #:version version #:firefox-hash "06ya18ma1gndci0aygz75hidn3kwa1kji78g8smh7fq0091aad7i" - #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b")) + #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b" + #:l10n firefox-l10n)) (build-system gnu-build-system) (arguments (list