From patchwork Fri Oct 8 20:04:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33696 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 29C5C27BBE3; Fri, 8 Oct 2021 21:05:43 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,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 E141327BBE1 for ; Fri, 8 Oct 2021 21:05:42 +0100 (BST) Received: from localhost ([::1]:56748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw7i-0002yh-1u for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:05:42 -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 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches 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(+) -- 2.33.0 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.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")