From patchwork Sun Jun 20 09:32:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 30538 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 C7BB627BC81; Sun, 20 Jun 2021 10:33:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8DAAB27BC78 for ; Sun, 20 Jun 2021 10:33:11 +0100 (BST) Received: from localhost ([::1]:56432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lutpG-0008T4-Ki for patchwork@mira.cbaines.net; Sun, 20 Jun 2021 05:33:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lutp8-0008Sm-Gx for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lutp8-0007Hl-6f for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lutp8-0004U1-2O for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48980] [PATCH v2 1/2] gnu: icecat: Add WebAuthn support. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Jun 2021 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48980@debbugs.gnu.org Received: via spool by 48980-submit@debbugs.gnu.org id=B48980.162418155317179 (code B ref 48980); Sun, 20 Jun 2021 09:33:02 +0000 Received: (at 48980) by debbugs.gnu.org; 20 Jun 2021 09:32:33 +0000 Received: from localhost ([127.0.0.1]:33083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lutoe-0004Sw-Vk for submit@debbugs.gnu.org; Sun, 20 Jun 2021 05:32:33 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:33971) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lutod-0004Se-Cq for 48980@debbugs.gnu.org; Sun, 20 Jun 2021 05:32:32 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 851F820004 for <48980@debbugs.gnu.org>; Sun, 20 Jun 2021 09:32:24 +0000 (UTC) From: Brice Waegeneire Date: Sun, 20 Jun 2021 11:32:21 +0200 Message-Id: <20210620093222.3519-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210612211630.10339-1-brice@waegenei.re> References: <20210612211630.10339-1-brice@waegenei.re> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev. [phases]: Add eudev to the wrapper. --- gnu/packages/gnuzilla.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) Rebased. diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a997fc1c73..84feab777e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Adrian Malacoda ;;; Copyright © 2020 Jonathan Brielmaier ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -910,6 +911,7 @@ from forcing GEXP-PROMISE." ;; UNBUNDLE-ME! ("nss" ,nss) ("shared-mime-info" ,shared-mime-info) ;; UNBUNDLE-ME! ("sqlite" ,sqlite) + ("eudev" ,eudev) ("unzip" ,unzip) ("zip" ,zip) ;; UNBUNDLE-ME! ("zlib" ,zlib) @@ -1271,24 +1273,21 @@ from forcing GEXP-PROMISE." (lib (string-append out "/lib")) (gtk (assoc-ref inputs "gtk+")) (gtk-share (string-append gtk "/share")) - (mesa (assoc-ref inputs "mesa")) - (mesa-lib (string-append mesa "/lib")) - (pulseaudio (assoc-ref inputs "pulseaudio")) - (pulseaudio-lib (string-append pulseaudio "/lib")) - (libxscrnsaver (assoc-ref inputs "libxscrnsaver")) - (libxscrnsaver-lib (string-append libxscrnsaver "/lib")) - (mit-krb5 (assoc-ref inputs "mit-krb5")) - (mit-krb5-lib (string-append mit-krb5 "/lib"))) + (ld-libs (map (lambda (lib) + (string-append (assoc-ref inputs lib) + "/lib")) + '("libxscrnsaver" + "mesa" + "mit-krb5" + "udev" + "pulseaudio")))) (wrap-program (car (find-files lib "^icecat$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) ;; The following line is commented out because the icecat ;; package on guix has been observed to be unstable when ;; using wayland, and the bundled extensions stop working. ;; `("MOZ_ENABLE_WAYLAND" = ("1")) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib - ,mesa-lib - ,libxscrnsaver-lib - ,mit-krb5-lib))) + `("LD_LIBRARY_PATH" prefix ,ld-libs)) #t)))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") From patchwork Sun Jun 20 09:32:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 30539 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 B431D27BC81; Sun, 20 Jun 2021 10:33:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 423A527BC78 for ; Sun, 20 Jun 2021 10:33:12 +0100 (BST) Received: from localhost ([::1]:56434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lutpH-0008TF-Ai for patchwork@mira.cbaines.net; Sun, 20 Jun 2021 05:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lutp8-0008St-QT for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lutp8-0007IR-Ia for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lutp8-0004U8-Gq for guix-patches@gnu.org; Sun, 20 Jun 2021 05:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48980] [PATCH v2 2/2] gnu: icedove: Add WebAuthn support. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Jun 2021 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48980 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48980@debbugs.gnu.org Received: via spool by 48980-submit@debbugs.gnu.org id=B48980.162418155817192 (code B ref 48980); Sun, 20 Jun 2021 09:33:02 +0000 Received: (at 48980) by debbugs.gnu.org; 20 Jun 2021 09:32:38 +0000 Received: from localhost ([127.0.0.1]:33085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lutok-0004TD-Ca for submit@debbugs.gnu.org; Sun, 20 Jun 2021 05:32:38 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:29687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lutoe-0004Sg-DI for 48980@debbugs.gnu.org; Sun, 20 Jun 2021 05:32:32 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id DEB54240008 for <48980@debbugs.gnu.org>; Sun, 20 Jun 2021 09:32:25 +0000 (UTC) From: Brice Waegeneire Date: Sun, 20 Jun 2021 11:32:22 +0200 Message-Id: <20210620093222.3519-2-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210620093222.3519-1-brice@waegenei.re> References: <20210612211630.10339-1-brice@waegenei.re> <20210620093222.3519-1-brice@waegenei.re> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnuzilla.scm (icedove)[inputs]: Add eudev. [phases]: Add eudev to the wrapper. --- gnu/packages/gnuzilla.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 84feab777e..053d4f1822 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1542,10 +1542,12 @@ standards of the IceCat project.") (gtk (assoc-ref inputs "gtk+")) (gtk-share (string-append gtk "/share")) (pulseaudio (assoc-ref inputs "pulseaudio")) - (pulseaudio-lib (string-append pulseaudio "/lib"))) + (pulseaudio-lib (string-append pulseaudio "/lib")) + (eudev (assoc-ref inputs "eudev")) + (eudev-lib (string-append eudev "/lib"))) (wrap-program (car (find-files lib "^icedove$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib))) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib))) #t)))))) (inputs `(("bzip2" ,bzip2) @@ -1581,6 +1583,7 @@ standards of the IceCat project.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) + ("eudev" ,eudev) ("unzip" ,unzip) ("zip" ,zip) ("zlib" ,zlib)))