From patchwork Thu Feb 9 16:37:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46770 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 880A616544; Thu, 9 Feb 2023 16:39:41 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 BBCF91643E for ; Thu, 9 Feb 2023 16:39:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9wt-0002Ei-VY; Thu, 09 Feb 2023 11:39:04 -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 1pQ9ws-0002D9-Rg for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9ws-0007a6-Hl for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9ws-0004NI-Cb for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 1/6] gnu: icedove-wayland: Use gexps. References: <20230209163006.28078-1-maxim.cournoyer@gmail.com> In-Reply-To: <20230209163006.28078-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596068516658 (code B ref 61391); Thu, 09 Feb 2023 16:39:02 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:05 +0000 Received: from localhost ([127.0.0.1]:33486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vw-0004KW-Vj for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:05 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:43984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vv-0004Jt-HJ for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:03 -0500 Received: by mail-qt1-f170.google.com with SMTP id cr22so2547832qtb.10 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gzKuW7ZxYUjOCYCZyyPtAX+MogXAZb0ThBRzyq98RZM=; b=DshYDLQ/7jzmA6fAHT+ZaxNq+tVBANp2feOMpUzoki3Snx5yw4/R+D7gnrAm23pQbX CwYeGgPaDDp7zzAE0AsfSriuSgxDGTHT6z9BjnRyM1+k1CGzebXtywBw2CwIgvGEFd8a hxf6zUfWwUOMvPURIj6dg/eqXizeBXN8k6RNnKFXsm7AM4NhH2i0SFVFlKJVKJGHKeIY OfHRWUSIpsjEEju86caZbtQu+WVOE7LLSzA2pdjNwwuTSPB7+K2kbwwmvuAv/HFUYvw1 rn60g1v8X0Z8/7eGcursLb0m1JIM12wBgM2NOMM2A38ERRX6owMDSnGJQJnAz35RHSjy vJ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gzKuW7ZxYUjOCYCZyyPtAX+MogXAZb0ThBRzyq98RZM=; b=L4btiwjXh1NuhvsEsuVmr0JqzaCWJ/+UCDGICu9xrOPxYVBl71Bm41v+JfX5tt+Sas CTpCZEaYlSBkG6QlU9CBp0sX9/75hRRE64BmgaU2mMoPOjUEI3xwrtxF/gT2aF7r/lPe 7nV4/u7aBb2sKo9wlErjl89/VZVYHNqec4veZh516yr2j9ahwKiOs139cHr7kWQwmw72 g5sd6xPa+8/youSEJuTkOn3a2zuRq4mbaGG8Rov8v7pdUPM2yXyGiHf1bLifK5Rq7eeh mn5ndM+MIzph/1xS4VXTVW/FMCWQ9b6NfOsE96gM6wzGTL/c4Bx1qi6GqX+TjQ5GNAUm /kJA== X-Gm-Message-State: AO0yUKV1osFSB7I5cWr6+jWVvzR8RcC5MlB2if8R5G6mbgzKbXY0Cm1U ogHZMNwXDuH69Fx9G4pMKeY03wzUKNByXah3 X-Google-Smtp-Source: AK7set8yyUBLsuYL65iVrdsA28X4k3fwUWsWx7RtBOWJsiR/2vnjD3nfFpf0lTqXhVqkjAf4fMQOUA== X-Received: by 2002:ac8:59cf:0:b0:3b9:bc26:3329 with SMTP id f15-20020ac859cf000000b003b9bc263329mr20707939qtf.64.1675960677855; Thu, 09 Feb 2023 08:37:57 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:37:57 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:38 -0500 Message-Id: <20230209163744.28973-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 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 (icedove/wayland) [inputs]: Set to the empty list. [arguments]: Use gexps. --- gnu/packages/gnuzilla.scm | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0b39774a2e..15472ffed2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1420,37 +1420,30 @@ (define-public icedove/wayland (package (inherit icedove) (name "icedove-wayland") - (native-inputs '()) - (inputs - `(("bash" ,bash-minimal) - ("icedove" ,icedove))) (build-system trivial-build-system) (arguments - '(#:modules ((guix build utils)) - #:builder - (begin + (list + #:modules '((guix build utils)) + #:builder + #~(begin (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "bash")) - (icedove (assoc-ref %build-inputs "icedove")) - (out (assoc-ref %outputs "out")) - (exe (string-append out "/bin/icedove"))) + (let* ((exe (string-append #$output "/bin/icedove"))) (mkdir-p (dirname exe)) - (call-with-output-file exe (lambda (port) (format port "#!~a MOZ_ENABLE_WAYLAND=1 exec ~a $@" - (string-append bash "/bin/bash") - (string-append icedove "/bin/icedove")))) + #$(file-append bash-minimal "/bin/bash") + #$(file-append icedove "/bin/icedove")))) (chmod exe #o555) - ;; Provide the manual and .desktop file. - (copy-recursively (string-append icedove "/share") - (string-append out "/share")) - (substitute* (string-append - out "/share/applications/icedove.desktop") - ((icedove) out)) - #t)))))) + (copy-recursively (string-append #$icedove "/share") + (string-append #$output "/share")) + (substitute* (string-append #$output + "/share/applications/icedove.desktop") + ((#$icedove) #$output)))))) + (native-inputs '()) + (inputs '()))) (define-public firefox-decrypt (package From patchwork Thu Feb 9 16:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46772 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 8D56316544; Thu, 9 Feb 2023 16:39:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 E4A0B163F8 for ; Thu, 9 Feb 2023 16:39:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9wt-0002Ed-V6; Thu, 09 Feb 2023 11:39:03 -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 1pQ9wt-0002DZ-4V for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9ws-0007aG-Re for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9ws-0004NQ-OQ for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 2/6] gnu: Add nspr-next. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596068816673 (code B ref 61391); Thu, 09 Feb 2023 16:39:02 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:08 +0000 Received: from localhost ([127.0.0.1]:33490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vz-0004Kq-E6 for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:07 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:38831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vw-0004Jv-LK for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:05 -0500 Received: by mail-qt1-f178.google.com with SMTP id c2so2581461qtw.5 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ocSGOvOmY7myNXD/gkX3DSyZkraX4c5zDzwRBdvujiI=; b=aC6vnfFcCVUq7X34D27ak9XXn35oCa6PQWl6Ox7tdzbQYdadqHcWvJ+Uiq2M8zYn8+ nb6w+RA98xoHrnxvYcyhEGeW4lkv/UhaAnQ52ZYlZyh3zz3EUOU/RcuclYGsoKvyzyqw GZPCukT/CF89yz6fj0JZz+lRVwNMdyY+G1yRvokxQl1CEDuQDma1WU8up8xZd2/bVu5c 6UWKiO9R2prBqV3TFNbYzoI6lLBeAEkdJmc7nbC3UNOAXROqQlXF585vyO3Sn4gWDjFR gLrDRQ4PJvlG3iNbRqec/B2UP/UO5RSfqmZgqowAEIk7kK2lCM3AG4DJIqD8oqNeR1um SyNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ocSGOvOmY7myNXD/gkX3DSyZkraX4c5zDzwRBdvujiI=; b=3YHjqveSIT/Dryudu5gZZutqIMubQtcRtzB8sged4Ji2sAe2QXQWE/LkHYd3OgMFZT gdCfrvAK0YbKVOGC5FO9wfXL3J3Cn8GYEQLv9SFBfYXyxWI880uVqVTsxfvda7zKiHY/ kPyq5++H6lUIjbFuGinfQJERrGz2UNhRfmHv2ihzFkDtsino3kjxx5FxCE8tpVuUSKrh T6RqoeOuh0oRMEjbQzUh2Q0hbiHFBBrl7Rc43S1LC7l3X28L8ebeg+Y01i5P38YYczzO Ob8YgTFfNOkDQSOlQJRI+HfedpfW4SCoJrw45KUvVnqQFiSiaRoDbOG0EPY/0ex0/RkO pqmQ== X-Gm-Message-State: AO0yUKUbcG+/k/0q/d3xAr/1x34/MSJdLUPS6HNf2ZiS1jBfQDEMtHPH gkIu3vcCTqnVNcSeKM+Z+pnbpJXGbWvn0ZZ9 X-Google-Smtp-Source: AK7set8Y3U2p7wx5H0XHLqFrWGAn1j3YQB5DhqdCPfAkgeBGRFD4YARh3SmvCRiYgupYFYgZqp48Zg== X-Received: by 2002:a05:622a:49:b0:3b6:980e:87e7 with SMTP id y9-20020a05622a004900b003b6980e87e7mr4699131qtw.24.1675960679070; Thu, 09 Feb 2023 08:37:59 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:37:58 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:39 -0500 Message-Id: <20230209163744.28973-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209163744.28973-2-maxim.cournoyer@gmail.com> References: <20230209163744.28973-2-maxim.cournoyer@gmail.com> 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/nss.scm (nspr-next): New variable. --- gnu/packages/nss.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 0d18592be4..b24f9abdde 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Jonathan Brielmaier -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. @@ -107,6 +107,19 @@ (define-public nspr-4.32 (base32 "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv")))))) +(define-public nspr-next + (package + (inherit nspr) + (version "4.35") + (source (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v" + version "/src/nspr-" version ".tar.gz")) + (sha256 + (base32 + "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy")))))) + (define-public nss (package (name "nss") From patchwork Thu Feb 9 16:37:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46773 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 7E19B1643E; Thu, 9 Feb 2023 16:39:48 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 090BA16213 for ; Thu, 9 Feb 2023 16:39:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9wv-0002GH-8a; Thu, 09 Feb 2023 11:39:05 -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 1pQ9wt-0002E9-IP for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9wt-0007aa-9p for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9wt-0004NY-4t for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 3/6] gnu: Add nss-next. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596068816686 (code B ref 61391); Thu, 09 Feb 2023 16:39:03 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:08 +0000 Received: from localhost ([127.0.0.1]:33492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vz-0004Ks-Qu for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:08 -0500 Received: from mail-qt1-f170.google.com ([209.85.160.170]:38827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vx-0004Jx-PZ for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:06 -0500 Received: by mail-qt1-f170.google.com with SMTP id c2so2581549qtw.5 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XOYVT6nqk4Tk/agoXvknIdZPYVEkTTmMIxjy2B1GoEo=; b=ERPoHnfqp3Z5pTYqCiGYiUAvXwW4w6H09F3lvTsO8ahTPQpVco2lvoHek324Vysnxi Y1rODJDkNkbeKirsxwVBVwVLXCydutgtTAv80LYGNoyCoF6lePFW6ykEtg/hRq7B472f Y/zYgTFPygIO0HrklrTW4AojsXX62q5elh4iBf4su4hi2aJpU/2cx40sbVCZ/B0SaCod Yguck0tAYTRtpjY/freqRMUseRzbHnIzcS+5PnT+97WBfZfExKyF+UT3CWzvmgtP8Ysl P0A6CWjHzs0G6lxnrbLWz9+VlPsznl9RyQXsn1sorQzvxGIDAe2DcHXNP51BuW2T0ngl mxIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XOYVT6nqk4Tk/agoXvknIdZPYVEkTTmMIxjy2B1GoEo=; b=szcMcbmE06bDKn8gZVy/JbgS90xExqRPSMz8yvkKISMGaOZW9jtUNaViMJk85PyivE d2JDmkj96ZtFOhwdaMWnDT54iB8GLNCiZaTpOJqYHCpwE/qf7EIIXG7DMnQ2euwvyFcG imMeOxZTQUQK5NrtjqjblRCeDls76yEewszPWNB8XtyHXm6gEJJfXXjC3ovk2dCiwMTe KkCc+EOKd99vsWdcNqGA+H6oNH+BPUy4UDhr6x+pAWS0PGQuEjjs9ZI6s4D0AAPTnk6j LwfaG8bNVzqAl82KDdRk9M3uLNgjxmQQ/lWaAtza8BHMiFuIc1tKsfmsXWeu+Z8+Kuy5 7z9Q== X-Gm-Message-State: AO0yUKUpE1OWXBSj5iwwBXKtBXZdOekxbEL2/KeFlYjntK6G9kAyas1H IaSvEabPOp8X9CL414PMAvac9qdmdbUPkSz9 X-Google-Smtp-Source: AK7set8EcNmEyCt+2QDyZ1mCCNUgiu+v/UUNG8vHVYoiMxmlQTyNeuKmdXniwBQfMoxV5stjbPtwtg== X-Received: by 2002:ac8:5ad5:0:b0:3b8:6833:3ad2 with SMTP id d21-20020ac85ad5000000b003b868333ad2mr20442417qtd.65.1675960680250; Thu, 09 Feb 2023 08:38:00 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.37.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:37:59 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:40 -0500 Message-Id: <20230209163744.28973-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209163744.28973-2-maxim.cournoyer@gmail.com> References: <20230209163744.28973-2-maxim.cournoyer@gmail.com> 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/nss.scm (nss-next): New variable. --- gnu/packages/nss.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b24f9abdde..7101dbfdd3 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -242,3 +242,20 @@ (define-public nss PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.") (license license:mpl2.0))) + +(define-public nss-next + (package + (inherit nss) + (version "3.83") + (source (origin + (inherit (package-source nss)) + (uri (let ((version-with-underscores + (string-join (string-split version #\.) "_"))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" + "releases/NSS_" version-with-underscores "_RTM/src/" + "nss-" version ".tar.gz"))) + (sha256 + (base32 + "0a01xwfrr334mibj1agbykjkc72ph906f2n8ff5hn2b4z5kyl8xb")))) + (propagated-inputs (list nspr-next)))) From patchwork Thu Feb 9 16:37:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46774 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 E7EE016544; Thu, 9 Feb 2023 16:39:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 199F416213 for ; Thu, 9 Feb 2023 16:39:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9wv-0002GK-Fq; Thu, 09 Feb 2023 11:39:05 -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 1pQ9wu-0002F7-1i for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9wt-0007ap-PY for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9wt-0004Nf-LP for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 4/6] gnu: icedove: Unbundle NSS. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596069016711 (code B ref 61391); Thu, 09 Feb 2023 16:39:03 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:10 +0000 Received: from localhost ([127.0.0.1]:33496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9w2-0004LP-9Q for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:10 -0500 Received: from mail-qv1-f54.google.com ([209.85.219.54]:42706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9vz-0004KH-7x for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:07 -0500 Received: by mail-qv1-f54.google.com with SMTP id i1so1697048qvo.9 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zbJh8t+SXKzCBk8lzYUmKwVc79WfLim90Z2H8ANk6+4=; b=qqP/Xlu6XKejBzysAm2Tq4YuyaYehBe4ERbN5lgCvHsnr/qIarIV+MSG4ir2nhpDOy ypp0P/X18ToWCDebsHxmFmyKN/DLYVqAv3X0LO9rd9tviK2511Rn5m5kCvDeYcVhoJoN zc/WkzMw+TroWjNnZpB9ATYCDzKmdu6muT9KyvIxgLkwqelr1A+XHsFkiSr5yEjToMiT TFCkcuAT7B+P8A+w4Wsjvj99J21rY2BcOKEbuUIsXRbrhBXjsQFa71wOny3icUXt5E14 BjldRaz/YxOHic+7rJM8liB5b/NcKQJYPBBM6jT4D97iNJz7ljnfW2g5vmp1sjf+K/RZ Amog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zbJh8t+SXKzCBk8lzYUmKwVc79WfLim90Z2H8ANk6+4=; b=XGRgP7ScA5+t9C7zYGIK4CdgXqeCx0thHFUdFDRldfSBEXr/Zn/UQSd47e6ohbqxja WTMbEc6nTmGCSztdL0AEGNFtkIMth080V81XdjapbMaecOgA15lvswB4BAHnCgOkWnXD Cdaf3MgYHY2e5Msz7H1Sw1SZlYhbiu+B+upccw3f6QcvLYsQtLBQUYns8tnXaYQHXQSy ievYAKrrSuioFlxjDDkWMuCvLERKSYkCh1HOj28BIaUNL2ZgoJEfdalQDwt1r+7cPZSx IDh824JqexNXj/Es+iBg6ASq3+b3hpxfO0eS3fMWZe1X/AWfedEE63wlkO3FNnJGE3En FWsQ== X-Gm-Message-State: AO0yUKWxt6P44GPpKk+jeCWVuBnJDSZ9BsWAlXyX6D41Pq7uGPbSCiDo kJJxA3V6zVq8o57k/Dr+x79OvLQ1ryY39PfX X-Google-Smtp-Source: AK7set96FhGUcess0Or1SHmnNTyApDKx6Tvkw9WnRjJYu3Dtqdsnc0RS3fh4O/VPyW0kFvksgPPItA== X-Received: by 2002:a05:6214:e41:b0:56b:7ec7:b158 with SMTP id o1-20020a0562140e4100b0056b7ec7b158mr20761882qvc.36.1675960681617; Thu, 09 Feb 2023 08:38:01 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:38:01 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:41 -0500 Message-Id: <20230209163744.28973-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209163744.28973-2-maxim.cournoyer@gmail.com> References: <20230209163744.28973-2-maxim.cournoyer@gmail.com> 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 (icedove) [inputs]: Add nss-next. Remove nspr-4.32. [configure]: Add "ac_add_options --with-system-nss". --- gnu/packages/gnuzilla.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 15472ffed2..44e56a6573 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1306,7 +1306,7 @@ (define-public icedove "ac_add_options --with-system-jpeg\n" "ac_add_options --with-system-libevent\n" "ac_add_options --with-system-nspr\n" - ;"ac_add_options --with-system-nss\n" + "ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" "ac_add_options --without-wasm-sandboxed-libraries\n" "mk_add_options MOZ_MAKE_FLAGS=-j" @@ -1383,9 +1383,7 @@ (define-public icedove libxt mesa mit-krb5 - nspr-4.32 - ;; FIXME: create nss >= 3.68 after core-updates merge - ;;nss + nss-next pango pixman pulseaudio From patchwork Thu Feb 9 16:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46771 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 3733516546; Thu, 9 Feb 2023 16:39:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 1BBA516213 for ; Thu, 9 Feb 2023 16:39:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9wv-0002GL-OS; Thu, 09 Feb 2023 11:39:05 -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 1pQ9wu-0002FU-ET for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9wu-0007ay-6F for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9wu-0004Nn-2P for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 5/6] gnu: icedove: Use more gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596069116718 (code B ref 61391); Thu, 09 Feb 2023 16:39:04 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:11 +0000 Received: from localhost ([127.0.0.1]:33498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9w2-0004LZ-Kq for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:10 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:37847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9w0-0004KL-EK for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:08 -0500 Received: by mail-qt1-f175.google.com with SMTP id m12so2585747qth.4 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MwxrBDV3rkzRLFtFBKuySHtj8YRP7aYtTsA/YHUjKYA=; b=Y5Rwmz5uf3PJuvkDUCy9fA+qbD+0KqdhYYlk5W5KN14Fuo4JmjakCEGmUwxp1XkUPG wX8ngrptr+SDBuDw5nMkMfSubaQATzRTuOdk6pr4xa2c2Vo2ta60tLHKkbNQyUA7lXV0 hjYnynYvR4Ru25Fc2dfeXrWk2J59DO3TRtHo8kwhwGHy6X4WM5rW9AuJN78Y8EW45d6b 4lhr5pwBQ/5rSPZKkjtA9rIivXbqJppm1MO/khN/aFaBVqtbS2ZcuQ/YMsz3Uaxfgf/0 FtKQUsKrG+NAxPQxgQTBE7Y//DsXg1dZj13UkyG/HD6zDwY1FdIPDh/v4zYkUkpxiPDC rnEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MwxrBDV3rkzRLFtFBKuySHtj8YRP7aYtTsA/YHUjKYA=; b=GSq6yO4o6sPEqi+EoOdCdfMkL5s0B2p+ANlbWwfCyr+Ux1ASCdAlSwSAtktZ74hQ96 dhsJVF7bJD67iNka6fWK7hlfIPj6s3OV5L13c1QkbdVH/LMHkiEbnDIaUEBoNqNAOlLY PD2t4ed/3xLjATtF4ALmxILvHiKIZ74ICWjxBICcIpMSgS1jHWeFKQUEmwwwXdMLwogw 9tRrOiIJ9bZWS4/MFTPIsiJ4K3lHYNByu2cFCkdQbq71qw8DLerlOgq7ysdaejhMD5gg 6lNK+tteFz55wuUXSveu9e9BvvFBHFlgA9ET/PMRuuVQA4AdJMMml/va6BJ6h06q58fz 0oXg== X-Gm-Message-State: AO0yUKXa0rDWadFKOlALEIH3h438goDPUfbNYAWpAcRdP3R8L0DWP9uA XWJK51ilaL+ZmfH5nUqDCIAZqpJFXumd5p0l X-Google-Smtp-Source: AK7set8q6O6jBVenga0QyH/UFiDx1/nvJXnuq8jfv1VXECpPw8dBDS7yio4TbBEFR+C7US4/9k+Lvg== X-Received: by 2002:a05:622a:43:b0:3b9:b66a:2569 with SMTP id y3-20020a05622a004300b003b9b66a2569mr22136973qtw.7.1675960682831; Thu, 09 Feb 2023 08:38:02 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:38:02 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:42 -0500 Message-Id: <20230209163744.28973-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209163744.28973-2-maxim.cournoyer@gmail.com> References: <20230209163744.28973-2-maxim.cournoyer@gmail.com> 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 (icedove) [configure]: Use search-input-file and this-package-native-input. --- gnu/packages/gnuzilla.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 44e56a6573..ecb8edd914 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1246,7 +1246,8 @@ (define-public icedove (string-drop hash 8)))))) (delete 'bootstrap) (replace 'configure - (lambda* (#:key inputs configure-flags #:allow-other-keys) + (lambda* (#:key native-inputs inputs configure-flags + #:allow-other-keys) (let* ((bash (which "bash")) (abs-srcdir (getcwd)) (srcdir (string-append "../" (basename abs-srcdir))) @@ -1298,9 +1299,12 @@ (define-public icedove "ac_add_options --enable-system-ffi\n" "ac_add_options --enable-system-pixman\n" "ac_add_options --prefix=" #$output "\n" - "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n" + "ac_add_options --with-clang-path=" + (search-input-file (or native-inputs inputs) + "bin/clang") "\n" "ac_add_options --with-distribution-id=org.gnu\n" - "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n" + "ac_add_options --with-libclang-path=" + #$(this-package-native-input "clang") "/lib\n" "ac_add_options --with-system-bz2\n" "ac_add_options --with-system-icu\n" "ac_add_options --with-system-jpeg\n" From patchwork Thu Feb 9 16:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46769 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 A65171643E; Thu, 9 Feb 2023 16:39:13 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 0E2D5163F8 for ; Thu, 9 Feb 2023 16:39:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ9ww-0002Gx-9M; Thu, 09 Feb 2023 11:39:06 -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 1pQ9wu-0002Fe-Pw for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQ9wu-0007b3-HX for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQ9wu-0004Nu-Dd for guix-patches@gnu.org; Thu, 09 Feb 2023 11:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61391] [PATCH 6/6] gnu: icedove: Install icons. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Feb 2023 16:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61391 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61391@debbugs.gnu.org Cc: Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 61391-submit@debbugs.gnu.org id=B61391.167596069516731 (code B ref 61391); Thu, 09 Feb 2023 16:39:04 +0000 Received: (at 61391) by debbugs.gnu.org; 9 Feb 2023 16:38:15 +0000 Received: from localhost ([127.0.0.1]:33500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9w6-0004Ln-Va for submit@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:15 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:42631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQ9w1-0004KU-KX for 61391@debbugs.gnu.org; Thu, 09 Feb 2023 11:38:09 -0500 Received: by mail-qt1-f182.google.com with SMTP id 5so2554957qtp.9 for <61391@debbugs.gnu.org>; Thu, 09 Feb 2023 08:38:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9QdmQDMm2lK02GhJZweYhQokh+puKP9cNU5L3xnHYXw=; b=n6L862LjSEQ2gxmVOr25jrQItifc647S/oJAENu5mzR/xVvULl9nau65t1QhsZ07eQ kDysv8zWK/n6HxQivMbwuP/8CiXuCl+vHleWNxOQh0mLS4zuPhabCPhQMvplmwty706p YibUIEJPN1WzSgcZVY4/kxMDy5ei4XTSws4CVg9+p9NnWA0dpDjmCzfaGw/CjhUMmGP4 lVnE4QQ02mFLpTspVsC1LrT9yBH0VTmIC5JPe9bbLwcVfLkFy72Vq/ZmjEZDn6RvfkjJ 7q+3mAw18asl2ik8tUMkF+A5OarEYRux2634g8Ygfu1/qu2eXfcS4WSyhSANZJTCYJxl 7nzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9QdmQDMm2lK02GhJZweYhQokh+puKP9cNU5L3xnHYXw=; b=2cKydr+OR6OXDpqMLfF0Gu5D3VbIE5pno2VBq9Qti8+5s1doxWEWyvvkTqqGrEG7kA S5SeWbXypCi9rxQTiQXZZ6soVXrBuKc5Bwjw4h2r91iC/efYRBmZmKx3adstFbdfsHJa ZJGeMUIrBnM/keKfoeCiqiAJjIjW68l7aGKEpVCsdgnQz6oxCnNBTC308z3SBFVhvxNd DrjaQTBEDEq9CnLMeIjSItRXA7d80K5TAsN/JZusly3E+NXJ6A9sEpRTZZ4c9Y/5o/nG UKLIhJoMrho0bY0nxKQe+cVzcAC4Apwik4R5lNbuX8hPMWXIRunrGXzoWmIt0w6jcNyV OUVw== X-Gm-Message-State: AO0yUKWNpDsgak7mMHNQMyyUFZbnf3gFTlWb7OdooKkWQwOGCP7Y5Tr/ hfMVxD4ZMHpkPIN/6H98vYjvBcu03hPulouD X-Google-Smtp-Source: AK7set8PjylFLDV7pbdH2wGcw4vmZ5RoksJOg8tTha0dYGT9c9AtnavKGm5xYjaOZeKRG7bMasf8Pg== X-Received: by 2002:ac8:5fd2:0:b0:3b9:bd75:9415 with SMTP id k18-20020ac85fd2000000b003b9bd759415mr22173569qta.41.1675960684029; Thu, 09 Feb 2023 08:38:04 -0800 (PST) Received: from localhost.localdomain (dsl-151-105.b2b2c.ca. [66.158.151.105]) by smtp.gmail.com with ESMTPSA id 21-20020ac856f5000000b003a6a19ee4f0sm1548116qtu.33.2023.02.09.08.38.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 08:38:03 -0800 (PST) From: Maxim Cournoyer Date: Thu, 9 Feb 2023 11:37:43 -0500 Message-Id: <20230209163744.28973-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230209163744.28973-2-maxim.cournoyer@gmail.com> References: <20230209163744.28973-2-maxim.cournoyer@gmail.com> 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 (icedove) [phases]: Add install-icons phase. --- gnu/packages/gnuzilla.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ecb8edd914..ec9a3409ba 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1347,6 +1347,19 @@ (define-public icedove Name=Write new message~@ Exec=~@*~a/bin/icedove -compose~%" #$output)))))) + (add-after 'install-desktop-file 'install-icons + (lambda _ + (with-directory-excursion "browser/branding/official" + (for-each + (lambda (file) + (let* ((size (string-filter char-numeric? file)) + (icons (string-append #$output "/share/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p icons) + (copy-file file (string-append icons "/icedove.png")))) + '("default16.png" "default22.png" "default24.png" + "default32.png" "default48.png" "content/icon64.png" + "mozicon128.png" "default256.png"))))) (add-after 'install 'wrap-program (lambda* (#:key inputs #:allow-other-keys) (let* ((lib (string-append #$output "/lib"))