[gnome-continuous] Add a patch for building ostree

[Emmanuele Bassi <ebassi src gnome org>]

commit 8f6e23b60308f3f21fba7a33dda3b158905da1c3
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Jul 17 22:36:48 2018 +0100

    Add a patch for building ostree
    
    Our Yocto base modifies gpg-error-config to error out, and forces us to
    check for pkg-config first.

 manifest.json                         |  2 ++
 patches/ostree-gpg-error-config.patch | 45 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
---
diff --git a/manifest.json b/manifest.json
index 2f528f9..1fe6af8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -952,6 +952,8 @@
                 "config-opts": ["--enable-installed-tests"]},
 
                {"src": "git:https://github.com/ostreedev/ostree";,
+                 "patches": ["ostree-gpg-error-config.patch"],
+                 "name": "ostree",
                  "component": "minimal",
                 "initramfs-depends": true,
                 "config-opts": ["--with-soup-gnome",
diff --git a/patches/ostree-gpg-error-config.patch b/patches/ostree-gpg-error-config.patch
new file mode 100644
index 0000000..bae3bbc
--- /dev/null
+++ b/patches/ostree-gpg-error-config.patch
@@ -0,0 +1,45 @@
+From f34d613e16ed085c35d863291c7e759f89233f2b Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi gnome org>
+Date: Tue, 17 Jul 2018 22:33:19 +0100
+Subject: [PATCH] Add a check for gpg-error via pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some downstreams — namely, the Yocto Project — ship gpg-error with a
+pkg-config file, and modify gpg-error-config to error out when you try
+using it instead of pkg-config.
+
+We can check for gpg-error via pkg-config, and if it's not available,
+fall back to gpg-error-config.
+
+Signed-off-by: Emmanuele Bassi <ebassi gnome org>
+---
+ configure.ac | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f0907a15..add72b8f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -220,10 +220,15 @@ AS_IF([ test x$have_gpgme = xno ], [
+    AC_MSG_ERROR([Need GPGME_PTHREAD version $LIBGPGME_DEPENDENCY or later])
+ ])
+ OSTREE_FEATURES="$OSTREE_FEATURES gpgme"
++PKG_CHECK_MODULES(OT_DEP_GPG_ERROR, [gpg-error], [], [
+ dnl This apparently doesn't ship a pkg-config file either, and we need
+ dnl to link to it directly.
+-OT_DEP_GPGME_CFLAGS="${OT_DEP_GPGME_CFLAGS} $(gpg-error-config --cflags)"
+-OT_DEP_GPGME_LIBS="${OT_DEP_GPGME_LIBS} $(gpg-error-config --libs)"
++    AC_PATH_PROG(GPG_ERROR_CONFIG, [gpg-error-config], [AC_MSG_ERROR([Missing gpg-error-config])])
++    OT_DEP_GPG_ERROR_CFLAGS="$( $GPG_ERROR_CONFIG --cflags )"
++    OT_DEP_GPG_ERROR_LIBS="$( $GPG_ERROR_CONFIG --libs )"
++])
++OT_DEP_GPGME_CFLAGS="${OT_DEP_GPGME_CFLAGS} ${OT_DEP_GPG_ERROR_CFLAGS}"
++OT_DEP_GPGME_LIBS="${OT_DEP_GPGME_LIBS} ${OT_DEP_GPG_ERROR_LIBS}"
+ 
+ LIBARCHIVE_DEPENDENCY="libarchive >= 2.8.0"
+ # What's in RHEL7.2.
+-- 
+2.17.1
+