From e5ea6cfcb52e7e733ae7f3a2eaad67cb5dde1b61 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 2 Apr 2019 00:28:30 +0000 Subject: [PATCH] flatpaks: Drop dconf permissions We are building against the 3.32 sdk, which has a new-enough glib to default to the keyfile settings backend. Also, use fallback-x11, so we prefer Wayland. --- build-aux/flatpak/org.gtk.Demo4.json | 5 ++--- build-aux/flatpak/org.gtk.WidgetFactory4.json | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json index 067be8efbe..ceff29623d 100644 --- a/build-aux/flatpak/org.gtk.Demo4.json +++ b/build-aux/flatpak/org.gtk.Demo4.json @@ -9,10 +9,9 @@ "finish-args": [ "--device=dri", "--share=ipc", - "--socket=x11", + "--socket=fallback-x11", "--socket=wayland", - "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*", - "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" + "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*" ], "cleanup": [ "/include", diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json index 0161809f4d..8030528a14 100644 --- a/build-aux/flatpak/org.gtk.WidgetFactory4.json +++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json @@ -9,10 +9,9 @@ "finish-args": [ "--device=dri", "--share=ipc", - "--socket=x11", + "--socket=fallback-x11", "--socket=wayland", - "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*", - "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" + "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*" ], "cleanup": [ "/include",