From patchwork Fri Oct 8 20:00:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33691 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 9817E27BBE3; Fri, 8 Oct 2021 21:02:12 +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 E06A027BBE1 for ; Fri, 8 Oct 2021 21:02:11 +0100 (BST) Received: from localhost ([::1]:52520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw4I-0008Of-Rt for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw4A-0008LP-B5 for guix-patches@gnu.org; Fri, 08 Oct 2021 16:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw4A-00079g-2I for guix-patches@gnu.org; Fri, 08 Oct 2021 16:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw49-00025e-PB for guix-patches@gnu.org; Fri, 08 Oct 2021 16:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 1/8] Update and fix Flatpak and portals References: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> In-Reply-To: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Oct 2021 20:02:01 +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.16337232707970 (code B ref 51100); Fri, 08 Oct 2021 20:02:01 +0000 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= Message-ID: 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 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(-) -- 2.33.0 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 © 2020 Raghav Gururajan ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Robby Zambito +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -2242,48 +2243,44 @@ fallback to generic Systray support if none of those 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/releases/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 "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+))) (define-public xdg-desktop-portal (package From patchwork Fri Oct 8 20:02:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33692 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 67C6727BBE3; Fri, 8 Oct 2021 21:03:30 +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 2E86627BBE1 for ; Fri, 8 Oct 2021 21:03:30 +0100 (BST) Received: from localhost ([::1]:53690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw5Z-0000nP-AO for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:03:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw58-0000me-JL for guix-patches@gnu.org; Fri, 08 Oct 2021 16:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40391) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw58-00015E-Bl for guix-patches@gnu.org; Fri, 08 Oct 2021 16:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw58-00027F-8r for guix-patches@gnu.org; Fri, 08 Oct 2021 16:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 2/8] Update and fix Flatpak and portals References: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> In-Reply-To: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Oct 2021 20:03: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.16337233498094 (code B ref 51100); Fri, 08 Oct 2021 20:03:02 +0000 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= Message-ID: 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 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(-) -- 2.33.0 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 those 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/releases/download/" + version "/xdg-desktop-portal-" version ".tar.xz")) (sha256 (base32 - "0pq0kmvzk56my396vh97pzw4wizwmlmzvv2kr2xv047x3044mr5n")))) + "199lqr2plsy9qqnxx5a381ml8ygcbz4nkjla5pvljjcrwzlqsygd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) From patchwork Fri Oct 8 20:02:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33693 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 52F9B27BBE4; Fri, 8 Oct 2021 21:04:14 +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 036AC27BBE3 for ; Fri, 8 Oct 2021 21:04:14 +0100 (BST) Received: from localhost ([::1]:54998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw6H-0001hJ-0R for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:04:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw66-0001gQ-64 for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40398) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw65-0003Ux-O3 for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw65-000293-KA for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 3/8] Update and fix Flatpak and portals References: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> In-Reply-To: <8mIC9rc4MnrOlOpfEbAPuv1vk07x9Ta-uDTETeKkIlgGJoyRcX8wAQCr1e-T5mTDiaUbE6SdYGp1YVuecBa2LuHtuBozOqS8yO1r8oJCieo=@protonmail.com> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Oct 2021 20:04:01 +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.16337233948177 (code B ref 51100); Fri, 08 Oct 2021 20:04:01 +0000 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= Message-ID: 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 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(-) -- 2.33.0 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-gtk") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/flatpak/xdg-desktop-portal-gtk/releases/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) From patchwork Fri Oct 8 20:03:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33694 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 4537627BBE3; Fri, 8 Oct 2021 21:04:15 +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 027AD27BBE1 for ; Fri, 8 Oct 2021 21:04:15 +0100 (BST) Received: from localhost ([::1]:55070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw6I-0001k9-3e for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw66-0001gg-QJ for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw66-0003VC-4y for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw66-00029A-1U for guix-patches@gnu.org; Fri, 08 Oct 2021 16:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 4/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:04:01 +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.16337234308229 (code B ref 51100); Fri, 08 Oct 2021 20:04:01 +0000 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= Message-ID: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> In-Reply-To: References: 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 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(+) -- 2.33.0 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 © 2021 Solene Rapenne ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2021 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -165,6 +166,31 @@ coordinating the use of PKCS#11 by different components 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=/etc/ssl/certs/ca-certificates.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 irrelevant + ;; in the build container. + (substitute* "Makefile" + (("test-runtime\\$\\(EXEEXT\\)") "")) + #t))))))) + (define-public gnutls (package (name "gnutls") From patchwork Fri Oct 8 20:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33695 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 1808F27BBE3; Fri, 8 Oct 2021 21:05:41 +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 CCA5D27BBE1 for ; Fri, 8 Oct 2021 21:05:40 +0100 (BST) Received: from localhost ([::1]:56682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw7f-0002qi-Tm for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:05:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw76-0002pR-Bu for guix-patches@gnu.org; Fri, 08 Oct 2021 16:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw74-0006XU-Hf for guix-patches@gnu.org; Fri, 08 Oct 2021 16:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYw74-0002B6-CR for guix-patches@gnu.org; Fri, 08 Oct 2021 16:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 5/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.16337234598302 (code B ref 51100); Fri, 08 Oct 2021 20:05:02 +0000 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= Message-ID: In-Reply-To: <5iopUmIVAAKwNv_cATe8VzZuufIs8QAhldp5IAQHOahJt6J6e52vNE9JBgJApB5doRcafyzmMavmEQ_DzsQ-10pn3RPdmAq0tTzQ68I0WLk=@protonmail.com> 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 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(-) -- 2.33.0 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.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/download/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "1r6xw7r3ir2vaa30n3mily6m7d51cf4qv22fkqlzzy3js0wjf5fv")))) + (base32 "0my82ijg1ipa4lwrvh88jlrxbabfqfz2ssfb8cn6k0pfgz53p293")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. 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") From patchwork Fri Oct 8 20:05:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33698 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 C7EA227BBE3; Fri, 8 Oct 2021 21:06:20 +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 848E527BBE1 for ; Fri, 8 Oct 2021 21:06:20 +0100 (BST) Received: from localhost ([::1]:57184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw8I-0003Js-BD for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:06:18 -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 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 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 -- 2.33.0 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.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/download/" 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 GIO to ;; find the TLS backend in glib-networking. diff --git a/gnu/packages/patches/flatpak-fix-path.patch b/gnu/packages/patches/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 (store) 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/bf4167861d0f864b0fc457778d54feb4a2675ea2/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 = FLATPAK_BINDIR "/flatpak"; + + g_string_append_printf (new_exec, +- "%s run --branch=%s --arch=%s", +- flatpak, ++ "flatpak run --branch=%s --arch=%s", + escaped_branch, + escaped_arch); + +@@ -8467,8 +8466,8 @@ flatpak_dir_deploy (FlatpakDir *self, + if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL) + flatpak = FLATPAK_BINDIR "/flatpak"; + +- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n", +- flatpak, escaped_branch, escaped_arch, escaped_app); ++ bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n", ++ escaped_branch, escaped_arch, escaped_app); + if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE, + G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) + return FALSE; From patchwork Fri Oct 8 20:05:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33697 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 CFCE227BBE3; Fri, 8 Oct 2021 21:06:18 +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 8C41727BBE1 for ; Fri, 8 Oct 2021 21:06:18 +0100 (BST) Received: from localhost ([::1]:57176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYw8H-0003JT-Jr for patchwork@mira.cbaines.net; Fri, 08 Oct 2021 16:06:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYw83-0003IH-E1 for guix-patches@gnu.org; Fri, 08 Oct 2021 16:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYw82-0002Bh-Ok 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-0002DE-Jt for guix-patches@gnu.org; Fri, 08 Oct 2021 16:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51100] [PATCH 8/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.16337235618494 (code B ref 51100); Fri, 08 Oct 2021 20:06:02 +0000 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= 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 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 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 written twice. Move xdg-desktop-portal to ... [propagated-inputs]: ... here. --- gnu/packages/freedesktop.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.33.0 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