summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@redhat.com>2018-07-26 15:34:32 +0200
committerCarlos Soriano <csoriano@redhat.com>2018-07-26 15:40:23 +0200
commit703618c12c2fb62e81c0dc4c6092ddac9a2d4abf (patch)
tree93fb5ba010bdadd12a7a736dd45feb46c2cc5d36
parent56100acb9ae589a4984c97e1c829f2e5f794f21c (diff)
downloadnautilus-703618c12c2fb62e81c0dc4c6092ddac9a2d4abf.tar.gz
flatpak: Use meson for gexvi2
Life's much better now.
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus.json5
-rw-r--r--build-aux/flatpak/org.gnome.Nautilus.yml5
-rw-r--r--build-aux/flatpak/org.gnome.NautilusGtk4.yml5
-rw-r--r--build-aux/flatpak/org.gnome.NautilusMaster.yml5
4 files changed, 16 insertions, 4 deletions
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 569ae42a3..f8c16f9d4 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -63,8 +63,11 @@
},
{
"name" : "gexiv2",
+ "buildsystem" : "meson",
+ "builddir" : true,
"config-opts" : [
- "--disable-introspection"
+ "--libdir=/app/lib",
+ "-Ddisable-introspection=True"
],
"sources" : [
{
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index e7b735363..cf9422b8b 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -50,9 +50,12 @@ modules:
- cp -f /usr/share/automake-1.15/config.guess ./config/
- name: gexiv2
+ buildsystem: meson
+ builddir: true
build-options:
config-opts:
- - --disable-introspection
+ - --libdir=/app/lib
+ - -Ddisable-introspection=True
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gexiv2.git
diff --git a/build-aux/flatpak/org.gnome.NautilusGtk4.yml b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
index 59ccd164b..7e5aa7f0d 100644
--- a/build-aux/flatpak/org.gnome.NautilusGtk4.yml
+++ b/build-aux/flatpak/org.gnome.NautilusGtk4.yml
@@ -42,9 +42,12 @@ modules:
- cp -f /usr/share/automake-1.15/config.guess ./config/
- name: gexiv2
+ buildsystem: meson
+ builddir: true
build-options:
config-opts:
- - --disable-introspection
+ - --libdir=/app/lib
+ - -Ddisable-introspection=True
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 d98530239..4a5d85e58 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -42,9 +42,12 @@ modules:
- cp -f /usr/share/automake-1.15/config.guess ./config/
- name: gexiv2
+ buildsystem: meson
+ builddir: true
build-options:
config-opts:
- - --disable-introspection
+ - --libdir=/app/lib
+ - -Ddisable-introspection=True
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gexiv2.git