From 0ab6cab7ea27a8ee9bce4edd864b21b31ae31639 Mon Sep 17 00:00:00 2001
From: De Rais <derais@cock.li>
Date: Tue, 28 Mar 2023 17:45:22 -0400
Subject: [PATCH] misc: update gmime dependency 2.6 -> 3.0

---
 Makefile        | 4 ++--
 db-sqlite3.c    | 2 +-
 multipart.c     | 6 +++---
 sanitize-file.c | 2 +-
 write-thread.c  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 90a5535..d91e33e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,8 @@ CFLAGS += $(shell $(PKG_CONFIG) --cflags libsodium)
 LDFLAGS += $(shell $(PKG_CONFIG) --libs libsodium)
 
 # gmime - one of these day's I'll do it without fscking glib
-CFLAGS += $(shell $(PKG_CONFIG) --cflags gmime-2.6)
-LDFLAGS += $(shell $(PKG_CONFIG) --libs gmime-2.6)
+CFLAGS += $(shell $(PKG_CONFIG) --cflags gmime-3.0)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs gmime-3.0)
 
 # Debug
 # CFLAGS += -g -O0 -pedantic -Wall -Wextra -Werror
diff --git a/db-sqlite3.c b/db-sqlite3.c
index ace1213..7d4fd32 100644
--- a/db-sqlite3.c
+++ b/db-sqlite3.c
@@ -375,7 +375,7 @@ static size_t num_connected_db = 0;
 static sqlite3 *global_db = 0;
 
 /* Global configuration */
-const struct configuration *conf;
+static const struct configuration *conf;
 
 /* Clean the internals of a prepared_post */
 static void
diff --git a/multipart.c b/multipart.c
index 7186480..a2c17b3 100644
--- a/multipart.c
+++ b/multipart.c
@@ -36,7 +36,7 @@ struct gmime_cb_data {
 int
 setup_multipart(void)
 {
-        g_mime_init(0);
+        g_mime_init();
 
         return 0;
 }
@@ -134,7 +134,7 @@ record_argument(GMimeObject *parent, GMimeObject *part, gpointer user_data)
         size_t l = 0;
         char *buf = 0;
 
-        if (!(w = g_mime_part_get_content_object(p))) {
+        if (!(w = g_mime_part_get_content(p))) {
                 d->had_error = 1;
 
                 return;
@@ -199,7 +199,7 @@ multipart_decompose(const char *full_data, size_t full_data_len, struct
                 goto done;
         }
 
-        if (!(m = g_mime_parser_construct_message(p))) {
+        if (!(m = g_mime_parser_construct_message(p, 0))) {
                 ERROR_MESSAGE("Some kind of GMime error");
                 goto done;
         }
diff --git a/sanitize-file.c b/sanitize-file.c
index 7aa9faa..acf0498 100644
--- a/sanitize-file.c
+++ b/sanitize-file.c
@@ -34,7 +34,7 @@ static magic_t mime_cookie;
 static char *temp_dir;
 
 /* Global configuration */
-const struct configuration *conf;
+static const struct configuration *conf;
 
 /* A buffer this long can hold any static_thumbnail path */
 static size_t max_static_thumb_len;
diff --git a/write-thread.c b/write-thread.c
index 150414b..5f2f9d7 100644
--- a/write-thread.c
+++ b/write-thread.c
@@ -32,7 +32,7 @@
 #include "rb79.h"
 
 /* Global configuration */
-const struct configuration *conf;
+static const struct configuration *conf;
 
 /* A template for pages 1, 2, ... of every board */
 static char *board_page;
-- 
2.11.4.GIT