[gnome-ostree] Add missing patches from previous commit

[Colin Walters <walters src gnome org>]

commit d7019f77fa434c8e2e4980c16c807072e54e8ccc
Author: Colin Walters <walters verbum org>
Date:   Sun Apr 7 11:17:41 2013 -0400

    Add missing patches from previous commit

 patches/spice-no-builddir.patch     |   30 ++++++++++++++++++++++++++++++
 patches/spice-stack-protector.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 0 deletions(-)
---
diff --git a/patches/spice-no-builddir.patch b/patches/spice-no-builddir.patch
new file mode 100644
index 0000000..b33406c
--- /dev/null
+++ b/patches/spice-no-builddir.patch
@@ -0,0 +1,30 @@
+From 5961bae853180f75b018ccb9cfa3889e742aee04 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 7 Apr 2013 14:30:18 -0400
+Subject: [PATCH] build: We can't do srcdir != builddir from git
+
+See comment.
+---
+ configure.ac |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc0216f..39f095d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,12 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip subdir-objects])
+ AM_MAINTAINER_MODE
+ 
++dnl http://people.gnome.org/~walters/docs/build-api.txt
++dnl We don't support separate builddir when building from git
++dnl because of all of the crazy stuff to try not to depend on
++dnl pyparsing.
++echo \#buildapi-variable-no-builddir >/dev/null
++
+ AC_PROG_CC
+ AC_PROG_CC_C99
+ if test x"$ac_cv_prog_cc_c99" = xno; then
+-- 
+1.7.1
+
diff --git a/patches/spice-stack-protector.patch b/patches/spice-stack-protector.patch
new file mode 100644
index 0000000..ac6295d
--- /dev/null
+++ b/patches/spice-stack-protector.patch
@@ -0,0 +1,33 @@
+From 892e0a597b7f3977c7aacc1c682c4e3aff5825ba Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sun, 7 Apr 2013 14:43:02 -0400
+Subject: [PATCH] spice: Disable automatic injection of -fstack-protector-all
+
+It looks like the stack-protection toolchain is buggy at the moment
+in gnome-ostree.
+
+And regardless, this is something the external toolchain should inject
+via explicit CFLAGS (or configure option), it shouldn't be chosen
+per-component automatically.
+---
+ m4/spice-compile-warnings.m4 |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/spice-compile-warnings.m4 b/m4/spice-compile-warnings.m4
+index 959971a..48d7a18 100644
+--- a/m4/spice-compile-warnings.m4
++++ b/m4/spice-compile-warnings.m4
+@@ -126,8 +126,8 @@ AC_DEFUN([SPICE_COMPILE_WARNINGS],[
+        dnl Fedora only uses -fstack-protector, but doesn't seem to
+        dnl be great overhead in adding -fstack-protector-all instead
+        dnl gl_WARN_ADD([-fstack-protector])
+-       gl_WARN_ADD([-fstack-protector-all])
+-       gl_WARN_ADD([--param=ssp-buffer-size=4])
++       dnl gl_WARN_ADD([-fstack-protector-all])
++       dnl gl_WARN_ADD([--param=ssp-buffer-size=4])
+        ;;
+     esac
+     gl_WARN_ADD([-fexceptions])
+-- 
+1.7.1
+