From c6be77ba85526ca2f80ff36aef43eb0037da2a94 Mon Sep 17 00:00:00 2001
From: Torben <torben.letorbi@gmail.com>
Date: Tue, 3 Dec 2019 11:29:32 +0100
Subject: [PATCH] Remove last occurences of GMime 2.6

---
 INSTALL                |  4 ++--
 bindings/vapi/Makefile | 22 ----------------------
 org.gnome.Geary.json   |  3 +--
 org.gnome.Geary.yml    |  1 -
 src/meson.build        |  2 +-
 5 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 bindings/vapi/Makefile

diff --git a/INSTALL b/INSTALL
index 1ca42891..3bb721fb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,7 +40,7 @@ Installing dependencies on Fedora
 Install them by running this command:
 
     sudo dnf install meson vala desktop-file-utils enchant2-devel \
-        folks-devel gcr-devel glib2-devel gmime-devel \
+        folks-devel gcr-devel glib2-devel gmime30-devel \
         gnome-online-accounts-devel gspell-devel gtk3-devel \
         iso-codes-devel json-glib-devel libappstream-glib-devel \
         libgee-devel libhandy-devel libpeas-devel libsecret-devel \
@@ -55,7 +55,7 @@ Install them by running this command:
     sudo apt-get install meson build-essential valac \
         desktop-file-utils iso-codes gettext itstool \
         libappstream-glib-dev libenchant-dev libfolks-dev libgcr-3-dev \
-        libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev \
+        libgee-0.8-dev libglib2.0-dev libgmime3.0-dev libgoa-1.0-dev \
         libgspell-1-dev libgtk-3-dev libjson-glib-dev libhandy-0.0-dev \
         libpeas-dev libsecret-1-dev libsqlite3-dev libunwind-dev \
         libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev
diff --git a/bindings/vapi/Makefile b/bindings/vapi/Makefile
deleted file mode 100644
index c7b6687e..00000000
--- a/bindings/vapi/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# NOTE: The dependencies in this file require vapigen and vala-gen-introspect to be installed,
-# which are not default in a standard Vala installation.
-
-GMIME_FILES := \
-	gmime-2.6/gmime-2.6.defines \
-	gmime-2.6/gmime-2.6.files \
-	gmime-2.6/gmime-2.6.metadata \
-	gmime-2.6/gmime-2.6.namespace \
-	gmime-2.6/gmime-2.6-custom.vala
-
-all: gmime-2.6.vapi
-
-.PHONY: clean
-clean:
-	rm gmime-2.6.vapi gmime-2.6/gmime-2.6.gi
-
-gmime-2.6/gmime-2.6.gi: $(GMIME_FILES)
-	vala-gen-introspect gmime-2.6 gmime-2.6
-
-gmime-2.6.vapi: gmime-2.6/gmime-2.6.gi
-	vapigen --pkg=glib-2.0 --pkg=gio-2.0 --library gmime-2.6 gmime-2.6/gmime-2.6.gi gmime-2.6/gmime-2.6-custom.vala
-
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 9c604fff..be08b087 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -167,8 +167,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://github.com/jstedfast/gmime.git",
-                    "branch": "gmime-2-6"
+                    "url": "https://github.com/jstedfast/gmime.git"
                 }
             ]
         },
diff --git a/org.gnome.Geary.yml b/org.gnome.Geary.yml
index ce1c74d7..b8bb7336 100644
--- a/org.gnome.Geary.yml
+++ b/org.gnome.Geary.yml
@@ -175,7 +175,6 @@ modules:
     sources:
       - type: git
         url: https://github.com/jstedfast/gmime.git
-        branch: gmime-2-6
 
   # Geary dependency
   - name: libhandy
diff --git a/src/meson.build b/src/meson.build
index 90b628d3..244c3699 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -132,7 +132,7 @@ if enable_valadoc
       '--pkg', 'gio-2.0',
       '--pkg', 'gee-0.8',
       '--pkg', 'sqlite3',
-      '--pkg', 'gmime-2.6',
+      '--pkg', 'gmime-3.0',
       '--pkg', 'javascriptcoregtk-4.0',
       '--pkg', 'libxml-2.0',
       '--pkg', 'libunwind',