[gnome-continuous] Revert "Build nautilus with autotools for now"

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 02e7b9bc2f0f765457ae5bfd566aebff9189fdcb
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Feb 27 12:03:04 2017 +0000

    Revert "Build nautilus with autotools for now"
    
    This reverts commit 37f303d287aecbf8c878c406e165e8c023af87a5.
    
    The fix for meson was pushed to master

 manifest.json                         |    3 +-
 patches/nautilus-meson-buildapi.patch |  160 +++++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 901c44b..b6fa24a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1146,7 +1146,8 @@
                 {"src": "gnome:gnome-autoar"},
 
                {"src": "gnome:nautilus",
-                "config-opts": ["--disable-selinux"]},
+                "config-opts": ["--disable-selinux"],
+                "patches": ["nautilus-meson-buildapi.patch"]},
 
                 {"src": 
"tarball:http://downloads.sourceforge.net/project/gtkspell/3.0.9/gtkspell3-3.0.9.tar.xz";,
                 "name": "gtkspell3",
diff --git a/patches/nautilus-meson-buildapi.patch b/patches/nautilus-meson-buildapi.patch
new file mode 100644
index 0000000..bbc6442
--- /dev/null
+++ b/patches/nautilus-meson-buildapi.patch
@@ -0,0 +1,160 @@
+From 423002b8ed9c2479f3062e40d449bdee68492eae Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Mon, 20 Feb 2017 11:33:49 +0000
+Subject: [PATCH] Add build-api wrapper for Meson/Ninja
+
+Use Meson and Ninja, instead of autotools.
+
+v3:
+  - Enable CCache
+  - Pass CC and CXX flags to meson and ninja
+v2:
+  - Disable CCache
+---
+ configure | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 134 insertions(+)
+ create mode 100755 configure
+
+diff --git a/configure b/configure
+new file mode 100755
+index 000000000..8af9ec7b4
+--- /dev/null
++++ b/configure
+@@ -0,0 +1,134 @@
++#!/bin/bash
++# configure script adapter for Meson
++# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
++# Copyright 2016 Emmanuele Bassi
++# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
++
++# Little helper function for reading args from the commandline.
++# it automatically handles -a b and -a=b variants, and returns 1 if
++# we need to shift $3.
++read_arg() {
++    # $1 = arg name
++    # $2 = arg value
++    # $3 = arg parameter
++    local rematch='^[^=]*=(.*)$'
++    if [[ $2 =~ $rematch ]]; then
++      read "$1" <<< "${BASH_REMATCH[1]}"
++    else
++      read "$1" <<< "$3"
++      # There is no way to shift our callers args, so
++      # return 1 to indicate they should do it instead.
++      return 1
++    fi
++}
++
++sanitycheck() {
++    # $1 = arg name
++    # $1 = arg command
++    # $2 = arg alternates
++    local cmd=$( which $2 2>/dev/null )
++
++    if [ -x "$cmd" ]; then
++        read "$1" <<< "$cmd"
++        return 0
++    fi
++
++    test -z $3 || {
++        for alt in $3; do
++            cmd=$( which $alt 2>/dev/null )
++
++            if [ -x "$cmd" ]; then
++                read "$1" <<< "$cmd"
++                return 0
++            fi
++        done
++    }
++
++    echo -e "\e[1;31mERROR\e[0m: Command '$2' not found"
++    exit 1
++}
++
++
++sanitycheck MESON 'meson'
++sanitycheck NINJA 'ninja' 'ninja-build'
++
++enable_docs='-Denable-gtk-doc=false'
++enable_selinux='-Denable-selinux=true'
++
++while (($# > 0)); do
++    case "${1%%=*}" in
++      --prefix) read_arg prefix "$@" || shift;;
++      --bindir) read_arg bindir "$@" || shift;;
++      --sbindir) read_arg sbindir "$@" || shift;;
++      --libexecdir) read_arg libexecdir "$@" || shift;;
++      --datarootdir) read_arg datarootdir "$@" || shift;;
++      --datadir) read_arg datadir "$@" || shift;;
++      --sysconfdir) read_arg sysconfdir "$@" || shift;;
++      --libdir) read_arg libdir "$@" || shift;;
++      --mandir) read_arg mandir "$@" || shift;;
++      --includedir) read_arg includedir "$@" || shift;;
++      --enable-gtk-doc) enable_docs='-Denable-gtk-doc=true';;
++      --disable-gtk-doc) enable_docs='-Denable-gtk-doc=false';;
++      --enable-selinux) enable_selinux='-Denable-selinux=true';;
++      --disable-selinux) enable_selinux='-Denable-selinux=false';;
++      *) echo "Ignoring unknown option '$1'";;
++    esac
++    shift
++done
++
++# Defaults
++test -z ${prefix} && prefix="/usr/local"
++test -z ${bindir} && bindir=${prefix}/bin
++test -z ${sbindir} && sbindir=${prefix}/sbin
++test -z ${libexecdir} && libexecdir=${prefix}/bin
++test -z ${datarootdir} && datarootdir=${prefix}/share
++test -z ${datadir} && datadir=${datarootdir}
++test -z ${sysconfdir} && sysconfdir=${prefix}/etc
++test -z ${libdir} && libdir=${prefix}/lib
++test -z ${mandir} && mandir=${prefix}/share/man
++test -z ${includedir} && includedir=${prefix}/include
++
++# The source directory is the location of this file
++srcdir=$(dirname $0)
++
++# Wrapper Makefile for Ninja
++cat > Makefile <<END
++# Generated by configure; do not edit
++
++all:
++      CC=gcc CXX=g++ ${NINJA}
++
++install:
++      DESTDIR="\$(DESTDIR)" ${NINJA} install
++END
++
++echo "Summary:"
++echo "  meson:....... ${MESON}"
++echo "  ninja:....... ${NINJA}"
++echo "  prefix:...... ${prefix}"
++echo "  bindir:...... ${bindir}"
++echo "  sbindir:..... ${sbindir}"
++echo "  libexecdir:.. ${libexecdir}"
++echo "  datarootdir:. ${datarootdir}"
++echo "  datadir:..... ${datadir}"
++echo "  sysconfdir:.. ${sysconfdir}"
++echo "  libdir:...... ${libdir}"
++echo "  mandir:...... ${mandir}"
++echo "  includedir:.. ${includedir}"
++
++export CC=gcc CXX=g++
++exec ${MESON} \
++      --prefix=${prefix} \
++      --libdir=${libdir} \
++      --libexecdir=${libexecdir} \
++      --datadir=${datadir} \
++      --sysconfdir=${sysconfdir} \
++      --bindir=${bindir} \
++      --includedir=${includedir} \
++      --mandir=${mandir} \
++      --default-library shared \
++      ${enable_docs} \
++      ${enable_selinux} \
++      ${srcdir}
++
++# vim: ai ts=8 noet sts=2 ft=sh
+-- 
+2.11.1
+