[nautilus] Flatpak: get gexiv2 module to compile again

[Carlos Soriano <csoriano src gnome org>]

commit be1888bc50ef31f8488d561f2e0530f08aeb7817
Author: Jordan Petridis <jpetridis gnome org>
Date:   Fri Dec 14 01:19:06 2018 +0200

    Flatpak: get gexiv2 module to compile again
    
    This seems to have been broken for a while now cause by default
    it tries to install a python overide in the python shared packages
    in /usr, but this is immutable since it comes from the runtime.
    
    This patch disables that.

 build-aux/flatpak/org.gnome.NautilusGtk4.yml   | 11 ++++++++---
 build-aux/flatpak/org.gnome.NautilusMaster.yml |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.NautilusGtk4.yml b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
index 1d871d85d..4f51f3a92 100644
--- a/build-aux/flatpak/org.gnome.NautilusGtk4.yml
+++ b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
@@ -42,11 +42,16 @@ modules:
   - name: "gexiv2"
     buildsystem: "meson"
     builddir: true
+    cleanup:
+      - '/lib/girepository-1.0'
+      - '/share/gir-1.0'
     build-options:
       config-opts:
-        - "--libdir=lib"
-        - "-Ddisable-introspection=true"
-        - "-Ddisable-vala=true"
+        - --libdir=/app/lib
+        - '-Ddisable-introspection=True'
+        - '-Ddisable-vala=true'
+        - '-Dpython2-girdir=no'
+        - '-Dpython3-girdir=no'
     sources:
       - type: "git"
         url: "https://gitlab.gnome.org/GNOME/gexiv2.git";
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 1d8f9d8c3..565c97a9d 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -42,10 +42,16 @@ modules:
   - name: gexiv2
     buildsystem: meson
     builddir: true
+    cleanup:
+      - '/lib/girepository-1.0'
+      - '/share/gir-1.0'
     build-options:
       config-opts:
         - --libdir=/app/lib
-        - -Ddisable-introspection=True
+        - '-Ddisable-introspection=True'
+        - '-Ddisable-vala=true'
+        - '-Dpython2-girdir=no'
+        - '-Dpython3-girdir=no'
     sources:
       - type: git
         url: https://gitlab.gnome.org/GNOME/gexiv2.git