[nautilus/separate-master-deps: 26/29] Flatpak: Separate master dependencies from stable

[Carlos Soriano <csoriano src gnome org>]

commit 707b8016fc385d777fc493850c8cdcef91fdf971
Author: Carlos Soriano <csoriano redhat com>
Date:   Mon May 28 15:05:40 2018 +0200

    Flatpak: Separate master dependencies from stable
    
    So far we have been building master of all of our dependencies, also
    master of the Sdk. This is good for testing the next version of the
    ecosystem, but has many downsides that we now can avoid with Flatpak.
    
    For instance, we want to be buildable at any point in the history,
    specially when doing bisects. Also, we need to be a bit stable so that
    when designers, users or others build the latest Nautilus they are able
    to work with it regardless of its dependencies on other projects.
    
    Even more, now with CI we can test the master of the ecosystem regularly
    while not affecting our regular development and operations by depending
    on that.
    
    So let's separate in two different manifests the development version
    with stable dependencies, intended for our regular operations, and a
    development version with all the ecosystem on master, to test the
    ecosystem regularly on the CI or on-demand locally.

 build-aux/flatpak/org.gnome.Nautilus-master.yml | 80 +++++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Nautilus.json       | 11 ++--
 build-aux/flatpak/org.gnome.Nautilus.yml        | 59 ++++++++++++++----
 3 files changed, 136 insertions(+), 14 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus-master.yml b/build-aux/flatpak/org.gnome.Nautilus-master.yml
new file mode 100644
index 000000000..5ce399d4d
--- /dev/null
+++ b/build-aux/flatpak/org.gnome.Nautilus-master.yml
@@ -0,0 +1,80 @@
+app-id: org.gnome.NautilusDevel
+runtime: org.gnome.Platform
+runtime-version: master
+sdk: org.gnome.Sdk
+command: nautilus
+tags:
+  - devel
+  - nightly
+desktop-file-name-prefix: (Development)
+finish-args:
+  - --filesystem=host
+  - --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
+  # Remove to something better for dconf when ready.
+  # See https://github.com/flatpak/flatpak/issues/78
+  - --talk-name=ca.desrt.dconf
+  - --env=DCONF_USER_CONFIG_DIR=.config/dconf
+
+modules:
+  - name: exiv2
+    sources:
+      - type: archive
+        url: http://exiv2.org/builds/exiv2-0.26-trunk.tar.gz
+        sha256: c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
+      - type: shell
+        commands:
+          - cp -f /usr/share/automake-1.15/config.sub ./config/
+          - cp -f /usr/share/automake-1.15/config.guess ./config/
+
+  - name: gexiv2
+    build-options:
+      config-opts:
+        - --disable-introspection
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/gexiv2.git
+
+  - name: tracker
+    cleanup:
+      - /bin
+      - /etc
+      - /libexec
+    build-options:
+      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
+
+  - name: gnome-autoar
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
+
+  - name: nautilus
+    buildsystem: meson
+    builddir: true
+    build-options:
+      config-opts:
+        - --libdir=/app/lib
+        - -Dprofile=development
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/nautilus.git
\ No newline at end of file
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index de626bfbe..82c6745e1 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -36,7 +36,7 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": 
"https://gitlab.gnome.org/GNOME/nautilus/uploads/eeef8c704761a55a571bd284fddba60c/exiv2-0.26-trunk.tar.gz";,
+                    "url": "http://exiv2.org/builds/exiv2-0.26-trunk.tar.gz";,
                     "sha256": "c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb"
                 },
                 {
@@ -54,7 +54,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/gexiv2";
+                    "url": "https://git.gnome.org/browse/gexiv2";,
+                    "tag": "gexiv2-0.10.8"
                 }
             ]
         },
@@ -69,7 +70,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/tracker";
+                    "url": "https://git.gnome.org/browse/tracker";,
+                    "tag": "2.0.3"
                 }
             ]
         },
@@ -78,7 +80,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/gnome-autoar";
+                    "url": "https://git.gnome.org/browse/gnome-autoar";,
+                    "tag": "0.2.3"
                 }
             ]
         },
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index a5ef4c9bd..593587852 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -1,6 +1,6 @@
 app-id: org.gnome.NautilusDevel
 runtime: org.gnome.Platform
-runtime-version: master
+runtime-version: 3.28
 sdk: org.gnome.Sdk
 command: nautilus
 tags:
@@ -9,8 +9,31 @@ tags:
 desktop-file-name-prefix: (Development)
 finish-args:
   - --filesystem=host
+  - --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
+  # Remove to something better for dconf when ready.
+  # See https://github.com/flatpak/flatpak/issues/78
+  - --talk-name=ca.desrt.dconf
+  - --env=DCONF_USER_CONFIG_DIR=.config/dconf
 
 modules:
+  - name: meson
+    buildsystem: simple
+    build-commands:
+      - python3 setup.py install --prefix=/app
+    sources:
+      - type: archive
+        url: https://github.com/mesonbuild/meson/archive/0.46.1.tar.gz
+        sha256: 2d917692d2cc194e12295f00469fbdf3c045e85d0295e5e59ced69115920ffa0
+
   - name: exiv2
     sources:
       - type: archive
@@ -22,32 +45,48 @@ modules:
           - cp -f /usr/share/automake-1.15/config.guess ./config/
 
   - name: gexiv2
-    config-opts:
-      - --disable-introspection
+    build-options:
+      config-opts:
+        - --disable-introspection
     sources:
-     - type: git
-       url: https://git.gnome.org/browse/gexiv2
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/gexiv2.git
+        tag: gexiv2-0.10.8
 
   - name: tracker
     cleanup:
       - /bin
       - /etc
       - /libexec
+    build-options:
+      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://git.gnome.org/browse/tracker
+        url: https://gitlab.gnome.org/GNOME/tracker.git
+        tag: 2.0.3
 
   - name: gnome-autoar
     sources:
       - type: git
-        url: https://git.gnome.org/browse/gnome-autoar
+        url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
+        tag: 0.2.3
 
   - name: nautilus
     buildsystem: meson
     builddir: true
-    config-opts:
-      - --libdir=/app/lib
-      - -Dprofile=development
+    build-options:
+      config-opts:
+        - --libdir=/app/lib
+        - -Dprofile=development
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/nautilus.git
\ No newline at end of file