From patchwork Wed Jan 22 03:45:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 37518 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 22FA127BBE9; Wed, 22 Jan 2025 03:47:53 +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 64ACF27BBE2 for ; Wed, 22 Jan 2025 03:47:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taRi1-0005PY-OY; Tue, 21 Jan 2025 22:47:17 -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 1taRho-0005OY-Pv for guix-patches@gnu.org; Tue, 21 Jan 2025 22:47: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 1taRhn-0002iT-VW for guix-patches@gnu.org; Tue, 21 Jan 2025 22:47: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=8vxAplxQOUXO2XvuKwS/jYTzY1fDNQTapGEQj1a9H4U=; b=iosaYrt7nG/H4l+ruRHzJDhuWvVile6KTKvAnPAflBCIdgiojmrn7rf917CAB+Eut6gSStxXXACqnwv+wHtUv5T5fGPHMdYMUn2WVmwhK5pZKEvpmCtrLZOTkIvOIugILY/IYpJ+WVoij4nqEUxSmHga16BTJZTg9KZJqur5Ijmu/YXlOYXEXuqVlEYCTMNHYZq20SzvhfZo40DIOImtE+e9F0sfqXJiYXwoYPeEEeoxpspu+gypxVNMDbGazFNgpoqhfIKfBZh4AaFvx0Sz0d/zgLVvA7h2jN7GoYPPQZggB+Xa7z6i+Sf23KCjI7Im+L/MwugM+++2xZOBGAL15w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taRhn-0003sx-EZ for guix-patches@gnu.org; Tue, 21 Jan 2025 22:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75499] [PATCH v2 2/4] 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: Wed, 22 Jan 2025 03:47:03 +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.173751759114807 (code B ref 75499); Wed, 22 Jan 2025 03:47:03 +0000 Received: (at 75499) by debbugs.gnu.org; 22 Jan 2025 03:46:31 +0000 Received: from localhost ([127.0.0.1]:58850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRhG-0003qd-DY for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:46:31 -0500 Received: from fout-a6-smtp.messagingengine.com ([103.168.172.149]:44735) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1taRgz-0003oq-Kc for 75499@debbugs.gnu.org; Tue, 21 Jan 2025 22:46:20 -0500 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 2312D1380195; Tue, 21 Jan 2025 22:46:08 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Tue, 21 Jan 2025 22:46:08 -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=fm2; t=1737517568; x=1737603968; bh=8vxAplxQOUXO2XvuKwS/jYTzY1fDNQTapGEQj1a9H4U=; b= FtGP0KHkkwB1zIkN1GOyLHeEzHIh1+CpVZTVFLO5fom90/eUMMTwmHwaZM4cvlFm l+t186jcvK7hUo4TNsBQ1ciEcyCkgqZBeJ8vi/IxLJKRm8o5NOn1eMpTiTp+3ZdV X/fDfuuOWhJ8pBcvdA6QWV92JHbr2sxcSyBoUt55JPWxl5JPOw94ha9gJptaITZo 7ckf5b9Jd3X1wnGmAJ0bQCz99ad2uP8KktuJpGYffIeyFX5Xy8QwmoM42FQHP/IJ 65Agx67iVllO3vsFKPt9Yr9T5l7WOhFT4j773ZlijTBnHmgH4/WIxILcs6bhSwcZ E+hcakDPYBvX/0Lf/9pUzw== 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=fm3; t=1737517568; x= 1737603968; bh=8vxAplxQOUXO2XvuKwS/jYTzY1fDNQTapGEQj1a9H4U=; b=g adu6DgdMW3bWGZkBu7kgRkiNSY9fAKsM0h7GBSbeCcY7Q7HoGQovZ+35xi++3+AL im2A2ukT2+co6yi+pmodkp2PJtB/O2OJinu3bln4yXPrJA0W5WDt1Xg7ylCjD0SD q4t6cWSCJo0bhYK5c4lmM8aU9wGBmtHbUtagKIfiijPbGvuBYFAQESWhHZGbZzmX 6xBB70mDzDGd667dGh8bLCYsOVzMIoisEOu1CozvZUOdI2E7ThE1MQ65Ahp9iDfy VPObGOE+Cvb7oscTo5K8wVaKZ5XSZy3MMA6e4n2UJi+RRfxurvIMyhoW8qzDVpxu 3xD1JkbgeGjCpuCh31IQg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudejfedgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefggeehudelleeggf evueehffefgeevieejiedtteduleeluefhjeeiudfhudffteenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrd htvhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohep jeehgeelleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvg htrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 21 Jan 2025 22:46:07 -0500 (EST) From: Ian Eure Date: Tue, 21 Jan 2025 19:45:49 -0800 Message-ID: <20250122034553.19027-2-ian@retrospec.tv> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250122034553.19027-1-ian@retrospec.tv> References: <20250122034553.19027-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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 2011e261e4..98bd6913b5 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") @@ -214,6 +214,7 @@ (define-public librewolf #:version version #:firefox-hash "0q6cqfnwc2x09frdvsndmhck8ixrnbl281j9rqw5w8bd7fd2qas9" #:librewolf-hash "1xf7gx3xm3c7dhch9gwpb0xp11lcyim1nrbm8sjljxdcs7iq9jy4")) + #:l10n firefox-l10n)) (build-system gnu-build-system) (arguments (list