From patchwork Sun Jan 7 00:05:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 58439 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 A393227BBE9; Sun, 7 Jan 2024 00:06:25 +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=-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 231B527BBEB for ; Sun, 7 Jan 2024 00:06:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMGfx-0008Ri-AI; Sat, 06 Jan 2024 19:06:01 -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 1rMGfu-0008RL-5F for guix-patches@gnu.org; Sat, 06 Jan 2024 19:05:59 -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 1rMGft-0006DF-TF for guix-patches@gnu.org; Sat, 06 Jan 2024 19:05:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMGfx-0001en-RV; Sat, 06 Jan 2024 19:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68298] [PATCH 1/2] gnu: Move comment in =?utf-8?b?4oCYbWFrZS1p?= =?utf-8?b?Y2VjYXQtZXh0ZW5zaW9u4oCZLg==?= Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: clement@lassieur.org, jonathan.brielmaier@web.de, guix-patches@gnu.org Resent-Date: Sun, 07 Jan 2024 00:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68298 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68298@debbugs.gnu.org Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , =?utf-8?q?Cl?= =?utf-8?q?=C3=A9ment?= Lassieur , Jonathan Brielmaier X-Debbugs-Original-Xcc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Jonathan Brielmaier Received: via spool by 68298-submit@debbugs.gnu.org id=B68298.17045859456334 (code B ref 68298); Sun, 07 Jan 2024 00:06:01 +0000 Received: (at 68298) by debbugs.gnu.org; 7 Jan 2024 00:05:45 +0000 Received: from localhost ([127.0.0.1]:60420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMGfg-0001e6-Jy for submit@debbugs.gnu.org; Sat, 06 Jan 2024 19:05:45 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:40499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMGfe-0001ds-Gl for 68298@debbugs.gnu.org; Sat, 06 Jan 2024 19:05:42 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id C5A845C00BE; Sat, 6 Jan 2024 19:05:31 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 06 Jan 2024 19:05:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; 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=1704585931; x=1704672331; bh=bV/kXqOWD6APTZY/JjeICKRmS6Q8Z32FhPJSpXQ30+g=; b= NSrXh9D3ps6gMPELIT87w7fSxpatUXVkxh4rkxDZ6QNOXhBfjJoi5TsO/aJK9vyj 4+NuKz+nNjaLfIXOW47JwCBPvHgN3nyEybXYHQYtazJ6F54GA4FaQAaj7VvOrAV1 uomouJsieLg028B0qFyC/2wS1MUnwKV+DJySV4LDhrxyDZf1wT5bjfhu/0MJAXu5 X+9DZM0wVNSniObl20A2JCydUM9yZR8HudTv0r4ri9JqJKmk5NVjwijfvtlVaPF3 IOnSWw1SobhNkMQe84JuWCyOtmEk2AhlLgqj18DFYY3THYUUxVW0VSRkxEb+gNHd /mmuHaekwF2QwmKolGLzyA== 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=fm2; t=1704585931; x= 1704672331; bh=bV/kXqOWD6APTZY/JjeICKRmS6Q8Z32FhPJSpXQ30+g=; b=W C4t6rAkeJ3Q8A/AeyAReJBaYZCks068KLQTgytSmMngwXmjdR5OPfiPILrjip8Gq tbSnwah/ZDDE/9Z1Jg1aiepOmYPeRdWtluKHBDKOx1uxAf95V8gLqsgozEnK4R80 qVYShisNE6mCbd1KgatqVl4pkHsbfQ91kqiFK1SMLycoj46WSYy/pywYCHA89Hms zWCzCqvnBcQQXbGsgf9MmdLsrgP5fiLY52zF/mU+wZ73wzyaIBRgrOIKou2huGtG QfJbG33ZWmV0BD8kNOO45he6iHJmmR4ruFzV2nEt4jmg9dLTzX27tgeNavRCfxQi DDzWJVeUhNIO5lDRz052g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehvddgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghm vghntheslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeeltdehgfdvge dtfedvheehtdfhgfduhedvudetveeuvdehjeevleekveehheeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtlhgvmhgvnhhtsehlrghssh hivghurhdrohhrgh X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 Jan 2024 19:05:30 -0500 (EST) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Sun, 7 Jan 2024 01:05:15 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/build/icecat-extension.scm (make-icecat-extension)[arguments]: Move comment so that next commit there is more readable. Change-Id: I70009d1e928b3f394be25467b090ef9aab6bf1d1 --- gnu/build/icecat-extension.scm | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/build/icecat-extension.scm b/gnu/build/icecat-extension.scm index e6927c79df19..9013ab0fac05 100644 --- a/gnu/build/icecat-extension.scm +++ b/gnu/build/icecat-extension.scm @@ -42,29 +42,29 @@ (define* (make-icecat-extension pkg #:optional (pkg-output "out")) #:builder #~(begin (use-modules (guix build utils)) + ;; Icecat's iterates over `search-dir` for directories. If a + ;; directory's name is not a valid add-on ID, it is ignored. See + ;; `DirectoryLocation::readAddons()` in XPIProvider.jsm. + + ;; This directory has to be a symlink, because Icecat's + ;; `_readLinkFile(aFile)` calls `normalize()` only if `aFile` is a + ;; symlink. + + ;; Normalizing is required because Icecat compares the add-on path + ;; against its local database to know if there is an extension + ;; update. We want the add-on path to be the package store path, + ;; so that a path change is detected every time the package is + ;; updated. See `updateExistingAddon()` in XPIDatabase.jsm, with + ;; our patch `icecat-compare-paths.patch`. + + ;; We don't want the add-on path to be the profile store path, + ;; which would change too often. We don't want the add-on path to + ;; be hard-coded either because it would never change (but it + ;; wouldn't make sense anyway). (let* ((addon-id #$(assq-ref (package-properties pkg) 'addon-id)) (moz-app-id "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") (search-dir (string-append #$output "/lib/icecat/extensions/" moz-app-id))) - ;; Icecat's iterates over `search-dir` for directories. If a - ;; directory's name is not a valid add-on ID, it is ignored. See - ;; `DirectoryLocation::readAddons()` in XPIProvider.jsm. - - ;; This directory has to be a symlink, because Icecat's - ;; `_readLinkFile(aFile)` calls `normalize()` only if `aFile` is a - ;; symlink. - - ;; Normalizing is required because Icecat compares the add-on path - ;; against its local database to know if there is an extension - ;; update. We want the add-on path to be the package store path, - ;; so that a path change is detected every time the package is - ;; updated. See `updateExistingAddon()` in XPIDatabase.jsm, with - ;; our patch `icecat-compare-paths.patch`. - - ;; We don't want the add-on path to be the profile store path, - ;; which would change too often. We don't want the add-on path to - ;; be hard-coded either because it would never change (but it - ;; wouldn't make sense anyway). (mkdir-p search-dir) (symlink (in-vicinity (ungexp pkg pkg-output) addon-id)