From patchwork Sun Oct 8 16:26:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 54601 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 4125727BBE9; Sun, 8 Oct 2023 17:28:59 +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 A6A3E27BBE2 for ; Sun, 8 Oct 2023 17:28:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpWe4-0000uI-Bd; Sun, 08 Oct 2023 12:28:44 -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 1qpWe2-0000tj-1t for guix-patches@gnu.org; Sun, 08 Oct 2023 12:28:42 -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 1qpWe1-0005Gw-Ps for guix-patches@gnu.org; Sun, 08 Oct 2023 12:28:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpWeL-0006Nq-Pq; Sun, 08 Oct 2023 12:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66408] [PATCH] gnu: icecat: Add support for Guix packaged extensions. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: jonathan.brielmaier@web.de, guix-patches@gnu.org Resent-Date: Sun, 08 Oct 2023 16:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66408@debbugs.gnu.org Cc: mhw@netris.org, =?utf-8?q?Cl=C3=A9ment?= Lassieur , marius@gnu.org, Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Jonathan Brielmaier Received: via spool by submit@debbugs.gnu.org id=B.169678249224463 (code B ref -1); Sun, 08 Oct 2023 16:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Oct 2023 16:28:12 +0000 Received: from localhost ([127.0.0.1]:58329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpWdV-0006MR-9S for submit@debbugs.gnu.org; Sun, 08 Oct 2023 12:28:12 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpWdQ-0006Lq-Bo for submit@debbugs.gnu.org; Sun, 08 Oct 2023 12:28:07 -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 1qpWd0-0000m4-Op for guix-patches@gnu.org; Sun, 08 Oct 2023 12:27:38 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpWcy-000547-5o; Sun, 08 Oct 2023 12:27:38 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B3FAF5C025E; Sun, 8 Oct 2023 12:27:31 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sun, 08 Oct 2023 12:27:31 -0400 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:message-id:mime-version:reply-to :sender:subject:subject:to:to; s=fm1; t=1696782451; x= 1696868851; bh=Fgv3yjGD2ZYHyNuJdz1eSHD4TSpr4Tkhk+w5H/UZlNQ=; b=r krTJKc1182uxChM/KENS9V7ZkgR2tB+2HlZpOo/eFbd+BRIXIjUbcGyBHgGQ+t+y qpKFAut362NAHFic1G3Ym8JuM2YFwLwIiXcAeY9iryyh8xk338ROEh11JRP27cmQ Zw/8JuNkulNMvIIxdjZOxhO0VCkKbx7lS425NMQXEsSADhpWE5H3EXQSwAPho3Up 0J1WzDAXSnJTRtoshmbqGlIln5EAQtNOl5iPnYm3SKV01IS9/xV9VmF69hnOCdhj 67/oQaWVWCv0s/FKZ925moY8lyeoTSlRZ4+D2rTBoTIHG+zcUMWm8wupcpexIu6n USAf/P7KI52SNc1Y3CtNQ== 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:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1696782451; x=1696868851; bh=F gv3yjGD2ZYHyNuJdz1eSHD4TSpr4Tkhk+w5H/UZlNQ=; b=HhKwx3z/WHET9iidf WGoeFQKXyQy3LQ1AkosgBOezhoFsYmZYELFuZZ1bJaCXWFYNbKI8ulEX1h2waRXE /AnkD23UTAws4BRSAO7/JUhKcFp/mb79Y4AzJkV8Dn7HszgsfFVuGnRsETn/13FW HLwPd5N6kS8Ojqlxhd4zzB25MLhQJO+fKRKXsobO7VHEINcbvw16x0X0W6YLN473 9l0ez4T6TDkxpSe4WwTqZCEtLyua/pizZUtPt6K46Yil/2+EsbvM+VP6XOEObpkZ 3kHd2u0tVzNKM3e30Q53P38ubw1vldt4a4FiIiPw+yNF4rUd2ljCeG81PERK+UB0 MqhUw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrhedugddutddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghmvghn theslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeffudeftefhheevve eitdejvdetveeugeekvefggfffheetvdejieeggeehvdffleenucffohhmrghinhepghhn uhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 8 Oct 2023 12:27:30 -0400 (EDT) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Sun, 8 Oct 2023 18:26:57 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.28; envelope-from=clement@lassieur.org; helo=out4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: New file. * gnu/local.mk (dist_patch_DATA): Register it, as well as new patches. * gnu/packages/browser-extensions.scm (ublock-origin): [properties]: Store the addon id so that it is accessible in MAKE-ICECAT-EXTENSION. [arguments]: Use the addon id as first directory level. (ublock-origin/icecat): New procedure. * gnu/packages/gnuzilla.scm (icecat-minimal)[arguments]: Rewrite the unused 'apply-guix-specific-patches' phase so that it applies the following two patches. * gnu/packages/patches/icecat-compare-canonicalized-paths.patch: New patch that canonicalizes the addon path and use it to detect package changes. * gnu/packages/patches/icecat-use-guix-extension.patch: New patch that replaces /usr/share/mozilla/extensions with ~/.guix-profile/share/extensions. --- gnu/build/icecat-extension.scm | 62 +++++++++++++++++++ gnu/local.mk | 5 +- gnu/packages/browser-extensions.scm | 13 +++- gnu/packages/gnuzilla.scm | 19 +++--- .../icecat-compare-canonicalized-paths.patch | 33 ++++++++++ .../patches/icecat-use-guix-extensions.patch | 30 +++++++++ 6 files changed, 147 insertions(+), 15 deletions(-) create mode 100644 gnu/build/icecat-extension.scm create mode 100644 gnu/packages/patches/icecat-compare-canonicalized-paths.patch create mode 100644 gnu/packages/patches/icecat-use-guix-extensions.patch base-commit: 47d0346553fdad9795c9390a60944ccaad7e5255 diff --git a/gnu/build/icecat-extension.scm b/gnu/build/icecat-extension.scm new file mode 100644 index 000000000000..ccc6a1ece7fb --- /dev/null +++ b/gnu/build/icecat-extension.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020, 2021 Marius Bakke +;;; Copyright © 2023 Clément Lassieur +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu build icecat-extension) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix build-system trivial) + #:export (make-icecat-extension)) + +(define* (make-icecat-extension pkg #:optional (pkg-output "out")) + "Create an Icecat extension from package PKG and return a package that, +when installed, will make the extension contained in PKG available as an +Icecat browser extension. PKG-OUTPUT specifies which output of PKG to use." + (package + (inherit pkg) + (name (string-append (package-name pkg) "-icecat")) + (native-inputs '()) + (inputs '()) + (propagated-inputs '()) + (outputs '("out")) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((id #$(assq-ref (package-properties pkg) 'id)) + (moz-app-id "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") + (search-dir (string-append #$output + "/share/icecat/extensions/" + moz-app-id))) + ;; Icecat's XPIProvider.jsm looks within `search-dir` for a + ;; directory named after the add-on id. + + ;; This directory has to be a symlink, because Icecat's + ;; GetNativeTarget checks S_ISLNK before canonicalizing it like + ;; `readlink -f` would do. + + ;; Canonicalizing is required because Icecat compares the path + ;; against its local database to know if there is an extension + ;; update. A path that contains the store path will change every + ;; time the package is updated. + (mkdir-p search-dir) + (symlink (in-vicinity (ungexp pkg pkg-output) id) + (in-vicinity search-dir id)))))))) diff --git a/gnu/local.mk b/gnu/local.mk index a53701c673b7..17916a106dfb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -13,7 +13,7 @@ # Copyright © 2016-2023 Efraim Flashner # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice -# Copyright © 2017, 2018 Clément Lassieur +# Copyright © 2017, 2018, 2023 Clément Lassieur # Copyright © 2017, 2020 Mathieu Othacehe # Copyright © 2017, 2018, 2019 Gábor Boskovits # Copyright © 2018 Amirouche Boubekki @@ -759,6 +759,7 @@ GNU_SYSTEM_MODULES = \ %D%/build/chromium-extension.scm \ %D%/build/cross-toolchain.scm \ %D%/build/dbus-service.scm \ + %D%/build/icecat-extension.scm \ %D%/build/image.scm \ %D%/build/jami-service.scm \ %D%/build/file-systems.scm \ @@ -1406,6 +1407,8 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-102-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-compare-canonicalized-paths.patch \ + %D%/packages/patches/icecat-use-guix-extensions.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \ diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 3f6da8d77a3f..8a76f3a3e042 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2023 Nicolas Graves +;;; Copyright © 2023 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages browser-extensions) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu build chromium-extension) + #:use-module (gnu build icecat-extension) #:use-module (gnu packages compression) #:use-module (gnu packages python)) @@ -98,6 +100,7 @@ (define ublock-origin "1i8rnij3sbwg6vj6znprrsca0n5xjzhmhppaa8v6jyxg6wrrfch1")))) (build-system gnu-build-system) (outputs '("xpi" "firefox" "chromium")) + (properties '((id . "uBlock0@raymondhill.net"))) (arguments (list #:tests? #f ;no tests @@ -125,9 +128,10 @@ (define ublock-origin (invoke "./tools/make-chromium.sh"))) (add-after 'build-chromium 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((firefox (assoc-ref outputs "firefox")) - (xpi (assoc-ref outputs "xpi")) - (chromium (assoc-ref outputs "chromium"))) + (let* ((id #$(assq-ref (package-properties this-package) 'id)) + (firefox (in-vicinity (assoc-ref outputs "firefox") id)) + (xpi (assoc-ref outputs "xpi")) + (chromium (assoc-ref outputs "chromium"))) (install-file "dist/build/uBlock0.firefox.xpi" (string-append xpi "/lib/mozilla/extensions")) (copy-recursively "dist/build/uBlock0.firefox" firefox) @@ -142,3 +146,6 @@ (define ublock-origin (define-public ublock-origin/chromium (make-chromium-extension ublock-origin "chromium")) + +(define-public ublock-origin/icecat + (make-icecat-extension ublock-origin "firefox")) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ab629afd3d20..1ef30498e49c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017, 2023 Clément Lassieur ;;; Copyright © 2017, 2018 Nikita ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Ricardo Wurmus @@ -880,16 +880,13 @@ (define-public icecat-minimal #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((patch (search-input-file inputs "bin/patch"))) - (for-each (match-lambda - ((label . file) - (when (and (string-prefix? "icecat-" label) - (string-suffix? ".patch" label)) - (format #t "applying '~a'...~%" file) - (invoke patch "--force" "--no-backup-if-mismatch" - "-p1" "--input" file)))) - (or native-inputs inputs))))) + (lambda _ + (for-each + (lambda (file) (invoke "patch" "--force" "-p1" "-i" file)) + '(#$(local-file + (search-patch "icecat-compare-canonicalized-paths.patch")) + #$(local-file + (search-patch "icecat-use-guix-extensions.patch")))))) (add-after 'apply-guix-specific-patches 'remove-bundled-libraries (lambda _ ;; Remove bundled libraries that we don't use, since they may diff --git a/gnu/packages/patches/icecat-compare-canonicalized-paths.patch b/gnu/packages/patches/icecat-compare-canonicalized-paths.patch new file mode 100644 index 000000000000..f0130062624b --- /dev/null +++ b/gnu/packages/patches/icecat-compare-canonicalized-paths.patch @@ -0,0 +1,33 @@ +--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm ++++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -3452,6 +3452,7 @@ const XPIDatabaseReconcile = { + if ( + newAddon || + oldAddon.updateDate != xpiState.mtime || ++ oldAddon.path != xpiState.path || + (aUpdateCompatibility && this.isAppBundledLocation(installLocation)) + ) { + newAddon = this.updateMetadata( +@@ -3460,8 +3461,6 @@ const XPIDatabaseReconcile = { + xpiState, + newAddon + ); +- } else if (oldAddon.path != xpiState.path) { +- newAddon = this.updatePath(installLocation, oldAddon, xpiState); + } else if (aUpdateCompatibility || aSchemaChange) { + newAddon = this.updateCompatibility( + installLocation, +--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm ++++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm +@@ -1167,8 +1167,9 @@ class SystemAddonDefaults extends DirectoryLocation { + + // Only attempt to load unpacked directory if unofficial build. + if (!AppConstants.MOZILLA_OFFICIAL && !file.exists()) { +- file = this.dir.clone(); +- file.append(`${id}`); ++ let symlink = this.dir.clone(); ++ symlink.append(`${id}`); ++ file = symlink.isSymlink() ? new nsIFile(symlink.target) : symlink; + } + + addons.set(id, file); diff --git a/gnu/packages/patches/icecat-use-guix-extensions.patch b/gnu/packages/patches/icecat-use-guix-extensions.patch new file mode 100644 index 000000000000..0d90ea98b685 --- /dev/null +++ b/gnu/packages/patches/icecat-use-guix-extensions.patch @@ -0,0 +1,30 @@ +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -415,13 +415,20 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent, + #if defined(XP_UNIX) && !defined(XP_MACOSX) + else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) { + # ifdef ENABLE_SYSTEM_EXTENSION_DIRS +-# if defined(__OpenBSD__) || defined(__FreeBSD__) +- static const char* const sysLExtDir = "/usr/local/share/mozilla/extensions"; +-# else +- static const char* const sysLExtDir = "/usr/share/mozilla/extensions"; +-# endif +- rv = NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), false, +- getter_AddRefs(file)); ++ rv = GetUserDataDirectoryHome(getter_AddRefs(file), false); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ rv = file->AppendNative(".guix-profile"_ns); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ rv = file->AppendNative("share"_ns); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ rv = file->AppendNative("icecat"_ns); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ rv = file->AppendNative("extensions"_ns); ++ NS_ENSURE_SUCCESS(rv, rv); + # endif + } + #endif // defined(XP_UNIX) && !defined(XP_MACOSX)