ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity
518,738 Commits 3 Branches 3 Tags
2c87d392dc03dd251cdf94de6a8bdee464c78eaa
Commit Graph
3 Commits
Author SHA1 Message Date
Taichi Haradaguchi c9d3e68481 GPGME: upgrade to release 1.23.2 
Change-Id: I56c419fbbe615ef57b7d8117ccdc32f0daddf95f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163840
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
 2024-02-27 14:03:51 +01:00
Taichi Haradaguchi 1c5c31b006 gpgme: upgrade to release 1.18.0 
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>
 2022-12-15 15:19:54 +00:00
Stephan Bergmann 90b25330a2 external/gpgmepp: Fix various -Wincompatible-function-pointer-types 
...after Clang 16 trunk
<https://github.com/llvm/llvm-project/commit/af01f717c48f0fd2481600ed6c00441763365b62>
"Default implicit function pointer conversions diagnostic to be an error".  The
changes in workdir/UnpackedTarball/gpgmepp/src/assuan-support.c are due to the
difference between ssize_t as used by

>   ssize_t (*read) (assuan_context_t ctx, assuan_fd_t fd, void *buffer,
> 		   size_t size);
>   ssize_t (*write) (assuan_context_t ctx, assuan_fd_t fd,
> 		    const void *buffer, size_t size);

in workdir/UnpackedTarball/libassuan/src/assuan.h and gpgme_ssize_t as defined
by

> #ifdef _WIN64
> # include <stdint.h>
>   typedef int64_t gpgme_off_t;
>   typedef int64_t gpgme_ssize_t;
> #else /* _WIN32 */
>   typedef long gpgme_off_t;
>   typedef long gpgme_ssize_t;
> #endif /* _WIN32 */

in workdir/UnpackedTarball/gpgmepp/src/gpgme.h:

> assuan-support.c(353,5): error: incompatible function pointer types initializing 'ssize_t (*)(assuan_context_t, assuan_fd_t, void *, size_t)' (aka 'long (*)(struct assuan_context_s *, void *, void *, unsigned long long)') with an expression of type 'gpgme_ssize_t (assuan_context_t, assuan_fd_t, void *, size_t)' (aka 'long long (struct assuan_context_s *, void *, void *, unsigned long long)') [-Wincompatible-function-pointer-types]
>     my_read,
>     ^~~~~~~
> assuan-support.c(354,5): error: incompatible function pointer types initializing 'ssize_t (*)(assuan_context_t, assuan_fd_t, const void *, size_t)' (aka 'long (*)(struct assuan_context_s *, void *, const void *, unsigned long long)') with an expression of type 'gpgme_ssize_t (assuan_context_t, assuan_fd_t, const void *, size_t)' (aka 'long long (struct assuan_context_s *, void *, const void *, unsigned long long)') [-Wincompatible-function-pointer-types]
>     my_write,
>     ^~~~~~~~

Change-Id: I71f34da1a14421335a9416dd500a91d94de2f48a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140097
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
 2022-09-17 14:32:56 +02:00