forked from amazingfate/loongoffice
1c5c31b006
Remove gpgme.git-4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e.patch.1 as it has applied in 1.18.0. * 0001-cpp-Fix-building-with-C-11.patch.1: fixed error "no matching function for call to object of type "(lambda at importresult.cpp:154:71)"". * w32-include.patch: add missing #include <string> (for std::string). * macos-include.patch: add missing #include <algorithm> (for std::any_of). Change-Id: I45f2ef415d80e6ee848699803e971f154812c9c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143039 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
43 lines
817 B
Diff
43 lines
817 B
Diff
--- src/data-fd.c
|
|
+++ src/data-fd.c
|
|
@@ -28,6 +28,9 @@
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
+#if defined HAVE_W32_SYSTEM
|
|
+#include <io.h>
|
|
+#endif
|
|
|
|
#include "debug.h"
|
|
#include "data.h"
|
|
--- src/gpgme-w32spawn.c
|
|
+++ src/gpgme-w32spawn.c
|
|
@@ -36,6 +36,7 @@
|
|
# include <sys/stat.h>
|
|
#endif
|
|
#include <stdint.h>
|
|
+#include <io.h>
|
|
#include <process.h>
|
|
|
|
#include "priv-io.h"
|
|
--- lang/cpp/src/gpgaddexistingsubkeyeditinteractor.h
|
|
+++ lang/cpp/src/gpgaddexistingsubkeyeditinteractor.h
|
|
@@ -27,6 +27,7 @@
|
|
#include "editinteractor.h"
|
|
|
|
#include <memory>
|
|
+#include <string>
|
|
|
|
namespace GpgME
|
|
{
|
|
--- lang/cpp/src/gpgrevokekeyeditinteractor.h
|
|
+++ lang/cpp/src/gpgrevokekeyeditinteractor.h
|
|
@@ -28,6 +28,7 @@
|
|
#include "global.h"
|
|
|
|
#include <memory>
|
|
+#include <string>
|
|
#include <vector>
|
|
|
|
namespace GpgME
|