From unknown Sun Jun 15 08:04:16 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#51100 <51100@debbugs.gnu.org> To: bug#51100 <51100@debbugs.gnu.org> Subject: Status: [PATCH 0/8] Update and fix Flatpak and portals Reply-To: bug#51100 <51100@debbugs.gnu.org> Date: Sun, 15 Jun 2025 15:04:16 +0000 retitle 51100 [PATCH 0/8] Update and fix Flatpak and portals reassign 51100 guix-patches submitter 51100 John Kehayias severity 51100 normal tag 51100 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 15:52:42 2021 Received: (at submit) by debbugs.gnu.org; 8 Oct 2021 19:52:42 +0000 Received: from localhost ([127.0.0.1]:51928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYvv7-0001qg-UZ for submit@debbugs.gnu.org; Fri, 08 Oct 2021 15:52:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:54330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYvv6-0001qZ-AP for submit@debbugs.gnu.org; Fri, 08 Oct 2021 15:52:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYvv6-0006r5-1b for guix-patches@gnu.org; Fri, 08 Oct 2021 15:52:40 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:53281) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYvv3-0004Wa-34 for guix-patches@gnu.org; Fri, 08 Oct 2021 15:52:39 -0400 Date: Fri, 08 Oct 2021 19:52:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633722748; bh=BDRC3+XNog0oXhq7ZwBVvwqy5iNTKLevw99Adfpg4eY=; h=Date:To:From:Reply-To:Subject:From; b=YFIEQ8mAuj6OGnOIJvYHqmYY1+2NF/saIXif3lRycYTwi5dSOsDdtDvi3MX9ptnMT UCebkig8Q1o8FuhunGb+E52H8OT/g5501UtAQcYpAD6/bmJG9IYz62JLwsCv0iyTwL Tx3+E9hyE31PvAludtDW6/ZWPpU2I2LHHHYHR5T0= To: Guix-patches From: John Kehayias Subject: [PATCH 0/8] Update and fix Flatpak and portals Message-ID: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Received-SPF: pass client-ip=185.70.40.133; envelope-from=john.kehayias@protonmail.com; helo=mail-40133.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, Incoming is a series of patches that does the following: 1. Update Flatpak, libportal, xdg-desktop-portal, and xdg-desktop-portal-gt= k to the latest versions 2. flatpak: fix two bugs: a. A certificate error due to p11-kit https://issues.guix.gnu.org/49957 = I worked around this by adding a new p11-kit-next package with the configur= ation change and newest version. From testing, this may not work if there a= re multiple Flatpak bins installed, as the way p11-kit-server is started is= , I think, through a session helper that probably goes through D-Bus. Still= , I think this is the best workaround. b. Flatpak would use the store path for writing its bin, e.g. in .desktop= files from installing an application. I used a modified version of the Nix= OS patch to make it just write "flatpak". This means it'll come from PATH, = but again I don't see a better workaround that wouldn't break on Flatpak's = store directory changing. 3. xdg-desktop-portal-gtk: enabled Gnome backends that are by default disab= led on the newest version (they were not configurable before). These can be= also be had in a separate Gnome portal, currently unpackaged. I figured fo= r now best to keep them enabled, but later could use the Gnome portal to re= move Gnome dependencies here, I think. 4. xdg-desktop-portal-gtk: Propagte xdg-desktop-portal. This was an input w= hich is fine for building, but the portal won't fully function without that= also being installed. Mostly I believe it is the D-Bus files that are need= ed. This should also fix a bug I encountered here https://issues.guix.gnu.o= rg/49972#5 due to both packages having the same search-path. (On this last= point I've manually worked around it before, but this should have the same= effect of only one path being in this env variable.) These updates should close at least the issues mentioned above, will search= if there are any older updates or related issues. Everything builds on mas= ter and should on core-updates-frozen, though xdg-desktop-portal-gtk might = need a libxml2 input (not sure why?). But this should fix the build errors = there. I've been using these packages with these changes (other than the pr= opagated-inputs) and it works well, as long as I translated correctly from = my channel to these patches :) Pretty sure it is the same. Thanks! John From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:01:10 2021 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:01:10 +0000 Received: from localhost ([127.0.0.1]:51933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw3J-00024T-Sz for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:01:10 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:32074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw3H-000242-0K for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:01:07 -0400 Date: Fri, 08 Oct 2021 20:00:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723256; bh=v1FeFbmYxO7r0lj33/lzQzsYzLa4+ZWtd/VttSDVnDs=; h=Date:To:From:Reply-To:Subject:From; b=QhrgXrHF+q1gaxyeOcF3x7oKC8nFX1lHS3rTrVXHsWPAvBYbnWasZSmbW9qVtlSRn YZcHXEmZNJIHCF/dnC01bAtEajzb8B08yK+DifhTD65FbX5rbHxKfrBKNd4qJd6Ap7 bItv/RX2nRnFeuibVPgTYYyi6JuTFlA8et6wuk6M= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: [PATCH 1/8] Update and fix Flatpak and portals Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From f0e9bc49e26935568b49ef90868fa42e4013e295 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:07:58 -0400 Subject: [PATCH 1/8] gnu: libportal: Update to 0.4. * gnu/packages/freedesktop.scm (libportal): Update to 0.4. --- gnu/packages/freedesktop.scm | 81 +++++++++++++++++------------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 514125977b..fd4c8878b7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -24,6 +24,7 @@ ;;; Copyright =C2=A9 2020 Raghav Gururajan ;;; Copyright =C2=A9 2021 pineapples ;;; Copyright =C2=A9 2021 Robby Zambito +;;; Copyright =C2=A9 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -2242,48 +2243,44 @@ fallback to generic Systray support if none of thos= e are available.") (license license:lgpl2.1+))) (define-public libportal - (let ((commit "bff3289") - (revision "1")) - (package - (name "libportal") - (version (git-version "0.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flatpak/libportal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "104b91qircr1i9jkmm6f725awywky52aimrki303kiaadn2v8b5i"))= )) - (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html "/share/gtk-doc")) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) - #t)))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc/stable) - ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) - ("libxml2" ,libxml2) - ("glib:bin" ,glib "bin"))) - (propagated-inputs - `(("glib" ,glib))) - (outputs '("out" "doc")) - (home-page "https://github.com/flatpak/libportal") - (synopsis "Flatpak portal library") - (description - "libportal provides GIO-style async APIs for most Flatpak portals."= ) - (license license:lgpl2.1+)))) + (package + (name "libportal") + (version "0.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/flatpak/libportal/rele= ases/download/" + version "/libportal-" version ".tar.xz")) + (sha256 + (base32 + "0a7gmhyf0b58xy335jyf524g1fyc2id4r88anhvg47430w4zbm9w")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys= ) + (let ((out (assoc-ref outputs "ou= t")) + (doc (assoc-ref outputs "do= c")) + (html "/share/gtk-doc")) + (copy-recursively (string-appen= d out html) + (string-appen= d doc html)) + (delete-file-recursively (strin= g-append out html)) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("gtk-doc" ,gtk-doc/stable) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml) + ("libxml2" ,libxml2) + ("glib:bin" ,glib "bin"))) + (propagated-inputs + `(("glib" ,glib))) + (outputs '("out" "doc")) + (home-page "https://github.com/flatpak/libportal") + (synopsis "Flatpak portal library") + (description + "libportal provides GIO-style async APIs for most Flatpak portals.") + (license license:lgpl2.1+))) (define-public xdg-desktop-portal (package -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:02:29 2021 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:02:29 +0000 Received: from localhost ([127.0.0.1]:51937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw4b-00026U-Au for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:02:29 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:27783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw4a-00026I-2N for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:02:28 -0400 Date: Fri, 08 Oct 2021 20:02:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723341; bh=dvMnxBTpw+Oq1UNkK/gjYi5HuwVRv3b2cT2eCQLxmW8=; h=Date:To:From:Reply-To:Subject:From; b=XjQWQ7tM+rsdeBtGWZVky9nfZu/2MPHSuH3SEExWBX+AbMozTypKzzIu+wFZcaj2n klV8/M+IxXYi/Pv4FTE14WYqwXndz0qb/zd/SXDrodUffrSZwXe1I0rIXV8uqz3Edz 9f+cafwNXAIwqM3dbfWivQcO7QHP1KaauYWKDJNA= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: [PATCH 2/8] Update and fix Flatpak and portals Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From 6287c8120d8af391a7abaff33f0f1c309273d8d4 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:12:00 -0400 Subject: [PATCH 2/8] gnu: xdg-desktop-portal: Update to 1.10.1. * gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.10.1. --- gnu/packages/freedesktop.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index fd4c8878b7..999f8c4400 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2285,16 +2285,15 @@ fallback to generic Systray support if none of thos= e are available.") (define-public xdg-desktop-portal (package (name "xdg-desktop-portal") - (version "1.8.1") + (version "1.10.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flatpak/xdg-desktop-portal") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/flatpak/xdg-desktop-portal/release= s/download/" + version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "0pq0kmvzk56my396vh97pzw4wizwmlmzvv2kr2xv047x3044mr5n")))) + "199lqr2plsy9qqnxx5a381ml8ygcbz4nkjla5pvljjcrwzlqsygd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:03:14 2021 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:03:14 +0000 Received: from localhost ([127.0.0.1]:51941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw5K-00027o-KQ for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:03:14 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:24653) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw5J-00027b-1V for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:03:13 -0400 Date: Fri, 08 Oct 2021 20:02:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723387; bh=FBahMo2tuaXG2G86rHw0c/e9G9cgsw+xb6HWDQF0ZaA=; h=Date:To:From:Reply-To:Subject:From; b=BTCO+T6i9JRsmmuIwSq3SYLM7chQ2YBSbU+GKRvkFroFnHU0KlkhQr7GI9uMGTvay Ee0C5L1KdLsoNdgYgcVM1HpqD+xvJL8Jf74tHoMt2316iD91mXEeHbb22TFn/xFNUS kviGCE45dVrsPSWhPxxwEd+iV2R3ZYE4ZbvQDWqo= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: Re: [PATCH 3/8] Update and fix Flatpak and portals Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From 08e540d73170bb8ed61fa5e7ef0c883e141605b7 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:12:29 -0400 Subject: [PATCH 3/8] gnu: xdg-desktop-portal-gtk: Update to 1.10.0. * gnu/packages/freedesktop.scm (xdg-desktop-portal-gtk): Update to 1.10.0. [arguments]: Adjust configure-flags for Gnome backends in new version (defaults to disabled in this version) --- gnu/packages/freedesktop.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 999f8c4400..d0b25ab49a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2344,16 +2344,15 @@ and others.") (define-public xdg-desktop-portal-gtk (package (name "xdg-desktop-portal-gtk") - (version "1.7.1") + (version "1.10.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/flatpak/xdg-desktop-portal-g= tk") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/flatpak/xdg-desktop-portal-gtk/rel= eases/download/" + version "/xdg-desktop-portal-gtk-" version ".tar.xz")) (sha256 (base32 - "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird")))) + "0nlbnd6qvs92fanrmmn123vy0y2ml0v3ndxyk5x0cpfbnmxpa2f8")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -2364,7 +2363,16 @@ and others.") (for-each (lambda (po) (chmod po #o666)) (find-files "po" "\\.po$")) - #t))))) + #t))) + ;; Enable Gnome portal backends + #:configure-flags + (list + "--enable-appchooser" + "--enable-wallpaper" + "--enable-screenshot" + "--enable-screencast" + "--enable-background" + "--enable-settings"))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:03:50 2021 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:03:50 +0000 Received: from localhost ([127.0.0.1]:51944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw5t-00028f-Tj for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:03:50 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:13428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw5r-00028R-WC for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:03:48 -0400 Date: Fri, 08 Oct 2021 20:03:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723417; bh=ijdK6KpVQgifTJDqIdiCPyYRddBnAInEXItklwSNqP8=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=Ot/XLjUVGdAv/iNJpIoaLwiFxaBWLvMaXsQY9oPxI/zzZd/z7h9oHMLbpX7nPHBjp ev3FJYfO4HoOSWcVtTvTqdi6vphR9s/MhUiG1evE4VxM3z80pBQbggLZXttl2wwI1q l9ZdlgLNRrEmOVyDComEgShjsPnbDuo3QJyf9z+A= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: Re: [PATCH 4/8] Update and fix Flatpak and portals Message-ID: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From 71d64041fb6754a1b1cf67b0ea0e18da9b724f74 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:15:13 -0400 Subject: [PATCH 4/8] gnu: Add p11-kit-next. * gnu/packages/tls.scm (p11-kit-next): New variable. [source]: Update to latest version of p11-kit. [arguments]: Configure with system-wide CA certificate store which fixes a certificate error with Flatpak. Original patch by Andrew Whatson. --- gnu/packages/tls.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 69ed9de11f..beda86e8c0 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -18,6 +18,7 @@ ;;; Copyright =C2=A9 2021 Solene Rapenne ;;; Copyright =C2=A9 2021 Brice Waegeneire ;;; Copyright =C2=A9 2021 Matthew James Kraai +;;; Copyright =C2=A9 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,6 +166,31 @@ coordinating the use of PKCS#11 by different component= s or libraries living in the same process.") (license license:bsd-3))) +(define-public p11-kit-next + (package + (inherit p11-kit) + (name "p11-kit-next") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/p11-glue/p11-kit/releases/" + "download/" version "/p11-kit-" version ".tar.xz= ")) + (sha256 + (base32 "11f6saclxsclc1f3lbavzw8kikws4cr3mfd1avly8dgnhh2i9rl1")))) + (arguments + `(#:configure-flags '("--with-trust-paths=3D/etc/ssl/certs/ca-certifi= cates.crt") + #:phases (modify-phases %standard-phases + (add-before 'check 'prepare-tests + (lambda _ + ;; "test-runtime" expects XDG_RUNTIME_DIR to be set = up + ;; and looks for .cache and other directories (only)= . + ;; For simplicity just drop it since it is irrelevan= t + ;; in the build container. + (substitute* "Makefile" + (("test-runtime\\$\\(EXEEXT\\)") "")) + #t))))))) + (define-public gnutls (package (name "gnutls") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:04:19 2021 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:04:19 +0000 Received: from localhost ([127.0.0.1]:51949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw6N-00029q-7s for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:04:19 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:34373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw6J-00029a-Q7 for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:04:17 -0400 Date: Fri, 08 Oct 2021 20:04:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723449; bh=UQQCwGQ2Y7/KDpFPp2IWkw2crAE2vblVyno3ITwBVns=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=cBxnglAtLBf0gCDH7Unf8L4Mu23iSz0102k5Q67UCq6PMsb53yRhSif1iQu0pydTv ACu4QXwWGNj39vorfBg/caVUHXtzB43KO0PNLDslbx9Tx+LABEGMWEoHpYqV+Jh5Su 7y9BdGU8CtcQs/Y0EL9LY1hnd+Ds6h4Z7HqgaEuc= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: Re: [PATCH 5/8] Update and fix Flatpak and portals Message-ID: In-Reply-To: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> References: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From 661d1bf4cc26adfe2dc0b7f315701aae13bb0dea Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 14:17:38 -0400 Subject: [PATCH 5/8] gnu: flatpak: Update to 1.12.1. * gnu/packages/package-management.scm (flatpak): Update to 1.12.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 607555b856..eb2249c423 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1523,14 +1523,14 @@ the boot loader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.10.2") + (version "1.12.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/flatpak/flatpak/releases/down= load/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "1r6xw7r3ir2vaa30n3mily6m7d51cf4qv22fkqlzzy3js0wjf5fv")))) + (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GI= O to ;; find the TLS backend in glib-networking. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:05:01 2021 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= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: Re: [PATCH 6/8] Update and fix Flatpak and portals 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-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >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 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:05:34 2021 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= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: Re: [PATCH 7/8] Update and fix Flatpak and portals 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-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >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 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 08 16:06:01 2021 Received: (at 51100) by debbugs.gnu.org; 8 Oct 2021 20:06:01 +0000 Received: from localhost ([127.0.0.1]:51960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw81-0002Cs-Cx for submit@debbugs.gnu.org; Fri, 08 Oct 2021 16:06:01 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:15893) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYw7z-0002Ce-Vo for 51100@debbugs.gnu.org; Fri, 08 Oct 2021 16:06:00 -0400 Date: Fri, 08 Oct 2021 20:05:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1633723554; bh=LriJpsxCEj0j7OY6kMZKRDNdjKFfauzjjEPEda8tkII=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=sSAMVO5oYZGyQDn7gwY2wpBpYVhdg3aLbgnM5Pely1R/UwGVFzNKn3vr/i1LmSqfo 7c27KDcxJCgPKMtX+msdJG2VAtVnm+H4mgEIPBKjyABnDflZ7ZKWydJVkeBEptuNR/ 46EgPhAV1ifkkP4N6eCw0PQPbovRRE2KJqq518b4= To: "51100@debbugs.gnu.org" <51100@debbugs.gnu.org> From: John Kehayias Subject: Re: [PATCH 8/8] Update and fix Flatpak and portals Message-ID: In-Reply-To: <4w_JOSutZ906ZwzxqKXIEyt-8CTrHzBH2DxhPj6FcUWF0ndHpVfkf0qpD2WuAX6kLqCPEh1v5C8-d82Z11D2quaWhdhHlH7Rf02gC4Twj00=@protonmail.com> References: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> <4w_JOSutZ906ZwzxqKXIEyt-8CTrHzBH2DxhPj6FcUWF0ndHpVfkf0qpD2WuAX6kLqCPEh1v5C8-d82Z11D2quaWhdhHlH7Rf02gC4Twj00=@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 51100 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: John Kehayias Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From bd4f6ba2b50ced91e5ea1e81307baaba50c27448 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 8 Oct 2021 15:18:36 -0400 Subject: [PATCH 8/8] gnu: xdg-desktop-portal-gtk: Propagate xdg-desktop-portal. * gnu/packages/freedesktop.scm (xdg-desktop-portal-gtk)[inputs]: Fix the runtime need for xdg-desktop-portal and XDG_DESKTOP_PORTAL_DIR being writte= n twice. Move xdg-desktop-portal to ... [propagated-inputs]: ... here. --- gnu/packages/freedesktop.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d0b25ab49a..f9e8555b12 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2378,7 +2378,6 @@ and others.") ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) - ("xdg-desktop-portal" ,xdg-desktop-portal) ("glib:bin" ,glib "bin") ("which" ,which) ("gettext" ,gettext-minimal))) @@ -2388,10 +2387,8 @@ and others.") ("fontconfig" ,fontconfig) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) - (native-search-paths - (list (search-path-specification - (variable "XDG_DESKTOP_PORTAL_DIR") - (files '("share/xdg-desktop-portal/portals"))))) + (propagated-inputs + `(("xdg-desktop-portal" ,xdg-desktop-portal))) (home-page "https://github.com/flatpak/xdg-desktop-portal-gtk") (synopsis "GTK implementation of xdg-desktop-portal") (description -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 25 15:16:05 2021 Received: (at 51100-done) by debbugs.gnu.org; 25 Oct 2021 19:16:05 +0000 Received: from localhost ([127.0.0.1]:44322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf5S0-0008Cl-Hs for submit@debbugs.gnu.org; Mon, 25 Oct 2021 15:16:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf5Ry-0008Bh-PQ for 51100-done@debbugs.gnu.org; Mon, 25 Oct 2021 15:16:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53530) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf5Rt-0002Gn-KI; Mon, 25 Oct 2021 15:15:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=qUQ36WaCbpJdDosRfgp01BOcRwGopBKMR2sdD1cfVIA=; b=OPMsM5L6ORUG6U1X5WxX 6zPGUhEnkct4b/LMUrizyAxPer3yxDWS+lCJ2CpOiwOeDs226XU0vmrKZYrovZ3q0kBI6Zh1bvdbD U53QrM4QdfjFcILn56YZwukzPNGpuSXL3qcAtaP+dWmf7BfY5iPIRtdyVjqGLmmUglsAIk73/bFd/ Rldc3g5ttTV4wg1ile1VxTKfYmsitp4dPrH0tEvWp3EMN7b7GxnB5LySoLjR/HLxnx7YLEzXdJcRH 7n/x+ujI0VZsgrTfZj4tktYJYiLkmY5NOJw9vaEBfGGoITEyBTqGtAEz5O7q62Xqx3ST090WsUXa5 AWG6373KBK0DOg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:54220 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf5Rs-0006lN-Uj; Mon, 25 Oct 2021 15:15:57 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: John Kehayias Subject: Re: bug#51100: [PATCH 0/8] Update and fix Flatpak and portals References: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> <4w_JOSutZ906ZwzxqKXIEyt-8CTrHzBH2DxhPj6FcUWF0ndHpVfkf0qpD2WuAX6kLqCPEh1v5C8-d82Z11D2quaWhdhHlH7Rf02gC4Twj00=@protonmail.com> Date: Mon, 25 Oct 2021 21:15:55 +0200 In-Reply-To: (John Kehayias's message of "Fri, 08 Oct 2021 20:05:53 +0000") Message-ID: <87cznskj9w.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51100-done Cc: "51100@debbugs.gnu.org" <51100-done@debbugs.gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! I=E2=80=99ve applied the whole series, with two changes (as discussed on IR= C): =E2=80=A2 making the p11-kit =E2=80=98--with-trust-paths=3D/etc/ssl/certs/ca-certificates.crt change= =E2=80=99 separate; =E2=80=A2 adding the new flatpak patch to =E2=80=98gnu/local.mk=E2=80=99 = and mentioning it in the commit log. Thanks! Ludo=E2=80=99. From unknown Sun Jun 15 08:04:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 23 Nov 2021 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator