From 0428392dde4c89f9dfe48a52b725373665f78657 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Fri, 14 Dec 2018 01:27:44 +0200
Subject: [PATCH] Flatpak: remove no longer needed options

builddir: true is assumed always whenever the buildsystem is meson.

libdir no longer needs to be specified, and cmake was patched to
be able to deal with lib64. See [1] for more.

[1]: https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/77
---
 build-aux/flatpak/org.gnome.NautilusGtk4.yml   | 13 -------------
 build-aux/flatpak/org.gnome.NautilusMaster.yml | 10 ----------
 2 files changed, 23 deletions(-)

diff --git a/build-aux/flatpak/org.gnome.NautilusGtk4.yml b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
index 4f51f3a92..41ce19378 100644
--- a/build-aux/flatpak/org.gnome.NautilusGtk4.yml
+++ b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
@@ -30,10 +30,6 @@ finish-args:
 modules:
   - name: "exiv2"
     buildsystem: "cmake"
-    build-options:
-      config-opts:
-        - "-DCMAKE_INSTALL_PREFIX=/app"
-        - "-DCMAKE_INSTALL_LIBDIR=/app/lib"
     sources:
       - type: "archive"
         url: "https://github.com/Exiv2/exiv2/archive/v0.26.tar.gz"
@@ -41,13 +37,11 @@ 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-vala=true'
         - '-Dpython2-girdir=no'
@@ -90,7 +84,6 @@ modules:
       config-opts:
         - "--disable-documentation"
     buildsystem: "autotools"
-    builddir: true
 
   - name: "graphene"
     sources:
@@ -99,12 +92,10 @@ modules:
         tag: "1.8.2"
     build-options:
       config-opts:
-        - "--libdir=lib"
         - "-Dintrospection=false"
         - "-Dtests=false"
         - "-Dbenchmarks=false"
     buildsystem: "meson"
-    builddir: true
 
   - name: "gtk+"
     sources:
@@ -112,20 +103,16 @@ modules:
         url: "https://gitlab.gnome.org/GNOME/gtk.git"
     build-options:
       config-opts:
-        - "--libdir=lib"
         - "-Dintrospection=false"
         - "-Ddemos=true"
         - "-Dbuild-examples=false"
         - "-Dbuild-tests=false"
     buildsystem: "meson"
-    builddir: true
 
   - name: "nautilus"
     buildsystem: "meson"
-    builddir: true
     build-options:
       config-opts:
-        - "--libdir=lib"
         - "-Dprofile=Gtk4"
         - "-Dintrospection=false"
     sources:
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 565c97a9d..4e85fffa3 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -30,10 +30,6 @@ finish-args:
 modules:
   - name: "exiv2"
     buildsystem: "cmake"
-    build-options:
-      config-opts:
-        - "-DCMAKE_INSTALL_PREFIX=/app"
-        - "-DCMAKE_INSTALL_LIBDIR=/app/lib"
     sources:
       - type: "git"
         url: "https://github.com/Exiv2/exiv2.git"
@@ -41,13 +37,11 @@ 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-vala=true'
         - '-Dpython2-girdir=no'
@@ -62,10 +56,8 @@ modules:
       - /etc
       - /libexec
     buildsystem: meson
-    builddir: true
     build-options:
       config-opts:
-        - --libdir=lib
         - -Ddocs=false
         - -Dfunctional_tests=false
         - -Djournal=false
@@ -84,10 +76,8 @@ modules:
 
   - name: nautilus
     buildsystem: meson
-    builddir: true
     build-options:
       config-opts:
-        - --libdir=/app/lib
         - -Dprofile=Master
     sources:
       - type: git