diff mbox series

[bug#51100,8/8] Update and fix Flatpak and portals

Message ID TGkLDoI24NNNxhe_41O_-OKGntzA_bTmyqako6EnqKoPXPHWEy9JH0zgHQ7wMLlwX5NPmkUhunhu02SMCCwa98vZhSOq1YDrCVrNG3anJts=@protonmail.com
State Accepted
Headers show
Series Update and fix Flatpak and portals | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

John Kehayias Oct. 8, 2021, 8:05 p.m. UTC 
From bd4f6ba2b50ced91e5ea1e81307baaba50c27448 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
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

Comments

Ludovic Courtès Oct. 25, 2021, 7:15 p.m. UTC | #1 
Hi!

I’ve applied the whole series, with two changes (as discussed on IRC):

  • making the p11-kit
    ‘--with-trust-paths=/etc/ssl/certs/ca-certificates.crt change’
    separate;

  • adding the new flatpak patch to ‘gnu/local.mk’ and mentioning it in
    the commit log.

Thanks!

Ludo’.
diff mbox series

Patch

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