From patchwork Wed May 22 14:59:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 64831 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 1970E27BBEA; Wed, 22 May 2024 16:01:30 +0100 (BST) 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,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 90AFC27BBE2 for ; Wed, 22 May 2024 16:01:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nSd-0001H0-5h; Wed, 22 May 2024 11:00:59 -0400 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 1s9nSb-0001GC-8i for guix-patches@gnu.org; Wed, 22 May 2024 11:00:57 -0400 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 1s9nSa-0000gq-Vo for guix-patches@gnu.org; Wed, 22 May 2024 11:00:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nSg-00041k-Nu for guix-patches@gnu.org; Wed, 22 May 2024 11:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH 1/3] gnu: all-mozilla-locales: Add Santali locale; make public. References: <20240522145300.31060-1-ian@retrospec.tv> In-Reply-To: <20240522145300.31060-1-ian@retrospec.tv> Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71121@debbugs.gnu.org Cc: Ian Eure Received: via spool by 71121-submit@debbugs.gnu.org id=B71121.171639002815431 (code B ref 71121); Wed, 22 May 2024 15:01:02 +0000 Received: (at 71121) by debbugs.gnu.org; 22 May 2024 15:00:28 +0000 Received: from localhost ([127.0.0.1]:56479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nS8-00040p-2W for submit@debbugs.gnu.org; Wed, 22 May 2024 11:00:28 -0400 Received: from wfout4-smtp.messagingengine.com ([64.147.123.147]:47033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nS1-00040b-9n for 71121@debbugs.gnu.org; Wed, 22 May 2024 11:00:27 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.west.internal (Postfix) with ESMTP id 6DB9E1C0017F; Wed, 22 May 2024 11:00:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Wed, 22 May 2024 11:00:08 -0400 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=fm3; t=1716390008; x=1716476408; bh=vIsrGtGT1hiCXBH0myuGc LRvPfkzQIgu1NH9xBCjKJw=; b=R1GarumCuYDgzmKOFS9iN5D0vS6+Ph8fBvnaU vYXyUshNBHXmowA9SGlGd0REGqMnp3Wl1u8rB15L46+eZh7YAdPx6SJMDGkKa0ZV qiiMlFsfYeaOugaqem/KZydEIq/mKKgWawEF2NvgruMBKBMVXAaKKAakxyf42l/x RrYIIN4aN62p5Y13CinuCK22dDH3PtO1owD4jCLgnPD3XbYskREHDPbEQ1StUQVy Jl9JVl5NpAiRue8w6y3XwruMPWkwSvIUUnbY+Eve+iUvQS6Kkps64I3T7aJPND/m r1wU0gI86kfILjtnB9ef+a83Qf2T4gBeJDyQ1WosqrTePdLfg== 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= fm1; t=1716390008; x=1716476408; bh=vIsrGtGT1hiCXBH0myuGcLRvPfkz QIgu1NH9xBCjKJw=; b=nXFHx/AufmUfmvv1jIQ5cUfQkL1k94LjxERvGxUuoTA3 HejWO57kptxO5yJ6AEP8Ou+z4qA8VWb3nZgOELyIMTX7AIV4jJR6elH4AdWsGrF+ m3tWLKnRkYybreUpbJnAuksmGbQPruNuFuO8JKnN+jtq5LWpdPY/qc6x4M8dPT/+ o5XMqnZRY4dy7uEdhdz3SR12lxaqeltbSc6EYfK1tsORofNgxVoXkb23GxWltjHz t2v4bO3njwVNH/h2Dot7ZgZeA/iVIXeboS0hhiZjTpq2ecCSzdn+uJb+NHimHFcB Q9ygsmVlhdtNJl1YhYaY5nFTwTcblMFmck2NSWMpfA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeigedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdht vheqnecuggftrfgrthhtvghrnhephfeiveeliedukeffhefhleeijedtveelleetgefggf ehkeeljeehtdeguddvvefgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 22 May 2024 11:00:07 -0400 (EDT) From: Ian Eure Date: Wed, 22 May 2024 07:59:54 -0700 Message-ID: <20240522145956.31218-1-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/gnuzilla.scm (all-mozilla-locales): Adds the Santali locale, and makes all-mozilla-locales public, so it can be used with LibreWolf. Change-Id: Ice49c9b37f8896b8fa963146a754ab28b8571b68 --- gnu/packages/gnuzilla.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 814b610bba..2188179128 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -414,7 +414,7 @@ (define (update-mozilla-locales changesets.json) (format #t "~{~s~%~}" data) data)))) -(define all-mozilla-locales +(define-public all-mozilla-locales (mozilla-locales ;; sha256 changeset locale ;;--------------------------------------------------------------------------- @@ -495,6 +495,7 @@ (define all-mozilla-locales ("0c8dl12n5fjdd3bjaf8idyaxsf8ppbma132vdw8bk2wqnh4cv69a" "92110fd6e211" "rm") ("0mxxy56kj0k5jhjxjv8v4zz57pha819mz7j803lcilax7w52wgca" "5eeba1f64743" "ro") ("0jrd95n108r4sxdwgy39zjynm5nlzzmiijsfpxxfwj7886wl4faz" "47131134e349" "ru") + ("1lwm5jv3hvjp84a70186x2083nhr3mfcl7kpmw5in9amaflfi41b" "a5cd6d3d67ee" "sat") ("1q6pn3iixzcas9blf61bhvwgppbsh0am0wdz6a6p9f9978894d73" "880b7986692a" "sc") ("0xndsph4v725q3xcpmxxjb9vxv19sssqnng82m9215cdsv9klgpb" "bf5f6e362f6f" "sco") ("0l70n8817mbmbc09fsnn2aqjj9k9dhad2gmzgphmiilf9mqm2dpf" "1f705c926a99" "si") From patchwork Wed May 22 14:59:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 64830 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 C62AA27BBE9; Wed, 22 May 2024 16:01:26 +0100 (BST) 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,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 5BD3327BBE2 for ; Wed, 22 May 2024 16:01:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nSd-0001Iu-O0; Wed, 22 May 2024 11:00:59 -0400 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 1s9nSc-0001Gp-4W for guix-patches@gnu.org; Wed, 22 May 2024 11:00:58 -0400 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 1s9nSb-0000h5-SE for guix-patches@gnu.org; Wed, 22 May 2024 11:00:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nSh-000423-Ld for guix-patches@gnu.org; Wed, 22 May 2024 11:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH 2/3] gnu: librewolf: Rebuild source tarball Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 15:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71121@debbugs.gnu.org Cc: Ian Eure Received: via spool by 71121-submit@debbugs.gnu.org id=B71121.171639003315450 (code B ref 71121); Wed, 22 May 2024 15:01:03 +0000 Received: (at 71121) by debbugs.gnu.org; 22 May 2024 15:00:33 +0000 Received: from localhost ([127.0.0.1]:56483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nSC-000413-52 for submit@debbugs.gnu.org; Wed, 22 May 2024 11:00:32 -0400 Received: from wfhigh7-smtp.messagingengine.com ([64.147.123.158]:45445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nS1-00040c-PT for 71121@debbugs.gnu.org; Wed, 22 May 2024 11:00:29 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.west.internal (Postfix) with ESMTP id 3FC191800129; Wed, 22 May 2024 11:00:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 22 May 2024 11:00:10 -0400 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=fm3; t=1716390009; x=1716476409; bh=PBLgPJ788Wl9N0ql10tN4mlQ/5XQnBCKHLQBtKeHVK0=; b= PZ+jjR+UKFGixL6Y2HzMFYnAFcdXURJ7VKyUTzReWbheWZDZJ9NoiL0jgMCBOqeq r7c1EU9tZxQfcvA6oQVBVLXhUqsV80/hBIunlZ4EASwrM+zwxs1CD0ydt8xhm1MN 1N+6pFr+fho3/gLxys9fM0Hh7u6P1uHNRo0ZoC4RMNHatcbmtyRnSsDiuk6hIT4p +JL6mRZP3HMPsZmB3fFH1bp0DyXKRS3b9h/R2mRrYv/MYw1ua9XDvsFH0UDTgSJY LB8x+c1OxDjUx+7SZwPeyd+P/hB3MT1Gn/X1qOKgNCWzUjBIR9J+EYzZg8HZpSJv PGDmGmgZAf2tlibmpFXWNA== 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-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1716390009; x= 1716476409; bh=PBLgPJ788Wl9N0ql10tN4mlQ/5XQnBCKHLQBtKeHVK0=; b=p ujFnISlDmEWMJu1pxrbzcmleni3YK3r7qDoG5X0NLf++rVxrlBIc5ra1OcIoeaWZ 33GpFBT8UJZ/TMIklvbkW10pMnHWRKJ5vAWi/bw3hFbyFQ/q/i/zUlFv55dPlT7S 82Y4BfKwLNRI3ovF6hb62GdrFKsWOpN/ayMKPiG0cwcPoF1zGJX6B+hMkAeNKWOM AcvMwH9BCnhjS/Zh9GHGSOFVfkhYrqFLj7r3vKtGcqHOj8dl12U+uB0Lup1GiIWd h86UbLVMDn+TYZMRKyAvA9ZUu7WEljOQUTLLB4w3OHMk3W+suE5k4lVHuI0DLTPX 9Pm1WcyEFpRmA0uYM0sfg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeigedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgv tgdrthhvqeenucggtffrrghtthgvrhhnpedvieetveekkeeliefhtefftedvtefgvdegle efvdeigfettdejtddvffdvgfejudenucffohhmrghinhepmhhoiihilhhlrgdrohhrghdp tghouggvsggvrhhgrdhorhhgpdhsvggrrhgthhhfohigrdhorhhgpdhgihhtlhgrsgdrtg homhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi rghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 22 May 2024 11:00:08 -0400 (EDT) From: Ian Eure Date: Wed, 22 May 2024 07:59:55 -0700 Message-ID: <20240522145956.31218-2-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240522145956.31218-1-ian@retrospec.tv> References: <20240522145956.31218-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 (librewolf): This patch removes an intermediate step in the build chain. The upstream source tarball is created with an automated build process, where Firefox sources are fetched, patched, and repacked. Rather than download the output of that process, as the package has been, it’s now replicated within the build process, similar to how IceCat works. Change-Id: I0f1c2a10252cbbff9b3b3140f6ea3a594df0c97b --- gnu/packages/librewolf.scm | 120 +++++++++++++++++++++++++++++++++---- 1 file changed, 108 insertions(+), 12 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index fa83857c96..bb8bc8a283 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -40,10 +40,12 @@ (define-module (gnu packages librewolf) + #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix gexp) #:use-module (guix packages) @@ -62,6 +64,7 @@ (define-module (gnu packages librewolf) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) @@ -81,6 +84,7 @@ (define-module (gnu packages librewolf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) #:use-module (gnu packages speech) @@ -89,6 +93,109 @@ (define-module (gnu packages librewolf) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) +(define (firefox-source-origin version hash) + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/firefox/releases/" + version "/source/" "firefox-" version + ".source.tar.xz")) + (sha256 (base32 hash)))) + +(define (librewolf-source-origin version hash) + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/librewolf/source.git") + (commit version) + (recursive? #t))) + (file-name (git-file-name "librewolf-source" version)) + (sha256 (base32 hash)))) + +(define computed-origin-method (@@ (guix packages) computed-origin-method)) + +(define librewolf-source + (let* ((ff-src (firefox-source-origin "125.0.2" "16gpd6n52lshvkkha41z7xicggj64dw0qhr5gd07bcxsc4rmdl39")) + (version "125.0.2-1") + (lw-src (librewolf-source-origin version "17i36s2ny1pv3cz44w0gz48fy4vjfw6vp9jk21j62f5d3dl726x8"))) + + (origin + (method computed-origin-method) + (file-name (string-append "librewolf-" version ".source.tar.gz")) + (sha256 #f) + (uri + (delay + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (set-path-environment-variable + "PATH" '("bin") + (list #+python + #+(canonical-package bash) + #+(canonical-package gnu-make) + #+(canonical-package coreutils) + #+(canonical-package findutils) + #+(canonical-package patch) + #+(canonical-package xz) + #+(canonical-package sed) + #+(canonical-package grep) + #+(canonical-package gzip) + #+(canonical-package tar))) + (set-path-environment-variable + "PYTHONPATH" + (list #+(format #f "lib/python~a/site-packages" + (version-major+minor + (package-version python)))) + '#+(cons python-jsonschema + (map second + (package-transitive-propagated-inputs + python-jsonschema)))) + + ;; Copy LibreWolf source into the build directory and make + ;; everything writable. + (copy-recursively #+lw-src ".") + (for-each make-file-writable (find-files ".")) + + ;; Patch Makefile to use the upstream source instead of downloading. + (substitute* '("Makefile") + (("^ff_source_tarball:=.*") + (string-append "ff_source_tarball:=" #+ff-src))) + + ;; Stage locales + (begin + (format #t "Staging locales...~%") + (force-output) + (mkdir "l10n-staging") + (with-directory-excursion "l10n-staging" + (for-each + (lambda (locale-dir) + (let ((locale + (string-drop (basename locale-dir) + (+ 32 ; length of hash + (string-length "-mozilla-locale-"))))) + (format #t " ~a~%" locale) + (force-output) + (copy-recursively locale-dir locale + #:log (%make-void-port "w")) + (for-each make-file-writable (find-files locale)) + (with-directory-excursion locale + (when (file-exists? ".hgtags") + (delete-file ".hgtags"))))) + '#+all-mozilla-locales))) + + ;; Patch build script to use staged locales. + (begin + (substitute* '("scripts/generate-locales.sh") + (("wget") "# wget") + (("unzip") "# unzip") + (("mv browser/locales/l10n/\\$1-\\*/") + "mv ../l10n-staging/$1/"))) + + ;; Run the build script + (invoke "make" "all") + (copy-file (string-append "librewolf-" #$version ".source.tar.gz") + #$output)))))))) + ;; Define the versions of rust needed to build librewolf, trying to match ;; upstream. See the file taskcluster/ci/toolchain/rust.yml at ;; https://searchfox.org under the particular firefox release, like @@ -104,18 +211,7 @@ (define-public librewolf (package (name "librewolf") (version "125.0.2-1") - (source - (origin - (method url-fetch) - - (uri (string-append "https://gitlab.com/api/v4/projects/32320088/" - "packages/generic/librewolf-source/" - version - "/librewolf-" - version - ".source.tar.gz")) - (sha256 - (base32 "09qzdaq9l01in9h4q14vyinjvvffycha2iyjqj5p4dd5jh6q5zma")))) + (source librewolf-source) (build-system gnu-build-system) (arguments (list From patchwork Wed May 22 14:59:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 64829 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 03EC127BBEA; Wed, 22 May 2024 16:01:21 +0100 (BST) 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,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4256227BBE2 for ; Wed, 22 May 2024 16:01:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9nSd-0001Iy-P9; Wed, 22 May 2024 11:00:59 -0400 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 1s9nSb-0001GR-Nh for guix-patches@gnu.org; Wed, 22 May 2024 11:00:57 -0400 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 1s9nSb-0000gx-EJ for guix-patches@gnu.org; Wed, 22 May 2024 11:00:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9nSh-00041w-8J for guix-patches@gnu.org; Wed, 22 May 2024 11:01:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH 3/3] gnu: librewolf: Update to 126.0-1. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 15:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71121@debbugs.gnu.org Cc: Ian Eure Received: via spool by 71121-submit@debbugs.gnu.org id=B71121.171639003215444 (code B ref 71121); Wed, 22 May 2024 15:01:03 +0000 Received: (at 71121) by debbugs.gnu.org; 22 May 2024 15:00:32 +0000 Received: from localhost ([127.0.0.1]:56481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nSB-000411-MJ for submit@debbugs.gnu.org; Wed, 22 May 2024 11:00:32 -0400 Received: from wfout4-smtp.messagingengine.com ([64.147.123.147]:33121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9nS3-00040d-Fx for 71121@debbugs.gnu.org; Wed, 22 May 2024 11:00:27 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.west.internal (Postfix) with ESMTP id 0A6951C0017B; Wed, 22 May 2024 11:00:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 22 May 2024 11:00:12 -0400 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=fm3; t=1716390011; x= 1716476411; bh=d0xNAtT2R4yHgsZ/1mB8QdmyPiyrnG6JS/ctJvY/etM=; b=E vHjPBjx63J+O47B+gx0VpmqkEeLNcNEMtatx08gni0+aNDt8G/Pqj0CcaWrPodoZ bwxKCwZJcYAENBtprwUZsPD9i+AOLJnvxHs0/H1BNbcxTjv+COAltW6jnpCRgaiO j/SPb+UWweU2E4nghQwl+lgy8LZCXihpWr6LQ4mnV5kqd+YE+ROIIyhEy+XwvwXT eA46we91xKpmfb75VoLktJMFWKZAY1iDR95pCyIqmcUOBzI8gUQrBd9gFnge1hVb CIXUXOXtIQQPgshlHcS+roH0F7bggFOfNGEdTF7fhHYe8vnw2ExO732LQIBImOgS ysgOfw6AOUn/sxbcCSuWw== 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=fm1; t=1716390011; x= 1716476411; bh=d0xNAtT2R4yHgsZ/1mB8QdmyPiyrnG6JS/ctJvY/etM=; b=V 2pTIm60OB2zU3P1T8V8lei+W6vFcF1B001hTib4e2ZChcbMFODyo5eyVAd8vz91Z tS1NtuRvuSmrrG+Rfz9qyhU0t6yAq3NKWsGKY+SGkg+ylH32FSrMvlvh4suK/kRu mqSToRFz0Qht5hK0ZwXHY157Q3xWIX7bwppMJUuTbNG/ZFlGUSsxgEYe7d36ryr4 8ZKEGtEqYHip7hplAOMAMqJvvW5NoNKjgFE/DpipsqVn21CUB4NelMVPsQBZgf4P BwUOzAiHA/Jhd9tqOQXkyK6xe34YbZdYb8OU1M6E+1ZnQx81iAC1VPQ5Sn672ing V5CIZAzgFkXigNP4WM/vQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdeigedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggt rdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvteeiueetgfeukedvfeeiuedvve elfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 22 May 2024 11:00:10 -0400 (EDT) From: Ian Eure Date: Wed, 22 May 2024 07:59:56 -0700 Message-ID: <20240522145956.31218-3-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240522145956.31218-1-ian@retrospec.tv> References: <20240522145956.31218-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 (librewolf): Update to 126.0-1. Fixes CVE-2024-4367, CVE-2024-4764, CVE-2024-4765, CVE-2024-4766, CVE-2024-4767, CVE-2024-4768, CVE-2024-4769, CVE-2024-4770, CVE-2024-4771, CVE-2024-4772, CVE-2024-4773, CVE-2024-4774, CVE-2024-4775, CVE-2024-4776, CVE-2024-4777, CVE-2024-4778. Change-Id: Iec010e516651588da389f747074cbd10f8c14377 --- gnu/packages/librewolf.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index bb8bc8a283..c1fed6eef1 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -115,9 +115,9 @@ (define (librewolf-source-origin version hash) (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define librewolf-source - (let* ((ff-src (firefox-source-origin "125.0.2" "16gpd6n52lshvkkha41z7xicggj64dw0qhr5gd07bcxsc4rmdl39")) - (version "125.0.2-1") - (lw-src (librewolf-source-origin version "17i36s2ny1pv3cz44w0gz48fy4vjfw6vp9jk21j62f5d3dl726x8"))) + (let* ((ff-src (firefox-source-origin "126.0" "09l5hsyrkimmkd7wbhnamy5mwmwwxjfa742hpkjjkhlyk6hq43li")) + (version "126.0-1") + (lw-src (librewolf-source-origin version "1q8fjki6rgzrir84y7j2anra2w213bm0g74nw205gja9qsxlassc"))) (origin (method computed-origin-method) @@ -161,6 +161,11 @@ (define librewolf-source (("^ff_source_tarball:=.*") (string-append "ff_source_tarball:=" #+ff-src))) + ;; Remove encoding_rs patch, it doesn't build with Rust 1.75. + (substitute* '("assets/patches.txt") + (("patches/encoding_rs.patch\\\n$") + "")) + ;; Stage locales (begin (format #t "Staging locales...~%") @@ -210,7 +215,7 @@ (define %librewolf-build-id "20240427150329") (define-public librewolf (package (name "librewolf") - (version "125.0.2-1") + (version "126.0-1") (source librewolf-source) (build-system gnu-build-system) (arguments