From 9402e715009507b4aaddeb91fe7e04888e066a6d Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Fri, 3 Apr 2020 11:21:43 +1100
Subject: [PATCH] org.gnome.Geary.yaml: Include libcanberra in build anyway for
 GSound

---
 org.gnome.Geary.json | 21 ++++++++++++++++++---
 org.gnome.Geary.yaml | 20 ++++++++++++++++----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index af59c3da..8571139f 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -163,12 +163,18 @@
             ]
         },
         {
-            "name": "gmime",
+            "name": "libcanberra",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/jstedfast/gmime.git"
+                    "type": "archive",
+                    "url": "http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz",
+                    "sha256": "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72"
                 }
+            ],
+            "config-opts": [
+                "--disable-alsa",
+                "--disable-null",
+                "--disable-oss"
             ]
         },
         {
@@ -180,6 +186,15 @@
                 }
             ]
         },
+        {
+            "name": "gmime",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/jstedfast/gmime.git"
+                }
+            ]
+        },
         {
             "name": "libhandy",
             "buildsystem": "meson",
diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml
index 1d50eedd..f0bbed03 100644
--- a/org.gnome.Geary.yaml
+++ b/org.gnome.Geary.yaml
@@ -172,11 +172,16 @@ modules:
     cleanup:
       - /bin
 
-  # Geary dependency
-  - name: gmime
+  # GSound dependency
+  - name: libcanberra
     sources:
-      - type: git
-        url: https://github.com/jstedfast/gmime.git
+      - type: archive
+        url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
+        sha256: c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72
+    config-opts:
+      - "--disable-alsa"
+      - "--disable-null"
+      - "--disable-oss"
 
   # Geary dependency
   - name: gsound
@@ -184,6 +189,12 @@ modules:
       - type: git
         url: https://github.com/GNOME/gsound.git
 
+  # Geary dependency
+  - name: gmime
+    sources:
+      - type: git
+        url: https://github.com/jstedfast/gmime.git
+
   # Geary dependency
   - name: libhandy
     buildsystem: meson
@@ -223,3 +234,4 @@ modules:
       - type: git
         url: https://gitlab.gnome.org/GNOME/geary.git
         branch: mainline
+