From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EMSZMqikYGF8hgAAgWs5BA (envelope-from ) for ; Fri, 08 Oct 2021 22:06:00 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kLlbLaikYGG/EQAAbx9fmQ (envelope-from ) for ; Fri, 08 Oct 2021 20:06:00 +0000 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 6868132365 for ; Fri, 8 Oct 2021 22:06:00 +0200 (CEST) Received: from localhost ([::1]:56748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw7z-0002yh-Iy for larch@yhetil.org; Fri, 08 Oct 2021 16:05:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw76-0002pQ-BO for guix-patches@gnu.org; Fri, 08 Oct 2021 16:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw74-0006ag-U8 for guix-patches@gnu.org; Fri, 08 Oct 2021 16:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw74-0002BE-PO for guix-patches@gnu.org; Fri, 08 Oct 2021 16:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 6/8] Update and fix Flatpak and portals Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Oct 2021 20:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> Received: via spool by 51100-submit@debbugs.gnu.org id=B51100.16337235018362 (code B ref 51100); Fri, 08 Oct 2021 20:05:02 +0000 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:05:01 +0000 Received: from localhost ([127.0.0.1]:51952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw72-0002Ao-Op for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:05:00 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:32526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw70-0002AZ-NE for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:04:59 -0400 Date: Fri, 08 Oct 2021 20:04:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723488; bh=ZhC/hVrNIGzJokD+SzelUPjLZUuyH87QzVUWhYVWbyc=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=R+NLe74mY+3bndl65UaLCLz7KVcOp2bmOhCCaPo9leef5+iFrNyc5rDnxRlV/gas0 8is11KcSF6/IwzhX74ZsP0WfueeefKVNMEDoPxLs9Gj06s/mdj179+oZ2u5dgbN2Qn TM92zMDE9mDfB/PfvWZF9a/gI1qm+tDcH4qdbiTM= Message-ID: In-Reply-To: References: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches From: John Kehayias via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633723560; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=ZhC/hVrNIGzJokD+SzelUPjLZUuyH87QzVUWhYVWbyc=; b=LMOK7DnTsITHYG4tsGpw2vQoeKqkRuMf3GVVCi5Oh1v3DwfVD01pajdQaEmg5+oLXy02Zg 9sQNxzXFx/4IGZcoSJUi5ibI/YOs3OQ3J/eJpuHvSr/PIAkbJxC21IP86RKwPBM+8RNSvt uSX5pZgSEWo9c+njk5Csm5B/4HDQmpQ52b36OvlUIsnHxvjiYPP+a6iU2PXP19JBvd1F+W odjR+J9Gz+/kfRc/cU7gxBTTe1TnULn5frP2CR9xeBTHCaEa2rjzO/GQTB5y5XzglhRg7O u02OjwhZ67XoiU3S1f98XVuh8a5P9oyO5FVxUHLcmixu8SNb1t/CjWpDzcr7+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633723560; a=rsa-sha256; cv=none; b=Dhsb5kTPN+ssfp3qSltZFOCSeebCh3ARz/ERCkx9ecDSDjLyjMYuwIxInJ156wvhEuU+dp QSDV0FI71efBTXAhgJT3WkgJVN4IMuvVC9vz5ZTwF01j/W+5SvZF7QRl5O08wby+Y8vIwd e7k8FTInll2MRhkkj0FD7gR1XQkt1ZvNIn6S0/tZSLB0/34EijEuUUVENw3nqPNm+YE40p Gu/hrWTwoCisiS98oY/joA8EyLeQWMDjnrtXzeJP+q7YKRoPPxCkers9ssPAdfM/AT6CZd hXIJKGDoJLb9T7psZbBt6HRcG/YtA0JuOZc0G8diS//YdGisgkmwV4npRxVDpA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=R+NLe74m; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -3.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=R+NLe74m; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 6868132365 X-Spam-Score: -3.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: YjOV/LK5I/sP >From 764539e068d76ea5d0aea8a5e40677de9c3d9bb2 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:54:46 -0400 Subject: [PATCH 6/8] gnu: flatpak: Fix certificate error from p11-kit. * gnu/packages/package-management.scm (flatpak)[inputs]: Add p11-kit-next. [arguments]: Add new 'p11-kit-fix phase to patch source to use p11-kit-next input instead of an implicit p11-kit from dependencies. --- gnu/packages/package-management.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index eb2249c423..589d3b0311 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1565,6 +1565,16 @@ cp -r /tmp/locale/*/en_US.*"))) (("/bin/kill") (which "kill")) (("/usr/bin/python3") (which "python3"))) #t)) + (add-after 'unpack 'p11-kit-fix + (lambda* (#:key inputs #:allow-other-keys) + (let ((p11-path (string-append (assoc-ref inputs "p11-kit-next= ") + "/bin/p11-kit"))) + (substitute* "session-helper/flatpak-session-helper.c" + (("\"p11-kit\",") + (string-append "\"" p11-path "\",")) + (("if \\(g_find_program_in_path \\(\"p11-kit\"\\)\\)") + (string-append "if (g_find_program_in_path (\"" + p11-path "\"))")))))) ;; Many tests fail for unknown reasons, so we just run a few basic ;; tests. (replace 'check @@ -1603,6 +1613,7 @@ cp -r /tmp/locale/*/en_US.*"))) ("libsoup" ,libsoup) ("libxau" ,libxau) ("libxml2" ,libxml2) + ("p11-kit-next" ,p11-kit-next) ("util-linux" ,util-linux) ("xdg-dbus-proxy" ,xdg-dbus-proxy))) (home-page "https://flatpak.org") -- 2.33.0