Merge branch 'mjog/build-updates' into 'mainline'

Misc build fixes

See merge request GNOME/geary!703

meson.build

@@ -92,7 +92,6 @@ json_glib = dependency('json-glib-1.0', version: '>= 1.0')
 libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false)
 libmath = cc.find_library('m')
 libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
-libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
 libsecret = dependency('libsecret-1', version: '>= 0.11')
 libstemmer_dep = cc.find_library('stemmer')
 libunwind_dep = dependency(

org.gnome.Geary.json

@@ -78,23 +78,6 @@
                 "/share"
             ]
         },
-        {
-            "name": "libhandy",
-            "buildsystem": "meson",
-            "config-opts": [
-                "-Dglade_catalog=disabled"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libhandy.git",
-                    "branch": "master"
-                }
-            ],
-            "cleanup": [
-                "/bin"
-            ]
-        },
         {
             "name": "libical",
             "buildsystem": "cmake-ninja",
@@ -224,7 +207,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/jstedfast/gmime.git",
-                    "branch": "3.2.7"
+                    "branch": "master"
                 }
             ]
         },

org.gnome.Geary.yaml

@@ -111,18 +111,6 @@ modules:
       - /bin
       - /share
 
-  # Geary dependency
-  - name: libhandy
-    buildsystem: meson
-    config-opts:
-      - "-Dglade_catalog=disabled"
-    sources:
-      - type: git
-        url: "https://gitlab.gnome.org/GNOME/libhandy.git"
-        branch: master
-    cleanup:
-      - /bin
-
   # EDS dependency
   - name: libical
     buildsystem: cmake-ninja
@@ -223,9 +211,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/jstedfast/gmime.git
-        # Pin to 3.2.7 until 3.2.8 is released, or the mainline branch
-        # is pre-bumped to same.
-        branch: 3.2.7
+        branch: master
 
   # Geary dependency
   - name: libpeas

src/client/application/application-certificate-manager.vala

@@ -6,23 +6,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
-// Required because GCR's VAPI is behind-the-times. See:
-// https://gitlab.gnome.org/GNOME/gcr/merge_requests/7
-extern async bool gcr_trust_add_pinned_certificate_async(
-    Gcr.Certificate cert,
-    string purpose,
-    string peer,
-    Cancellable? cancellable
-) throws Error;
-extern bool gcr_trust_is_certificate_pinned(
-    Gcr.Certificate cert,
-    string purpose,
-    string peer,
-    Cancellable? cancellable
-) throws Error;
-
-
-// All of the below basically exists since cert pinning using GCR
+// All of the code below basically exists since cert pinning using GCR
 // stopped working (GNOME/gcr#10) after gnome-keyring stopped
 // advertising its PKCS11 module (GNOME/gnome-keyring#20). To work
 // around, this piggy-backs off of the GIO infrastructure and adds a
@@ -295,7 +279,7 @@ internal class Application.TlsDatabase : GLib.TlsDatabase {
         }
         if (save) {
             if (this.use_gcr) {
-                yield gcr_trust_add_pinned_certificate_async(
+                yield Gcr.trust_add_pinned_certificate_async(
                     new Gcr.SimpleCertificate(certificate.certificate.data),
                     GLib.TlsDatabase.PURPOSE_AUTHENTICATE_SERVER,
                     id,
@@ -454,7 +438,7 @@ internal class Application.TlsDatabase : GLib.TlsDatabase {
                 // Cert not found in memory, check with GCR if
                 // enabled.
                 if (this.use_gcr) {
-                    is_pinned = gcr_trust_is_certificate_pinned(
+                    is_pinned = Gcr.trust_is_certificate_pinned(
                         new Gcr.SimpleCertificate(chain.certificate.data),
                         GLib.TlsDatabase.PURPOSE_AUTHENTICATE_SERVER,
                         id,

src/client/meson.build

@@ -166,7 +166,6 @@ client_dependencies = [
   libhandy,
   libmath,
   libpeas,
-  libpeas_gtk,
   libsecret,
   libxml,
   posix,

src/meson.build

@@ -26,11 +26,6 @@ geary_vala_args = [
   '--enable-checking',
 ]
 
-# Remove once libhandy 1.0 has been packaged and is widely available
-if libhandy.version().version_compare('<1.0')
-  geary_vala_args += [ '--disable-since-check' ]
-endif
-
 # Symbols for valac's preprocessor must be defined as compiler args,
 # not in the code or in config.h
 vala_defines = []