From 8db785d6f3ddd8e50c0e26ca713094a36e5f48f2 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Sun, 25 Apr 2021 20:13:24 +0930 Subject: [PATCH 1/5] build: Remove unused libpeas_gtk dependency --- meson.build | 1 - src/client/meson.build | 1 - 2 files changed, 2 deletions(-) diff --git a/meson.build b/meson.build index d0af9eef..3aa79399 100644 --- a/meson.build +++ b/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') libsoup = dependency('libsoup-2.4', version: '>= 2.48') diff --git a/src/client/meson.build b/src/client/meson.build index ff3c8a6d..d9e00aab 100644 --- a/src/client/meson.build +++ b/src/client/meson.build @@ -166,7 +166,6 @@ client_dependencies = [ libhandy, libmath, libpeas, - libpeas_gtk, libsecret, libsoup, libxml, From ec3cc82bea1ad42cddf78a0ed957e9eeb545266e Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Sun, 25 Apr 2021 20:14:06 +0930 Subject: [PATCH 2/5] build: Remove handy from Flatpak nightly manifest Nightly SDK now ships 1.2.1, so this is no longer needed. --- org.gnome.Geary.json | 17 ----------------- org.gnome.Geary.yaml | 12 ------------ 2 files changed, 29 deletions(-) diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json index b65c3d49..ce943f78 100644 --- a/org.gnome.Geary.json +++ b/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", diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml index f47a86d9..7137349e 100644 --- a/org.gnome.Geary.yaml +++ b/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 From c1c8058a2a3419362612ca73011f0e4b1101a3b9 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Sun, 25 Apr 2021 20:16:04 +0930 Subject: [PATCH 3/5] build: Remove --disable-since-check for llibhandy 1.0 --- src/meson.build | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/meson.build b/src/meson.build index 5eded12e..abe96124 100644 --- a/src/meson.build +++ b/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 = [] From 213c470416535487d3a894edc4d23483d254b89b Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Mon, 26 Apr 2021 22:50:40 +1000 Subject: [PATCH 4/5] client: Use public GCR trust API calls now they are widely packaged --- .../application-certificate-manager.vala | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/client/application/application-certificate-manager.vala b/src/client/application/application-certificate-manager.vala index 3add2206..bb1511a3 100644 --- a/src/client/application/application-certificate-manager.vala +++ b/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, From b0ad8274a56fede898cff0cd53848d361b9d80f6 Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Wed, 28 Apr 2021 08:44:03 +1000 Subject: [PATCH 5/5] build: Unpin GMime back to mainline for nightly Flatpak It's had a pre-release version bump, so we can now tell the difference if it's been built with the recent incompatible GI/VAPI changes. See !699 --- org.gnome.Geary.json | 2 +- org.gnome.Geary.yaml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json index ce943f78..2d556511 100644 --- a/org.gnome.Geary.json +++ b/org.gnome.Geary.json @@ -207,7 +207,7 @@ { "type": "git", "url": "https://github.com/jstedfast/gmime.git", - "branch": "3.2.7" + "branch": "master" } ] }, diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml index 7137349e..c3908a89 100644 --- a/org.gnome.Geary.yaml +++ b/org.gnome.Geary.yaml @@ -211,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