[gnome-continuous] manifest: move nautilus configure options to build patch



commit c0d8ae26659f399f5c3bb387651f5df181fac032
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Feb 26 00:37:36 2017 +0000

    manifest: move nautilus configure options to build patch

 manifest.json                    |    1 -
 patches/nautilus-build-api.patch |   11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 14af2b6..ee9643b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1147,7 +1147,6 @@
                 {"src": "gnome:gnome-autoar"},
 
                {"src": "gnome:nautilus",
-                "config-opts": ["--disable-selinux"],
                 "patches": ["nautilus-build-api.patch"]},
 
                 {"src": 
"tarball:http://downloads.sourceforge.net/project/gtkspell/3.0.9/gtkspell3-3.0.9.tar.xz";,
diff --git a/patches/nautilus-build-api.patch b/patches/nautilus-build-api.patch
index e8274b3..db90ecc 100644
--- a/patches/nautilus-build-api.patch
+++ b/patches/nautilus-build-api.patch
@@ -1,4 +1,4 @@
-From e11ef177c61ba0150c47c0ab8dff46569fc7ea59 Mon Sep 17 00:00:00 2001
+From 10a167fcc28936c90a8e54c030560b5dd19fa0fc 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
@@ -8,16 +8,16 @@ Use Meson and Ninja, instead of autotools.
 v2:
   - Disable CCache
 ---
- configure | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 130 insertions(+)
+ configure | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 131 insertions(+)
  create mode 100755 configure
 
 diff --git a/configure b/configure
 new file mode 100755
-index 000000000..33bca5167
+index 000000000..ce882a420
 --- /dev/null
 +++ b/configure
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
 +#!/bin/bash
 +# configure script adapter for Meson
 +# Copyright 2010, 2011, 2013 Colin Walters <walters verbum org>
@@ -144,6 +144,7 @@ index 000000000..33bca5167
 +      --includedir=${includedir} \
 +      --mandir=${mandir} \
 +      --default-library shared \
++      --disable-selinux \
 +      ${enable_docs} \
 +      ${srcdir}
 +


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]