From patchwork Thu May 30 22:39:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 65007 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 7C0AF27BBEA; Thu, 30 May 2024 23:41:14 +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 0841227BBE2 for ; Thu, 30 May 2024 23:41:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCoS5-0004LC-Ip; Thu, 30 May 2024 18:40:53 -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 1sCoS3-0004KR-VY for guix-patches@gnu.org; Thu, 30 May 2024 18:40:52 -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 1sCoS3-0002l6-NL for guix-patches@gnu.org; Thu, 30 May 2024 18:40:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCoSE-0003NE-Bl for guix-patches@gnu.org; Thu, 30 May 2024 18:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH v2 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: Thu, 30 May 2024 22:41: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.171710882912593 (code B ref 71121); Thu, 30 May 2024 22:41:02 +0000 Received: (at 71121) by debbugs.gnu.org; 30 May 2024 22:40:29 +0000 Received: from localhost ([127.0.0.1]:52761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRg-0003Gp-FW for submit@debbugs.gnu.org; Thu, 30 May 2024 18:40:28 -0400 Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]:43191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRc-0003Ew-GU for 71121@debbugs.gnu.org; Thu, 30 May 2024 18:40:27 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id F143F1C00147; Thu, 30 May 2024 18:40:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 30 May 2024 18:40:07 -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=1717108806; x=1717195206; bh=dJ/HrGs6Ne/C36s3mbhwA q/rEVGEChj0BqZGncTZX7g=; b=BSaiMzc6FGKcWqaSiJqFeUKlY+6w2H0MMIvtj 95mubuKE2kKWV4p3BjDasl7JWAOoj/NQocvshhZ8Y8OnxeRSxzgchbMWvlUpmwWc Xh1iU0lixEO/7zPmxbdhgbqqHceLcOYWaUMSDTM1T1/4dzd2YJU6HIL2xMcln73c X/Fsee+76yOpKKwbKiJSmkLvsN4KbbHkFyr2MIYolfhRvmASEozJHnUmDL2pPR5Q ZzCMa7D+5frZAlpt5ebrlyJ11kOn2onkOpZrFzuwueNONC2+VRQr2HTS9j7bFVZS OSaq0RLyJNuSrHwApKr9OXhtrTd8DmzG8UHMrnkmfaNWkOA9g== 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=1717108806; x=1717195206; bh=dJ/HrGs6Ne/C36s3mbhwAq/rEVGE Chj0BqZGncTZX7g=; b=U1f6oCTaRzcmnWRI0CJ1vdb48AxweNvMy6CgBVWwlYqj AeQCwwKrRWHwKwWIg+JHcPAleFdGnK3SMwVj+ujxE3Q8pjZTFVo18bRJWcnIO66B uXHvWSZO/txZ6OOjeYuwxTguPwDG/5vfBUDJ9AqsAo1r79oJrjlasj+nKMI4YJam 6cOhzi45vuXhAxJpO3aSwWO8qcyAZRhKEnT3gx048pBonsLs1Q48qicwzVUJMSW+ 6bahVKbkMGGR8IwF8V8Zpb7J/IsOeVH7RgL5UOLzlVs8SFAyetEMlWEm5AI+wieg QJNrKZmK4l+yPiVumq07g6HTzQDQtNRzsVxwENzbCQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdekhedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdht vheqnecuggftrfgrthhtvghrnhephfeiveeliedukeffhefhleeijedtveelleetgefggf ehkeeljeehtdeguddvvefgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 May 2024 18:40:05 -0400 (EDT) From: Ian Eure Date: Thu, 30 May 2024 15:39:49 -0700 Message-ID: <20240530223951.13474-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 510cf1baab..abde3fb819 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -422,7 +422,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 ;;--------------------------------------------------------------------------- @@ -503,6 +503,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 Thu May 30 22:39:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 65006 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 59E3027BBEA; Thu, 30 May 2024 23:41:12 +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 4591427BBE2 for ; Thu, 30 May 2024 23:41:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCoSA-0004MC-GV; Thu, 30 May 2024 18:40:58 -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 1sCoS4-0004Kb-CR for guix-patches@gnu.org; Thu, 30 May 2024 18:40:52 -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 1sCoS4-0002lD-4q for guix-patches@gnu.org; Thu, 30 May 2024 18:40:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCoSE-0003NP-QS for guix-patches@gnu.org; Thu, 30 May 2024 18:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH v2 2/3] gnu: librewolf: Rebuild source tarball Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 22:41: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.171710883712691 (code B ref 71121); Thu, 30 May 2024 22:41:02 +0000 Received: (at 71121) by debbugs.gnu.org; 30 May 2024 22:40:37 +0000 Received: from localhost ([127.0.0.1]:52763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRo-0003IR-UM for submit@debbugs.gnu.org; Thu, 30 May 2024 18:40:37 -0400 Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]:51887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRc-0003FE-V4 for 71121@debbugs.gnu.org; Thu, 30 May 2024 18:40:31 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfout.west.internal (Postfix) with ESMTP id 976671C00157; Thu, 30 May 2024 18:40:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 30 May 2024 18:40:08 -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=1717108808; x=1717195208; bh=PBLgPJ788Wl9N0ql10tN4mlQ/5XQnBCKHLQBtKeHVK0=; b= THnz0fzagdATsbVojW6Gzf2UzkeugEQwbS2t+BM7/q0NbaB/jl7hUJd822kPwnyE w5epfnkKh5Jy5LV9KeGgIUg+atPsZPuw/hbUEzmkU9EKXe1CzCVXOu0bCqeLtYgE dYu5C4G9GaZ10aBpj2noK4D3tXQ1CHWk4jGs9khn6xyJP730X+q7ccbcQM/uitSR gnI6lrUC9CiHaPmxUwwGkaP5OHiYYkM3Ky0FGDepZkVPNVn6Gvdt1/5ZAUEa4wqp ZVv94ngC9aGt4GUzMRPbYQ1vJBOUzvCvb1NgUuvgFxZBy2gyluGwd5eqNgoGBjEb UuMeflMND5lAx2mKRufejw== 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=1717108808; x= 1717195208; bh=PBLgPJ788Wl9N0ql10tN4mlQ/5XQnBCKHLQBtKeHVK0=; b=W 8m53Q13R5K/Fh5DwLT7lQsDfyU3VS0JtZC/xqxg5mW7wJ2ifbyh63wp/SS0xafBE ing+V8iu4VDznryo3w8cQxw/jEcTgTD1rbe9pxnyVy0ZZ3LfZNvrCZPUDsRyyDjz zz3pOtr3S7T63eYy8ejMowhvjP/KPG066AmA9pZR+lE1M6H5Gkg35PJlsQajz7gY cioS0D6V1eHZjf5y83fWG43hrLEPcX2abi0lsf3qy1SN3ODZNJsG8QuFF5wY0CN8 pg+XGdine0rDg6r93XTUGwS74UqtI95ABQ2Zo0C2phZ1Vvu4PWqRYnnvGjK/+/gf Fy0K8pexulhrZ4gfqxiiw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdekhedguddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgv tgdrthhvqeenucggtffrrghtthgvrhhnpedvieetveekkeeliefhtefftedvtefgvdegle efvdeigfettdejtddvffdvgfejudenucffohhmrghinhepmhhoiihilhhlrgdrohhrghdp tghouggvsggvrhhgrdhorhhgpdhsvggrrhgthhhfohigrdhorhhgpdhgihhtlhgrsgdrtg homhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi rghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 May 2024 18:40:07 -0400 (EDT) From: Ian Eure Date: Thu, 30 May 2024 15:39:50 -0700 Message-ID: <20240530223951.13474-2-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240530223951.13474-1-ian@retrospec.tv> References: <20240530223951.13474-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 Thu May 30 22:39:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 65008 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 EAC3327BBEA; Thu, 30 May 2024 23:41:20 +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 2C2BA27BBE2 for ; Thu, 30 May 2024 23:41:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCoS4-0004Km-Q7; Thu, 30 May 2024 18:40:52 -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 1sCoS3-0004KA-Gd for guix-patches@gnu.org; Thu, 30 May 2024 18:40:51 -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 1sCoS3-0002kz-9A for guix-patches@gnu.org; Thu, 30 May 2024 18:40:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCoSD-0003N3-Ua for guix-patches@gnu.org; Thu, 30 May 2024 18:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH v2 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: Thu, 30 May 2024 22:41:01 +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.171710882812578 (code B ref 71121); Thu, 30 May 2024 22:41:01 +0000 Received: (at 71121) by debbugs.gnu.org; 30 May 2024 22:40:28 +0000 Received: from localhost ([127.0.0.1]:52759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRg-0003Gh-1V for submit@debbugs.gnu.org; Thu, 30 May 2024 18:40:28 -0400 Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]:41661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRe-0003FU-IP for 71121@debbugs.gnu.org; Thu, 30 May 2024 18:40:26 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 37AAA1C00137; Thu, 30 May 2024 18:40:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 30 May 2024 18:40:10 -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=1717108809; x= 1717195209; bh=nqB31ALEi1/A0c4hn3b54/ZFbCHXm9t1Dr2EnwEeOdk=; b=n MuWi5y/G+PhBD7zV64m8XD4SNd2+h7XirKoY41kmN7wluQ2kJtJ6eXAT2LAEYFeb 9r3dE9yfFXhRUo1nX//7Gdopt2hu8ay1VDJ5Otq6M015iS1SlNmsSBHYCTKWPO9n rd6VgDXNSeWGOdmQYk3cvyU9rIcs9YMQZ4YGgyqJ4ZqRxj7PXlBizHXtT6lSrJXD 6RmZxogqnmh0oPv/JlU1aAHABp2j9hn22SdR1jRI0jznPPbV+XWfunziN1ygkJbA YEgTwlU/dXVBSkHQnNYrGZtEJk9qkavnXjUyomZod6BLMcEZIDv4Bm7cdhb55+8K Wveax/LL8BdyBr2AstSmg== 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=1717108809; x= 1717195209; bh=nqB31ALEi1/A0c4hn3b54/ZFbCHXm9t1Dr2EnwEeOdk=; b=A GDvRiEktuYyODZaYdC4UTPcRwD4XhSywE6WwR7jGTdGA+N+ahw1qCVaVHLLwBoQa NpbBqFNgQOWDow7Tm/vtpi/mQo6D+zsRIdcCikWrunzqcbVKAYMWB4xrt5dwiCe7 pSrc+bb505Kahjm4Kgg8GihYazBXTjjAmOJ1YunyGJNwJuoQciu0RXYiw1wpA5V8 cEXCVJYWPG14tPvo5nlVO5rpE5qF00EnJBS2zJrWcrTOof5MSAvB69RpPI49OOOL 5D/UVwzmXqmpao1iEULf9CKsyD7LpoqZVbQz2S+8hoPJdNENHiEXRp+Zd4Jrs9RS WAYLl1YjlBs99CTyi/NeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdekhedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggt rdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvteeiueetgfeukedvfeeiuedvve elfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 May 2024 18:40:09 -0400 (EDT) From: Ian Eure Date: Thu, 30 May 2024 15:39:51 -0700 Message-ID: <20240530223951.13474-3-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240530223951.13474-1-ian@retrospec.tv> References: <20240530223951.13474-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 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index bb8bc8a283..80b942ec12 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...~%") @@ -205,12 +210,12 @@ (define rust-librewolf rust) ; 1.75 is the default in Guix, 1.65 is the minimum. ;; Update this id with every update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. ;; ex: date '+%Y%m%d%H%M%S' -(define %librewolf-build-id "20240427150329") +(define %librewolf-build-id "20240530072108") (define-public librewolf (package (name "librewolf") - (version "125.0.2-1") + (version "126.0-1") (source librewolf-source) (build-system gnu-build-system) (arguments