external/gpgmepp/w32-build-fixes.patch.1 | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 6838fbbc5c52ae001dbffcffb8e86922ece02cd8
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Jun 27 17:04:33 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Jun 27 22:10:44 2023 +0200
Fix gpgme build on Windows
Commit 97c67afac1ec9351d0a64011a7ddfb7dfa876484 (Update gpgme to 1.20.0,
2023-06-23) defined ssize_t in external/gpgmepp/w32-build-fixes.patch.1.
It was done to address the use of ssize_t in src/debug.h, appeared in
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=7d1159c1e99bb1bae0ab698c85105dcdcb95b7ea
This led to build errors like
C:\cygwin\home\tdf\lode\jenkins\workspace\lo_tb_master_win64_dbg\workdir\UnpackedTarball\gpgmepp\src\debug.h(26):
error C2371: 'ssize_t': redefinition; different basic types
C:\cygwin\home\tdf\lode\jenkins\workspace\lo_tb_master_win64_dbg\workdir\UnpackedTarball\libassuan\src\assuan.h(47):
note: see declaration of 'ssize_t'
To fix it locally, just revert the problematic patch, until fixed upstream.
Change-Id: Ib89496cc08b0ce6d24d5c9e9c7e615c6909d071b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153671
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/external/gpgmepp/w32-build-fixes.patch.1
b/external/gpgmepp/w32-build-fixes.patch.1
index b96bb62e8fde..4d9428781cc5 100644
--- a/external/gpgmepp/w32-build-fixes.patch.1
+++ b/external/gpgmepp/w32-build-fixes.patch.1
@@ -1,17 +1,15 @@
diff -ru gpgme.orig/src/debug.h gpgme/src/debug.h
---- gpgme.orig/src/debug.h 2023-04-17 22:09:48.000000000 +0900
-+++ gpgme/src/debug.h 2023-06-25 20:43:29.267407815 +0900
-@@ -21,6 +21,10 @@
- #ifndef DEBUG_H
- #define DEBUG_H
-
-+#ifdef _MSC_VER
-+#include <BaseTsd.h>
-+typedef SSIZE_T ssize_t;
-+#endif
- #include <string.h>
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
+--- gpgme.orig/src/debug.h
++++ gpgme/src/debug.h
+@@ -180,7 +180,7 @@ static inline gpgme_ssize_t
+ _trace_sysres_ssize_t (gpgme_ssize_t res, int lvl, const char *func, int line)
+ {
+ if (res >= 0)
+- _gpgme_debug (NULL, lvl, 3, func, NULL, NULL, "result=%zd", (ssize_t)res);
++ _gpgme_debug (NULL, lvl, 3, func, NULL, NULL, "result=%zd", res);
+ else
+ _gpgme_debug (NULL, lvl, -1, NULL, NULL, NULL,
+ "%s:%d: error: %s (%d)\n",
diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
--- gpgme.orig/src/dirinfo.c 2017-03-21 11:09:41.000000000 +0100
+++ gpgme/src/dirinfo.c 2017-09-30 08:36:13.239279300 +0200
