[nautilus/csoriano-testing-CI-patch-79758: 3/3] f

[Carlos Soriano <csoriano src gnome org>]

commit d967549019f10fb31614b4f7afcae4721b886a97
Author: Carlos Soriano <csoriano redhat com>
Date:   Mon Sep 10 16:01:35 2018 +0200

    f

 build-aux/flatpak/org.gnome.Nautilus.json      | 21 +++++++++------------
 build-aux/flatpak/org.gnome.Nautilus.yml       | 14 +++++---------
 build-aux/flatpak/org.gnome.NautilusGtk4.yml   | 14 +++++---------
 build-aux/flatpak/org.gnome.NautilusMaster.yml | 14 +++++---------
 4 files changed, 24 insertions(+), 39 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 2b3f0e155..eedcf6356 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -84,22 +84,19 @@
                 "/etc",
                 "/libexec"
             ],
+            "buildsystem": "meson",
+            "builddir": "true",
             "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"
+                "-Ddocs=false",
+                "-Dbash_completion=no",
+                "-Ddbus_services=no",
+                "--prefix=/app",
+                "--libdir=/app/lib"
             ],
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/tracker.git";,
-                    "tag" : "2.0.3"
+                    "url" : "https://gitlab.gnome.org/GNOME/tracker.git";
                 }
             ]
         },
@@ -133,4 +130,4 @@
         "env" : {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 587e539ef..53d91a4f7 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -70,15 +70,11 @@ modules:
     builddir: true
     build-options:
       config-opts:
-        - -Ddisable-miner-apps
-        - -Ddisable-static
-        - -Ddisable-tracker-extract
-        - -Ddisable-tracker-needle
-        - -Ddisable-tracker-preferences
-        - -Ddisable-artwork
-        - -Ddisable-tracker-writeback
-        - -Ddisable-miner-user-guides
-        - -Dwith-bash-completion-dir=no
+        - -Ddocs=false
+        - -Dbash_completion=no
+        - -Ddbus_services=no
+        - --prefix=/app
+        - --libdir=/app/lib
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/tracker.git
diff --git a/build-aux/flatpak/org.gnome.NautilusGtk4.yml b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
index d614ef406..fd6481922 100644
--- a/build-aux/flatpak/org.gnome.NautilusGtk4.yml
+++ b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
@@ -58,15 +58,11 @@ modules:
     builddir: true
     build-options:
       config-opts:
-        - -Ddisable-miner-apps
-        - -Ddisable-static
-        - -Ddisable-tracker-extract
-        - -Ddisable-tracker-needle
-        - -Ddisable-tracker-preferences
-        - -Ddisable-artwork
-        - -Ddisable-tracker-writeback
-        - -Ddisable-miner-user-guides
-        - -Dwith-bash-completion-dir=no
+        - -Ddocs=false
+        - -Dbash_completion=no
+        - -Ddbus_services=no
+        - --prefix=/app
+        - --libdir=/app/lib
     sources:
       - type: "git"
         url: "https://gitlab.gnome.org/GNOME/tracker.git";
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 2500ec2c4..eda8d8c36 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -57,15 +57,11 @@ modules:
     builddir: true
     build-options:
       config-opts:
-        - -Ddisable-miner-apps
-        - -Ddisable-static
-        - -Ddisable-tracker-extract
-        - -Ddisable-tracker-needle
-        - -Ddisable-tracker-preferences
-        - -Ddisable-artwork
-        - -Ddisable-tracker-writeback
-        - -Ddisable-miner-user-guides
-        - -Dwith-bash-completion-dir=no
+        - -Ddocs=false
+        - -Dbash_completion=no
+        - -Ddbus_services=no
+        - --prefix=/app
+        - --libdir=/app/lib
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/tracker.git