From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sLujMaiDXGf3BAAAqHPOHw:P1 (envelope-from ) for ; Fri, 13 Dec 2024 18:57:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id sLujMaiDXGf3BAAAqHPOHw (envelope-from ) for ; Fri, 13 Dec 2024 19:57:44 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LiP0wymq; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm3 header.b=aC8eCXOA; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="0 m+5sq/"; dmarc=none; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734116264; a=rsa-sha256; cv=none; b=YF1XckitU7Np1mNe8v/2o+ssDQbTmOd9f5xGS0XSF2xUVkww9Gw23nqBLLlp3axYmYkIwL 6k1q0yGs6qg8iO/B5hI+Wn3UmDhYACICr4Uw3NDbs5QC6Lpf020gVBr6z6TvYk44pbCj4o nxHaz9AHMc8mViY6EV/sngMxvjBXyELEWKv9P/7cHKvYkA4Ocg4vRsIGFQebwDYGVQQOuv Ux2jC8tp7IXTPN9bYiMXo8XRgJ2KnKOnynXG0dTb4QwfroSSsByFr+S/mUT6uNK6nNhy0V w+s5nYF6ntkpnYKVjUiWf/cJxXYz8nQ/dUoe8qrK8mA45EoMoO5PFQQRJhfoKQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LiP0wymq; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm3 header.b=aC8eCXOA; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="0 m+5sq/"; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734116264; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=udF6R2lQ/xgMt3P0MtpHnGi26hHSTEUatmCpBeROi1w=; b=oMf7MeukQ5NlYLjwi7rUAsgGsXn6loykAV6e9azOusNkxVTP2YWy8Sjq5FhwV9OYyc/GAC aJazNIR+YkgP6xTzcQlDNAkJiU04zIaj50Ewu1gLJJuuDd22sMYxDZMFGSy1CarumJiQrH 9ILST5QuZbA1KJbdH22L5v7hiViLlcuHf1HwvJQ5EI/cA0Mv6/6f/HGYwgvnAwYudN3FnE KGqOU6dncUSUIa3g58mbfbMztk1ToWN5tYR/hCv84/+K+HKtXtRINnvD3Wpz3WCDQFfw+9 sjThkN/2K4xZGNleDZh6+oRIZI2r5bkL7s7gEbORcDSItjLOqe6Zdykozfm3Fg== 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 075015C613 for ; Fri, 13 Dec 2024 19:57:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tM9e5-00065q-6N; Fri, 13 Dec 2024 12:40:09 -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 1tM9dz-0005v5-Ux for guix-patches@gnu.org; Fri, 13 Dec 2024 12:40:04 -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 1tM9dy-0002ix-Uz for guix-patches@gnu.org; Fri, 13 Dec 2024 12:40:03 -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:Date:References:In-Reply-To:From:To:Subject; bh=udF6R2lQ/xgMt3P0MtpHnGi26hHSTEUatmCpBeROi1w=; b=LiP0wymqf3+g7Vi/D727d4frhsBHfzA9tQ7CeUGsDocJjyREp2DPqqXZW/+ZNRF/fPR54bswnrp5y9nxQQo8ZXHkgRH2OX/bEF+EM63kRQ4aBG+n0jzEQORqFEjWwusajPHY4MZRMoJGGGY3NZiGPjhH1SWPLOxsxNlMUC3F8TjHcyeHMeIMaDoYcAzLFXq2tvodKCXU4lagFP3JZzlCbq66SL94f2rq+G28IWHzVLYgmcaMTorTV2FtXK65f5danrqsDUOOsoarcZGRA0gOL/M9iC8xLWB11QsX3emnM9wvUCaGzKnHwhyP8BdYns83BFlanggK9w5CzoOzZgLHfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tM9dy-0002Gw-6J for guix-patches@gnu.org; Fri, 13 Dec 2024 12:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74790] [PATCH] gnu: librewolf: Support Guix icecat browser extensions. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Dec 2024 17:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain Cc: 74790@debbugs.gnu.org, =?UTF-8?Q?Andr=C3=A9?= Batista , Jonathan Brielmaier , =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , Mark H Weaver Received: via spool by 74790-submit@debbugs.gnu.org id=B74790.17341115508637 (code B ref 74790); Fri, 13 Dec 2024 17:40:02 +0000 Received: (at 74790) by debbugs.gnu.org; 13 Dec 2024 17:39:10 +0000 Received: from localhost ([127.0.0.1]:44017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tM9d8-0002FD-42 for submit@debbugs.gnu.org; Fri, 13 Dec 2024 12:39:10 -0500 Received: from fhigh-a1-smtp.messagingengine.com ([103.168.172.152]:53673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tM9d1-0002EU-IH for 74790@debbugs.gnu.org; Fri, 13 Dec 2024 12:39:08 -0500 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id EEE851140105; Fri, 13 Dec 2024 12:38:57 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Fri, 13 Dec 2024 12:38:57 -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=fm3; t=1734111537; x=1734197937; bh=udF6R2lQ/xgMt3P0MtpHnGi26hHSTEUatmCpBeROi1w=; b= aC8eCXOAouZrKHT7tfRXwWcOkolhlhU0ONb09qvtXHlZx8EOYWYAjgHNibez/+KE MpUnxpOKU8otIyKa3vXIQd8z6JOyKq6DIvAw782bqD3PsTFUPk/6H+cFgWVI2ZaB pQbzr21Z1OK64QcAYrVV9L73WAtQ+Y2rkaApS0lloROmszjQzjbC+5YMsM8xLIRm R/QVCBgqVQZvLqfyyud58QGy+LIg4SM2ZTdYP5PC1Hwsy/m4rQ8Lbl5xr+9NTWM6 HYZZakl/fLVnK1EPzrwGxlKbL250NBDBjQTX/BMjtDEJMxmz4Irw+5hGKY83l6X7 ej6yXM+lNBAiN/LMIlgLpQ== 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=fm1; t=1734111537; x= 1734197937; bh=udF6R2lQ/xgMt3P0MtpHnGi26hHSTEUatmCpBeROi1w=; b=0 m+5sq/s5d3SSj9+aoSSac98laYQ5DXj2xdfdZeIhLYs+3RGAOkLnISDqgu52LWcT ArosEs55VWF6FIiefaTBAui7CTnr3sNCTcXzet6tnlWXZ/oipw3VzZ69G0dP+ZvO Sv31CNTeNOOEhyz6pBjmvDTZwDkFMuOcoipNXN+Z3eQ/mDKDZrU/FINeXkyQ2lUE 8Jdi5nZiXI7+q9rhGuhCxPT4HAZVVc/IkyrrpNaKJTDuyB6OHD+6QAfQ3w9mIRYH UCBXgKVbaqWNTOnx2tKisaNw9HW9+tBSHCd0y/XWsU3QmwSBREkfMxcd5ZKQkrv2 S3yIYwjDtKooJHciZYNrw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrkeejgddutddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefujghffgffkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepteeuieduhfeljeffffdvkeeuvdevhfdvtddvjeeitdehkeel udefhefggeeuteeunecuffhomhgrihhnpehlihgsrhgvfiholhhfrdhnvghtnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhr ohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeeipdhmohguvgepshhmthhpohhuthdprh gtphhtthhopehmhhifsehnvghtrhhishdrohhrghdprhgtphhtthhopehjohhnrghthhgr nhdrsghrihgvlhhmrghivghrseifvggsrdguvgdprhgtphhtthhopegtlhgvmhgvnhhtse hlrghsshhivghurhdrohhrghdprhgtphhtthhopehnrghnughrvgesrhhishgvuhhprdhn vghtpdhrtghpthhtohepjeegjeeltdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtph htthhopehhrghkohesuhhlthhrrghrrghrvgdrshhprggtvg X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 13 Dec 2024 12:38:56 -0500 (EST) From: Ian Eure In-Reply-To: (Hilton Chain's message of "Wed, 11 Dec 2024 23:07:28 +0800") References: User-Agent: mu4e 1.12.7; emacs 29.4 Date: Fri, 13 Dec 2024 09:38:54 -0800 Message-ID: <87bjxf8oup.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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-Queue-Id: 075015C613 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.90 X-Spam-Score: -8.90 X-TUID: Opu+11/hnbV9 Hi Hilton, The patches look good to me, thank you for taking this on! How to=20 handle browser extensions is a subject that=E2=80=99s been on my mind=20 intermittently, so it=E2=80=99s great to see effort in that direction. I think it might be non-obvious that IceCat packages affect=20 non-IceCat browsers. I=E2=80=99d really like to have a solid facility for= =20 managing extensions across the different Firefox forks, either=20 with generic "browser-extension-ublock-origin" packages; or=20 something similar to the Common Lisp setup, where=20 implementation-specific package variants can be derived from a=20 canonical one. I lean somewhat towards the latter approach, since=20 I think it provides a cleaner way of handling differences across=20 browsers. Given the different release cadences, I think it makes=20 sense to abstract over the differences in the build tooling rather=20 than patching the browsers to get consistent behavior. To be clear here, these patches don=E2=80=99t have to wait for that; I=E2= =80=99m=20 +1 on pushing as-is. But I think we should have a more explicit=20 system for handling browser extension packages. Thanks, -- Ian Hilton Chain writes: > * gnu/packages/patches/librewolf-use-system-wide-dir.patch: New=20 > file. > * gnu/local.mk (dist_patch_DATA): Regisiter it. > * gnu/packages/librewolf.scm (make-librewolf-source)[patches]:=20 > Add it along with > torbrowser-compare-paths.patch. > (librewolf)[native-search-paths]: Add ICECAT_SYSTEM_DIR. > > Change-Id: I8609d25a7e2725ad94ab257d720326639eb06778 > --- > > Reused torbrowser-compare-paths.patch, mind it for future=20 > updates. :) > > gnu/local.mk | 1 + > gnu/packages/librewolf.scm | 11 +++++- > .../librewolf-use-system-wide-dir.patch | 37=20 > +++++++++++++++++++ > 3 files changed, 48 insertions(+), 1 deletion(-) > create mode 100644=20 > gnu/packages/patches/librewolf-use-system-wide-dir.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 2d85c485f6..0faa3a70a9 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1635,6 +1635,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/libgpg-error-hurd64.patch \ > %D%/packages/patches/libguestfs-syms.patch \ > %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ > + %D%/packages/patches/librewolf-use-system-wide-dir.patch \ > %D%/packages/patches/libvirt-add-install-prefix.patch \ > %D%/packages/patches/libziparchive-add-includes.patch \ > %D%/packages/patches/lightdm-arguments-ordering.patch \ > diff --git a/gnu/packages/librewolf.scm=20 > b/gnu/packages/librewolf.scm > index 5d432cfad8..7ea14c9182 100644 > --- a/gnu/packages/librewolf.scm > +++ b/gnu/packages/librewolf.scm > @@ -188,7 +188,11 @@ (define* (make-librewolf-source #:key=20 > version firefox-hash librewolf-hash) > (invoke "make" "all") > (copy-file (string-append "librewolf-" #$version > ".source.tar.gz") > - #$output)))))))) > + #$output))))) > + (patches > + (search-patches > + "torbrowser-compare-paths.patch" > + "librewolf-use-system-wide-dir.patch"))))) > > ;; Define the versions of rust needed to build librewolf,=20 > trying to match > ;; upstream. See the file taskcluster/ci/toolchain/rust.yml at > @@ -705,6 +709,11 @@ (define-public librewolf > rust-cbindgen-0.26 > which > yasm)) > + (native-search-paths > + (list (search-path-specification > + (variable "ICECAT_SYSTEM_DIR") > + (separator #f) ;single entry > + (files '("lib/icecat"))))) > (home-page "https://librewolf.net/") > (synopsis > "Custom version of Firefox, focused on privacy, security=20 > and freedom") > diff --git=20 > a/gnu/packages/patches/librewolf-use-system-wide-dir.patch=20 > b/gnu/packages/patches/librewolf-use-system-wide-dir.patch > new file mode 100644 > index 0000000000..c8a4d8cb12 >