summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2017-03-16 14:06:32 +0100
committerCarlos Soriano <csoriano@gnome.org>2017-03-16 15:44:03 +0100
commit3453309b4267309adf25c308727ccb951131819d (patch)
tree171547e10dbf05adcac0aee6cca792eb4c46b683
parent87141c131f4c6ba8e57b3036b1eec6196171cf40 (diff)
downloadnautilus-3453309b4267309adf25c308727ccb951131819d.tar.gz
Revert "org.gnome.Nautilus: revert build by default with meson"
This reverts commit a84bf6ac79175e831feaf5e061dad3e822f1e816. Meson can be used now from builder, although it compiles everytime due to ninja issue https://github.com/ninja-build/ninja/issues/1120 it's still faster than autotools for me (quite surprising), so switching for it as default build system. Developers can still use autotools just switching the buildsystem in the flatpak manifest.
-rw-r--r--org.gnome.Nautilus.json11
1 files changed, 6 insertions, 5 deletions
diff --git a/org.gnome.Nautilus.json b/org.gnome.Nautilus.json
index 3e8661e80..3eb259d6f 100644
--- a/org.gnome.Nautilus.json
+++ b/org.gnome.Nautilus.json
@@ -117,13 +117,14 @@
]
},
{
+ "buildsystem": "meson",
+ "builddir": true,
"name": "nautilus",
"config-opts": [
- "--disable-static",
- "--disable-desktop",
- "--disable-selinux",
- "--enable-xmp",
- "--enable-libexif"
+ "-Denable-desktop=false",
+ "-Denable-selinux=false",
+ "-Denable-xmp=true",
+ "-Denable-libexif=true"
],
"sources": [
{