strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GPGME: upgrade to release 1.23.2

Browse source 
Change-Id: I56c419fbbe615ef57b7d8117ccdc32f0daddf95f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163840
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
This commit is contained in:
Taichi Haradaguchi 2024-02-25 13:42:01 +01:00
parent 86b75e441c
commit c9d3e68481
5 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -282,8 +282,8 @@ GLM_TARBALL := glm-0.9.9.8.zip
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts
GPGME_SHA256SUM := 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 GPGME_SHA256SUM := 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
GPGME_TARBALL := gpgme-1.20.0.tar.bz2 GPGME_TARBALL := gpgme-1.23.2.tar.bz2
# three static lines # three static lines
# so that git cherry-pick # so that git cherry-pick
# will not run into conflicts # will not run into conflicts

4
external/gpgmepp/ExternalPackage_gpgmepp.mk vendored
View file

@ -15,8 +15,8 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.17.0)) $(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.20.1))
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.29.0)) $(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.32.1))
else ifeq ($(OS),MACOSX) else ifeq ($(OS),MACOSX)

1
external/gpgmepp/Library_gpgmepp.mk vendored
View file

@ -72,6 +72,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,gpgmepp,\
UnpackedTarball/gpgmepp/lang/cpp/src/keylistresult \ UnpackedTarball/gpgmepp/lang/cpp/src/keylistresult \
UnpackedTarball/gpgmepp/lang/cpp/src/scdgetinfoassuantransaction \ UnpackedTarball/gpgmepp/lang/cpp/src/scdgetinfoassuantransaction \
UnpackedTarball/gpgmepp/lang/cpp/src/signingresult \ UnpackedTarball/gpgmepp/lang/cpp/src/signingresult \
UnpackedTarball/gpgmepp/lang/cpp/src/statusconsumerassuantransaction \
UnpackedTarball/gpgmepp/lang/cpp/src/swdbresult \ UnpackedTarball/gpgmepp/lang/cpp/src/swdbresult \
UnpackedTarball/gpgmepp/lang/cpp/src/tofuinfo \ UnpackedTarball/gpgmepp/lang/cpp/src/tofuinfo \
UnpackedTarball/gpgmepp/lang/cpp/src/trustitem \ UnpackedTarball/gpgmepp/lang/cpp/src/trustitem \

4
external/gpgmepp/Wincompatible-function-pointer-types.patch vendored
View file

@ -20,8 +20,8 @@
(void)ctx; (void)ctx;
--- src/gpgme-w32spawn.c --- src/gpgme-w32spawn.c
+++ src/gpgme-w32spawn.c +++ src/gpgme-w32spawn.c
@@ -243,7 +243,7 @@ @@ -24,7 +249,7 @@
handle = LoadLibrary ("user32.dll"); handle = LoadLibraryA ("user32.dll");
if (handle) if (handle)
{ {
- func = GetProcAddress (handle, "AllowSetForegroundWindow"); - func = GetProcAddress (handle, "AllowSetForegroundWindow");

19
external/gpgmepp/w32-build-fixes.patch.1 vendored
View file

@ -24,6 +24,19 @@ diff -ru gpgme.orig/src/dirinfo.c gpgme/src/dirinfo.c
/* Constants used internally to select the data. */ /* Constants used internally to select the data. */
enum enum
{ {
diff -ru gpgme.orig/src/gpgme-w32spawn.c gpgme/src/gpgme-w32spawn.c
--- gpgme.orig/src/gpgme-w32spawn.c 2023-10-27 21:27:30.000000000 +0900
+++ gpgme/src/gpgme-w32spawn.c 2024-02-26 17:32:59.949338645 +0900
@@ -52,6 +52,9 @@
#define mystderr stderr
#endif
+#ifdef _MSC_VER
+#define snwprintf _snwprintf
+#endif
static wchar_t *
diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c diff -ru gpgme.orig/src/mbox-util.c gpgme/src/mbox-util.c
--- gpgme.orig/src/mbox-util.c 2016-11-16 13:22:41.000000000 +0100 --- gpgme.orig/src/mbox-util.c 2016-11-16 13:22:41.000000000 +0100
+++ gpgme/src/mbox-util.c 2017-09-30 08:18:29.270567500 +0200 +++ gpgme/src/mbox-util.c 2017-09-30 08:18:29.270567500 +0200
@ -53,16 +66,16 @@ diff -ru gpgme.orig/src/priv-io.h gpgme/src/priv-io.h
diff -ru gpgme.orig/src/util.h gpgme/src/util.h diff -ru gpgme.orig/src/util.h gpgme/src/util.h
--- gpgme.orig/src/util.h 2017-03-28 11:41:30.000000000 +0200 --- gpgme.orig/src/util.h 2017-03-28 11:41:30.000000000 +0200
+++ gpgme/src/util.h 2017-09-30 08:10:54.194049100 +0200 +++ gpgme/src/util.h 2017-09-30 08:10:54.194049100 +0200
@@ -35,6 +35,9 @@ @@ -36,6 +36,9 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
#include <stdint.h>
+#ifdef _MSC_VER +#ifdef _MSC_VER
+typedef int pid_t; +typedef int pid_t;
+#endif +#endif
#include "gpgme.h"
#include "gpgme.h"
diff -ru gpgme.orig/src/w32-util.c gpgme/src/w32-util.c diff -ru gpgme.orig/src/w32-util.c gpgme/src/w32-util.c
--- gpgme.orig/src/w32-util.c 2017-03-09 09:01:10.000000000 +0100 --- gpgme.orig/src/w32-util.c 2017-03-09 09:01:10.000000000 +0100
+++ gpgme/src/w32-util.c 2017-09-30 08:32:02.114330500 +0200 +++ gpgme/src/w32-util.c 2017-09-30 08:32:02.114330500 +0200