From 11d0b1295da0274ff2a4c8c426a79c24893ebbdb Mon Sep 17 00:00:00 2001
From: Michael James Gratton <mike@vee.net>
Date: Tue, 12 Jun 2018 02:49:34 +1000
Subject: [PATCH] Add a workaround to try to fix GOA module build in
 gnome-apps-nightly.

---
 org.gnome.Geary.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index b0f944d7..93c45ff3 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -80,7 +80,14 @@
             "config-opts": [
                 "--disable-telepathy",
                 "--disable-documentation",
-                "--disable-backend"
+                "--disable-backend",
+                /* Enabling debug via configure causes both -g and -O0
+                   to be set, which is bad since the former is
+                   redundant with our build-options above, and the
+                   latter conflicts with both the build options and
+                   with whatever is causing FORTIFY_SOURCE to be
+                   set. So disable debug instead. */
+                "--enable-debug=no"
             ],
             "sources": [
                 {