Synchronize Sequoia port with upstream API changes

4 years ago · 99dbff147b
parent c906db401c
commit 99dbff147b
4 changed files with 491 additions and 463 deletions
--- a/default.conf
+++ b/default.conf
@ -236,10 +236,10 @@ NETPGP_LIB=
 NETPGP_INC=
 #NETPGP_INC=-I$(PREFIX)/include

-SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia)
-SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-L --libs-only-other sequoia)
-SEQUOIA_LIB=$(shell pkg-config --libs-only-l sequoia)
-SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia)
+SEQUOIA_CFLAGS=$(shell pkg-config --cflags-only-other sequoia-openpgp)
+SEQUOIA_LDFLAGS=$(shell pkg-config --libs-only-l --libs-only-other sequoia-openpgp)
+SEQUOIA_LIB=$(shell pkg-config --libs-only-L sequoia-openpgp)
+SEQUOIA_INC=$(shell pkg-config --cflags-only-I sequoia-openpgp)


 ######### OpenPGP #########
--- a/src/pEp_internal.h
+++ b/src/pEp_internal.h
@ -128,7 +128,6 @@ struct _pEpSession {
 #elif defined(USE_NETPGP)
    pEpNetPGPSession ctx;
 #elif defined(USE_SEQUOIA)
-    sq_context_t ctx;
    sqlite3 *key_db;
    struct {
        sqlite3_stmt *begin_transaction;
--- a/src/pgp_sequoia.c
+++ b/src/pgp_sequoia.c
--- a/src/pgp_sequoia_internal.h
+++ b/src/pgp_sequoia_internal.h
@ -3,4 +3,4 @@

 #pragma once

-#include <sequoia.h>
+#include <sequoia/openpgp.h>