diff options
| author | Jordan Petridis <jordanpetridis@protonmail.com> | 2018-09-20 16:49:00 +0000 |
|---|---|---|
| committer | Jordan Petridis <jordanpetridis@protonmail.com> | 2018-09-20 16:49:00 +0000 |
| commit | 61e54e4f8de86ea094620d578876c8acd80f795f (patch) | |
| tree | 5fff8a67f2e102263a5fbceb5dfb563505c2f141 /build-aux | |
| parent | a565907fe6440844c822d7bf9d20fc42cd5a86c0 (diff) | |
| download | nautilus-61e54e4f8de86ea094620d578876c8acd80f795f.tar.gz | |
Revert "Flatpak: Remove unecessary meson options"
This reverts commit a565907fe6440844c822d7bf9d20fc42cd5a86c0
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json | 6 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.yml | 6 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusGtk4.yml | 8 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 6 |
4 files changed, 26 insertions, 0 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json index 2d0841ce5..586a94f80 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json @@ -65,7 +65,9 @@ { "name" : "gexiv2", "buildsystem" : "meson", + "builddir" : true, "config-opts" : [ + "--libdir=/app/lib", "-Ddisable-introspection=True" ], "sources" : [ @@ -84,7 +86,9 @@ "/libexec" ], "buildsystem": "meson", + "builddir": "true", "config-opts" : [ + "--libdir=lib", "-Ddocs=false", "-Dfunctional_tests=false", "-Djournal=false", @@ -112,8 +116,10 @@ }, { "buildsystem" : "meson", + "builddir" : true, "name" : "nautilus", "config-opts" : [ + "--libdir=/app/lib", "-Dprofile=development" ], "sources" : [ diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml index 884b7a26e..1f4109c09 100644 --- a/build-aux/flatpak/org.gnome.Nautilus.yml +++ b/build-aux/flatpak/org.gnome.Nautilus.yml @@ -51,8 +51,10 @@ modules: - name: gexiv2 buildsystem: meson + builddir: true build-options: config-opts: + - --libdir=/app/lib - -Ddisable-introspection=True sources: - type: git @@ -65,8 +67,10 @@ modules: - /etc - /libexec buildsystem: meson + builddir: true build-options: config-opts: + - --libdir=lib - -Ddocs=false - -Dfunctional_tests=false - -Djournal=false @@ -86,8 +90,10 @@ modules: - name: nautilus buildsystem: meson + builddir: true build-options: config-opts: + - --libdir=/app/lib - -Dprofile=development sources: - type: git diff --git a/build-aux/flatpak/org.gnome.NautilusGtk4.yml b/build-aux/flatpak/org.gnome.NautilusGtk4.yml index f178fc6f5..1d871d85d 100644 --- a/build-aux/flatpak/org.gnome.NautilusGtk4.yml +++ b/build-aux/flatpak/org.gnome.NautilusGtk4.yml @@ -41,8 +41,10 @@ modules: - name: "gexiv2" buildsystem: "meson" + builddir: true build-options: config-opts: + - "--libdir=lib" - "-Ddisable-introspection=true" - "-Ddisable-vala=true" sources: @@ -92,10 +94,12 @@ modules: tag: "1.8.2" build-options: config-opts: + - "--libdir=lib" - "-Dintrospection=false" - "-Dtests=false" - "-Dbenchmarks=false" buildsystem: "meson" + builddir: true - name: "gtk+" sources: @@ -103,16 +107,20 @@ 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 bf38bd9bf..039120ef0 100644 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml @@ -41,8 +41,10 @@ modules: - name: gexiv2 buildsystem: meson + builddir: true build-options: config-opts: + - --libdir=/app/lib - -Ddisable-introspection=True sources: - type: git @@ -54,8 +56,10 @@ modules: - /etc - /libexec buildsystem: meson + builddir: true build-options: config-opts: + - --libdir=lib - -Ddocs=false - -Dfunctional_tests=false - -Djournal=false @@ -74,8 +78,10 @@ modules: - name: nautilus buildsystem: meson + builddir: true build-options: config-opts: + - --libdir=/app/lib - -Dprofile=Master sources: - type: git |