From 8d3ab27e1c1660a093c1cb9200cccfd221309ea9 Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Sat, 14 Jul 2018 11:59:56 +0200 Subject: Flatpak: Give up on Builder formatting the JSON Builder keeps trying to format the JSON automatically for any change, which is quite cumbersome since it appears as a changed file on git and also it's a mess if an actual change happens. Just accept the defeat and go with whatever Builder wants. --- build-aux/flatpak/org.gnome.Nautilus.json | 147 ++++++++++++++++++------------ 1 file changed, 87 insertions(+), 60 deletions(-) (limited to 'build-aux/flatpak/org.gnome.Nautilus.json') diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index b6bb0fa0d..569ae42a3 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -1,49 +1,60 @@ { - "app-id": "org.gnome.NautilusDevel", - "runtime": "org.gnome.Platform", - "runtime-version": "3.28", - "sdk": "org.gnome.Sdk", - "command": "nautilus", - "tags": ["devel", "development", "nightly"], - "desktop-file-name-prefix": "(Development) ", - "finish-args": [ - "--share=ipc", "--socket=x11", + "app-id" : "org.gnome.NautilusDevel", + "runtime" : "org.gnome.Platform", + "runtime-version" : "3.28", + "sdk" : "org.gnome.Sdk", + "command" : "nautilus", + "tags" : [ + "devel", + "development", + "nightly" + ], + "desktop-file-name-prefix" : "(Development) ", + "finish-args" : [ + "--share=ipc", + "--socket=x11", "--socket=wayland", "--talk-name=org.gnome.OnlineAccounts", "--talk-name=org.freedesktop.Tracker1", "--filesystem=host", - "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*", - "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro", - "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" + "--talk-name=org.gtk.vfs", + "--talk-name=org.gtk.vfs.*", + "--filesystem=xdg-run/dconf", + "--filesystem=~/.config/dconf:ro", + "--talk-name=ca.desrt.dconf", + "--env=DCONF_USER_CONFIG_DIR=.config/dconf" ], - "modules": [ + "modules" : [ { - "name": "meson", - "buildsystem": "simple", - "build-commands": [ + "name" : "meson", + "buildsystem" : "simple", + "build-commands" : [ "python3 setup.py install --prefix=/app" ], - "sources": [ + "sources" : [ { - "type": "archive", - "url": "https://github.com/mesonbuild/meson/archive/0.46.1.tar.gz", - "sha256": "2d917692d2cc194e12295f00469fbdf3c045e85d0295e5e59ced69115920ffa0" + "type" : "archive", + "url" : "https://github.com/mesonbuild/meson/archive/0.46.1.tar.gz", + "sha256" : "2d917692d2cc194e12295f00469fbdf3c045e85d0295e5e59ced69115920ffa0" } ] }, { - "name": "exiv2", - "config-opts": [ "-DCMAKE_INSTALL_PREFIX=/app", "-DCMAKE_INSTALL_LIBDIR=/app/lib" ], - "buildsystem": "cmake", - "sources": [ + "name" : "exiv2", + "config-opts" : [ + "-DCMAKE_INSTALL_PREFIX=/app", + "-DCMAKE_INSTALL_LIBDIR=/app/lib" + ], + "buildsystem" : "cmake", + "sources" : [ { - "type": "archive", - "url": "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz", - "sha256": "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01" + "type" : "archive", + "url" : "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz", + "sha256" : "51cffa8d19d67e1da6c1d0f570a75b8f6c814113367318c2c0407691888c5f01" }, { - "type": "shell", - "commands": [ + "type" : "shell", + "commands" : [ "cp -f /usr/share/automake-1.15/config.sub ./config/", "cp -f /usr/share/automake-1.15/config.guess ./config/" ] @@ -51,56 +62,72 @@ ] }, { - "name": "gexiv2", - "config-opts": [ "--disable-introspection" ], - "sources": [ + "name" : "gexiv2", + "config-opts" : [ + "--disable-introspection" + ], + "sources" : [ { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gexiv2.git", - "tag": "gexiv2-0.10.8" + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/gexiv2.git", + "tag" : "gexiv2-0.10.8" } ] }, { - "name": "tracker", - "cleanup": [ "/bin", "/etc", "/libexec" ], - "config-opts": [ "--disable-miner-apps", "--disable-static", - "--disable-tracker-extract", "--disable-tracker-needle", - "--disable-tracker-preferences", "--disable-artwork", - "--disable-tracker-writeback", "--disable-miner-user-guides", - "--with-bash-completion-dir=no" ], - "sources": [ + "name" : "tracker", + "cleanup" : [ + "/bin", + "/etc", + "/libexec" + ], + "config-opts" : [ + "--disable-miner-apps", + "--disable-static", + "--disable-tracker-extract", + "--disable-tracker-needle", + "--disable-tracker-preferences", + "--disable-artwork", + "--disable-tracker-writeback", + "--disable-miner-user-guides", + "--with-bash-completion-dir=no" + ], + "sources" : [ { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/tracker.git", - "tag": "2.0.3" + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/tracker.git", + "tag" : "2.0.3" } ] }, { - "name": "gnome-autoar", - "sources": [ + "name" : "gnome-autoar", + "sources" : [ { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gnome-autoar.git", - "tag": "0.2.3" + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/gnome-autoar.git", + "tag" : "0.2.3" } ] }, { - "buildsystem": "meson", - "builddir": true, - "name": "nautilus", - "config-opts": [ + "buildsystem" : "meson", + "builddir" : true, + "name" : "nautilus", + "config-opts" : [ "--libdir=/app/lib", "-Dprofile=development" ], - "sources": [ + "sources" : [ { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/nautilus.git" + "type" : "git", + "url" : "https://gitlab.gnome.org/GNOME/nautilus.git" } ] } - ] -} \ No newline at end of file + ], + "build-options" : { + "env" : { + } + } +} -- cgit v1.2.1