[Libreoffice-commits] core.git: external/libgpg-error

[Libreoffice Gerrit user]

 external/libgpg-error/UnpackedTarball_libgpg-error.mk |    2 ++
 external/libgpg-error/clang-cl.patch                  |   11 +++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit cd202a1cdb73fee4be460f07bb36154ee4e945f0
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Feb 1 15:59:29 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 1 19:03:50 2019 +0100

    Missing extern in external/libgpg-error (clang-cl)
    
    Change-Id: I31f2ae004dac16aee05b258984e50795db2582cc
    Reviewed-on: https://gerrit.libreoffice.org/67250
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index 753f29716e2f..392bc26b640d 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL)
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgpg-error,0))
 
+# clang-cl.patch src/gpgrt-int.h part upstream at <https://dev.gnupg.org/T4356> "Declaration of
+#  _gpgrt_functions_w32_pollable in src/gpgrt-int.h should be extern"
 $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes.patch) \
 	$(if $(filter MSC,$(COM)),external/libgpg-error/w32-build-fixes-2.patch.1) \
diff --git a/external/libgpg-error/clang-cl.patch b/external/libgpg-error/clang-cl.patch
index d98a948bdf59..ef1447fb61d9 100644
--- a/external/libgpg-error/clang-cl.patch
+++ b/external/libgpg-error/clang-cl.patch
@@ -9,3 +9,14 @@
  # define _GPG_ERR_GCC_VERSION (__GNUC__ * 10000 \
                                 + __GNUC_MINOR__ * 100 \
                                 + __GNUC_PATCHLEVEL__)
+--- src/gpgrt-int.h
++++ src/gpgrt-int.h
+@@ -359,7 +359,7 @@
+ 
+ #if _WIN32
+ /* Prototypes for w32-estream.c.  */
+-struct cookie_io_functions_s _gpgrt_functions_w32_pollable;
++extern struct cookie_io_functions_s _gpgrt_functions_w32_pollable;
+ int _gpgrt_w32_pollable_create (void *_GPGRT__RESTRICT *_GPGRT__RESTRICT cookie,
+                                 unsigned int modeflags,
+                                 struct cookie_io_functions_s next_functions,