[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 solenv/flatpak-manifest.in |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9b318842d5062417640e0541d4799cb5b1598865
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jan 13 10:02:27 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Mon Jan 13 18:58:16 2020 +0100

    solenv/flatpak-manifest.in: Merge "remove dconf access"
    
    <https://github.com/flathub/org.libreoffice.LibreOffice/commit/b15fd5cb85280ac60bdd1d763fe5b715057ab267>
    
    Change-Id: If2af9110b07518fb0fb2c65ca490f9e1125de8a2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86662
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 714b7a76665655dc5d090c6ab4a715c085b52739)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86675
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 4031c46c5088..6051b3920daa 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -605,13 +605,10 @@
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host",
-        "--filesystem=xdg-run/dconf",
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
         "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
         "--env=JAVA_HOME=/app/jre",
         "--env=LIBO_FLATPAK=1",
         "--own-name=org.libreoffice.LibreOfficeIpc0",
-        "--talk-name=ca.desrt.dconf",
         "--talk-name=org.gtk.vfs.*"
     ]
 }