Merge pull request #2319 from lazyhamster/gmime-update

[gmime] Update to version 3.0.5.

5 files changed, 41 insertions, 69 deletions

diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt
index 18ec89518..20c788f7e 100644
--- a/ports/gmime/CMakeLists.txt
+++ b/ports/gmime/CMakeLists.txt
@@ -32,6 +32,7 @@ add_definitions(-DG_LOG_DOMAIN="GMime")
 # List the source files
 set(LIB_SRC gmime/gmime.c
             gmime/gmime-application-pkcs7-mime.c
+            gmime/gmime-autocrypt.c
             gmime/gmime-certificate.c
             gmime/gmime-charset.c
             gmime/gmime-common.c
@@ -97,64 +98,9 @@ set(LIB_SRC gmime/gmime.c
             util/gtrie.c
 )
 
-set (LIB_HEADERS gmime/gmime.h
-                 gmime/gmime-version.h
-                 gmime/gmime-error.h
-                 gmime/gmime-charset.h
-                 gmime/gmime-iconv.h
-                 gmime/gmime-iconv-utils.h
-                 gmime/gmime-param.h
-                 gmime/gmime-content-type.h
-                 gmime/gmime-disposition.h
-                 gmime/gmime-data-wrapper.h
-                 gmime/gmime-object.h
-                 gmime/gmime-part.h
-                 gmime/gmime-text-part.h
-                 gmime/gmime-part-iter.h
-                 gmime/gmime-application-pkcs7-mime.h
-                 gmime/gmime-multipart.h
-                 gmime/gmime-multipart-encrypted.h
-                 gmime/gmime-multipart-signed.h
-                 gmime/gmime-message.h
-                 gmime/gmime-message-part.h
-                 gmime/gmime-message-partial.h
-                 gmime/internet-address.h
-                 gmime/gmime-encodings.h
-                 gmime/gmime-format-options.h
-                 gmime/gmime-parser-options.h
-                 gmime/gmime-parser.h
-                 gmime/gmime-utils.h
-                 gmime/gmime-references.h
-                 gmime/gmime-stream.h
-                 gmime/gmime-stream-buffer.h
-                 gmime/gmime-stream-cat.h
-                 gmime/gmime-stream-file.h
-                 gmime/gmime-stream-filter.h
-                 gmime/gmime-stream-fs.h
-                 gmime/gmime-stream-gio.h
-                 gmime/gmime-stream-mem.h
-                 gmime/gmime-stream-mmap.h
-                 gmime/gmime-stream-null.h
-                 gmime/gmime-stream-pipe.h
-                 gmime/gmime-filter.h
-                 gmime/gmime-filter-basic.h
-                 gmime/gmime-filter-best.h
-                 gmime/gmime-filter-charset.h
-                 gmime/gmime-filter-checksum.h
-                 gmime/gmime-filter-dos2unix.h
-                 gmime/gmime-filter-enriched.h
-                 gmime/gmime-filter-from.h
-                 gmime/gmime-filter-gzip.h
-                 gmime/gmime-filter-html.h
-                 gmime/gmime-filter-smtp-data.h
-                 gmime/gmime-filter-strip.h
-                 gmime/gmime-filter-unix2dos.h
-                 gmime/gmime-filter-windows.h
-                 gmime/gmime-filter-yenc.h
-                 gmime/gmime-crypto-context.h
-                 gmime/gmime-pkcs7-context.h
-                 gmime/gmime-gpg-context.h
-)
+file(GLOB LIB_HEADERS gmime/gmime-*.h)
+list(APPEND LIB_HEADERS gmime/gmime.h)
+list(APPEND LIB_HEADERS gmime/internet-address.h)
 
 if(MSVC AND BUILD_SHARED_LIBS)
     set(MSVC_SRC gmime.def)
diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL
index 215df5995..febce0ebe 100644
--- a/ports/gmime/CONTROL
+++ b/ports/gmime/CONTROL
@@ -1,4 +1,4 @@
 Source: gmime
-Version: 3.0.2
+Version: 3.0.5
 Build-Depends: zlib, glib, libiconv, libidn2
 Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).
diff --git a/ports/gmime/config.h b/ports/gmime/config.h
index 578223e20..a53c1537a 100644
--- a/ports/gmime/config.h
+++ b/ports/gmime/config.h
@@ -8,7 +8,7 @@
 /* #undef ENABLE_WARNINGS */
 
 /* Define to the GMime version */
-#define GMIME_VERSION "3.0.2"
+#define GMIME_VERSION "@LIB_VERSION@"
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
@@ -30,7 +30,7 @@
 #define HAVE_GETOPT_H 1
 
 /* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
+/* #undef HAVE_GETPAGESIZE */
 
 /* Define to 1 to use auto-detected iconv-friendly charset names. */
 /* #undef HAVE_ICONV_DETECT_H */
@@ -117,7 +117,7 @@
 #define PACKAGE_NAME "gmime"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gmime 3.0.2"
+#define PACKAGE_STRING "gmime @LIB_VERSION@"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gmime"
@@ -126,16 +126,16 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.0.2"
+#define PACKAGE_VERSION "@LIB_VERSION@"
 
 /* The size of `off_t', as computed by sizeof. */
-#define SIZEOF_OFF_T 8
+/* #undef SIZEOF_OFF_T */
 
 /* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T 8
+/* #undef SIZEOF_SIZE_T */
 
 /* The size of `ssize_t', as computed by sizeof. */
-#define SIZEOF_SSIZE_T 8
+/* #undef SIZEOF_SSIZE_T */
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
diff --git a/ports/gmime/gmime.def b/ports/gmime/gmime.def
index 463dda27e..b072e0d65 100644
--- a/ports/gmime/gmime.def
+++ b/ports/gmime/gmime.def
@@ -587,3 +587,28 @@ internet_address_mailbox_set_addr
 internet_address_set_charset
 internet_address_set_name
 internet_address_to_string
+g_mime_autocrypt_header_new
+g_mime_autocrypt_header_new_from_string
+g_mime_autocrypt_header_get_address
+g_mime_autocrypt_header_set_address
+g_mime_autocrypt_header_set_address_from_string
+g_mime_autocrypt_header_get_address_as_string
+g_mime_autocrypt_header_get_prefer_encrypt
+g_mime_autocrypt_header_set_prefer_encrypt
+g_mime_autocrypt_header_get_keydata
+g_mime_autocrypt_header_set_keydata
+g_mime_autocrypt_header_get_effective_date
+g_mime_autocrypt_header_set_effective_date
+g_mime_autocrypt_header_is_complete
+g_mime_autocrypt_header_to_string
+g_mime_autocrypt_header_compare
+g_mime_autocrypt_header_clone
+g_mime_autocrypt_header_list_new
+g_mime_autocrypt_header_list_add_missing_addresses
+g_mime_autocrypt_header_list_add
+g_mime_autocrypt_header_list_get_count
+g_mime_autocrypt_header_list_get_header_at
+g_mime_autocrypt_header_list_get_header_for_address
+g_mime_autocrypt_header_list_remove_incomplete
+g_mime_autocrypt_header_get_type
+g_mime_autocrypt_header_list_get_type
diff --git a/ports/gmime/portfile.cmake b/ports/gmime/portfile.cmake
index 1fa50063c..ddfeeb74c 100644
--- a/ports/gmime/portfile.cmake
+++ b/ports/gmime/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)
 
 set(LIB_NAME gmime)
-set(LIB_VERSION 3.0.2)
+set(LIB_VERSION 3.0.5)
 
 set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.xz)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
@@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://download.gnome.org/sources/gmime/3.0/${LIB_FILENAME}"
     FILENAME "${LIB_FILENAME}"
-    SHA512 246f489c168ce7e04fab664b7e9ae7772ae52f0063fb0eac9153460d84fa5d9712457d81fbd1bdcdadb7e03007cf71ed3bad5287f1639214f54167427c9209ca
+    SHA512 658b9008ffdf8055ffa9dfe8a5a6036a487309b0419572a9376397f68a8fc17d36ba6a05d2dfcb2ad23e634dc9e2aedd2479df1bfa0b7f8944d4c294650cb6c8
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -18,7 +18,8 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 # We can use file supplied with original sources
 configure_file(${SOURCE_PATH}/build/vs2010/unistd.h ${SOURCE_PATH} COPYONLY)
 
-configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH} COPYONLY)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH})
+
 configure_file(${CMAKE_CURRENT_LIST_DIR}/idna.h ${SOURCE_PATH} COPYONLY)
 configure_file(${CMAKE_CURRENT_LIST_DIR}/gmime.def ${SOURCE_PATH} COPYONLY)