From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id +BL4AbikYGGZiAAAgWs5BA (envelope-from ) for ; Fri, 08 Oct 2021 22:06:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id YEBtOLekYGFLYwAA1q6Kng (envelope-from ) for ; Fri, 08 Oct 2021 20:06:15 +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 B22D1A2A5 for ; Fri, 8 Oct 2021 22:06:15 +0200 (CEST) Received: from localhost ([::1]:57184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw8E-0003Js-R1 for larch@yhetil.org; Fri, 08 Oct 2021 16:06:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw83-0003IK-Ev for guix-patches@gnu.org; Fri, 08 Oct 2021 16:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw82-0002Aq-C2 for guix-patches@gnu.org; Fri, 08 Oct 2021 16:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw82-0002D7-7E for guix-patches@gnu.org; Fri, 08 Oct 2021 16:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 7/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:06: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.16337235348449 (code B ref 51100); Fri, 08 Oct 2021 20:06:02 +0000 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:05:34 +0000 Received: from localhost ([127.0.0.1]:51957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw7a-0002CD-1b for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:05:34 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:48551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw7Y-0002Bz-F3 for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:05:33 -0400 Date: Fri, 08 Oct 2021 20:05:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723522; bh=aregLp4kabSqS+Sb7xGCjy+lTyE3VXSBdrtk4YiIKUE=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=QoRPIkr6huJk3dJzAgpw1hal+uoLqvlIbaIo/AHwzuDzRNUEysGkP7lxcYQtWwvA5 YtLs4yPL1MRh2/MqXxwQWiE+Gvj/WnOduiOhA5S3Now9DjO0nvizYux9CryhFCvWSb OA1Y0a/xtGpasgBx380E2H1w6pFR+NedQv22Yz2A= Message-ID: <4w_JOSutZ906ZwzxqKXIEyt-8CTrHzBH2DxhPj6FcUWF0ndHpVfkf0qpD2WuAX6kLqCPEh1v5C8-d82Z11D2quaWhdhHlH7Rf02gC4Twj00=@protonmail.com> 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=1633723575; 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=aregLp4kabSqS+Sb7xGCjy+lTyE3VXSBdrtk4YiIKUE=; b=gQ/ga/YS2TH7LJUkAyrOGg6zz/mqB3uV8dUZix2G0sxnP7w2G164J2KQ4RJVI2mM6ypCb/ G7SkrtmT/cqFeXemdMe8teTDdNQBpS3bh/mTjlgd2l5BkCioD2ipLN9voSmfmMZBQmfmtI R9OpbE433+tBXHFnBAD0hmIhUz3nHSw8v1Oq4leK5iBCGiVeXl1g1JXsGZ+VKqBmUrPEzf N597XfGepc08bPGWNJkco00HLvH5gk/03VNSPycuj3C+EF9pIbX7VF/LZy1u+0v9seVHeR w00ktka71IPozhglnwzdtcu/JbvOT9EDHFU9/hpoo501p9dNcrx+u63RXzDrbw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633723575; a=rsa-sha256; cv=none; b=Vu5pZsrMQCR/YD3gGto9IJXwG0MJLGTE5ZPhfTky+EsBC/QH9RPElHX6cTmgu7khLVSsOZ vztoRXYQVt0QmymWIpiiLbJZ+1GuLgwEtJ5npuR5YDTBHfdHpu5IzzwpfXsKFnTyjjoutn gD9or2XpvRGKrD29AIslI3z7YhyO0SInCAu1AAoM2inB4iKUWPqcCjIVnu3DIwk99EnLFo C2reYpl2hs7I8fvfh6R7t5qpV97RD4x54zk2/ZDEyiISLMnrNwLkHoxYLa9kxEV/b5Ro5b 40aZqIzGMlk28EM7ypqXldmiK51jIXnVMHZoGF+D92ZGm8/F5V+zFmrEz2k0gw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=QoRPIkr6; 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: -2.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=QoRPIkr6; 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: B22D1A2A5 X-Spam-Score: -2.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: HcqBqTlJp91+ >From afc1ec0d1f5449de87c081f9947700de4ddb91aa Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 15:07:57 -0400 Subject: [PATCH 7/8] gnu: flatpak: Add patch to fix paths. * gnu/packages/package-management.scm (flatpak)[source]: Add patch. --- gnu/packages/package-management.scm | 3 ++- gnu/packages/patches/flatpak-fix-path.patch | 29 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/flatpak-fix-path.patch diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 589d3b0311..0ee4a0202b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1530,7 +1530,8 @@ the boot loader configuration.") (uri (string-append "https://github.com/flatpak/flatpak/releases/down= load/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")))) + (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")) + (patches (search-patches "flatpak-fix-path.patch")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GI= O to ;; find the TLS backend in glib-networking. diff --git a/gnu/packages/patches/flatpak-fix-path.patch b/gnu/packages/pat= ches/flatpak-fix-path.patch new file mode 100644 index 0000000000..cfb71dbb2f --- /dev/null +++ b/gnu/packages/patches/flatpak-fix-path.patch @@ -0,0 +1,29 @@ +Flatpak writes files for installed applications with the full Flatpak (sto= re) path. This patch makes it write just "flatpak", using Flatpak from PATH= . This is similar to the NixOS [0] patch, updated for Flatpak 1.12.1 + +[0] https://github.com/NixOS/nixpkgs/blob/bf4167861d0f864b0fc457778d54feb4= a2675ea2/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch + +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 80ff5e5f..0c111c31 100644 +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -7134,8 +7134,7 @@ export_desktop_file (const char *app, + flatpak =3D FLATPAK_BINDIR "/flatpak"; + + g_string_append_printf (new_exec, +- "%s run --branch=3D%s --arch=3D%s", +- flatpak, ++ "flatpak run --branch=3D%s --arch=3D%s", + escaped_branch, + escaped_arch); + +@@ -8467,8 +8466,8 @@ flatpak_dir_deploy (FlatpakDir *self, + if ((flatpak =3D g_getenv ("FLATPAK_BINARY")) =3D=3D NULL) + flatpak =3D FLATPAK_BINDIR "/flatpak"; + +- bin_data =3D g_strdup_printf ("#!/bin/sh\nexec %s run --branch=3D%s= --arch=3D%s %s \"$@\"\n", +- flatpak, escaped_branch, escaped_arch, = escaped_app); ++ bin_data =3D g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch= =3D%s --arch=3D%s %s \"$@\"\n", ++ escaped_branch, escaped_arch, escaped_a= pp); + if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data),= NULL, FALSE, + G_FILE_CREATE_REPLACE_DESTINATION, NU= LL, cancellable, error)) + return FALSE; -- 2.33.0