components/desktop/libreoffice/patches/17-OI-mariadb-connector-c.patch

   1 diff -Naur libreoffice-7.1.8.1/external/mariadb-connector-c.old/01-fix-size_socket.patch libreoffice-7.1.8.1/external/mariadb-connector-c/01-fix-size_socket.patch
   2 --- libreoffice-7.1.8.1/external/mariadb-connector-c.old/01-fix-size_socket.patch       1969-12-31 19:00:00.000000000 +0000
   3 +++ libreoffice-7.1.8.1/external/mariadb-connector-c/01-fix-size_socket.patch   2022-03-01 15:08:54.663929944 +0000
   4 @@ -0,0 +1,14 @@
   5 +--- include/ma_global.h.old    2022-01-13 11:29:56.408961936 +0000
   6 ++++ include/ma_global.h        2022-01-13 11:31:03.461998277 +0000
   7 +@@ -353,7 +353,11 @@
   8 + #ifdef HAVE_SYS_SOCKET_H
   9 + #include <sys/socket.h>
  10 + #endif
  11 ++#ifdef _SOCKLEN_T
  12 ++#define size_socket socklen_t   /* Type of last arg to accept */
  13 ++#else
  14 + typedef SOCKET_SIZE_TYPE size_socket;
  15 ++#endif
  16 +
  17 + #ifndef SOCKOPT_OPTLEN_TYPE
  18 + #define SOCKOPT_OPTLEN_TYPE size_socket
  19 diff -Naur libreoffice-7.1.8.1/external/mariadb-connector-c.old/02-cfi-issue.patch libreoffice-7.1.8.1/external/mariadb-connector-c/02-cfi-issue.patch
  20 --- libreoffice-7.1.8.1/external/mariadb-connector-c.old/02-cfi-issue.patch     1969-12-31 19:00:00.000000000 +0000
  21 +++ libreoffice-7.1.8.1/external/mariadb-connector-c/02-cfi-issue.patch 2022-03-01 15:09:07.718708982 +0000
  22 @@ -0,0 +1,20 @@
  23 +--- libmariadb/ma_context.c.old        2022-01-13 11:40:47.480970827 +0000
  24 ++++ libmariadb/ma_context.c    2022-01-13 11:41:19.570077161 +0000
  25 +@@ -202,7 +202,7 @@
  26 +     (
  27 +      "movq %%rsp, (%[save])\n\t"
  28 +      "movq %[stack], %%rsp\n\t"
  29 +-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
  30 ++#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER) && !defined(__sun)
  31 +      /*
  32 +        This emits a DWARF DW_CFA_undefined directive to make the return address
  33 +        undefined. This indicates that this is the top of the stack frame, and
  34 +@@ -441,7 +441,7 @@
  35 +     (
  36 +      "movl %%esp, (%[save])\n\t"
  37 +      "movl %[stack], %%esp\n\t"
  38 +-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
  39 ++#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER) && !defined(__sun)
  40 +      /*
  41 +        This emits a DWARF DW_CFA_undefined directive to make the return address
  42 +        undefined. This indicates that this is the top of the stack frame, and
  43 diff -Naur libreoffice-7.1.8.1/external/mariadb-connector-c.old/UnpackedTarball_mariadb-connector-c.mk libreoffice-7.1.8.1/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
  44 --- libreoffice-7.1.8.1/external/mariadb-connector-c.old/UnpackedTarball_mariadb-connector-c.mk 2021-12-03 16:40:28.000000000 +0000
  45 +++ libreoffice-7.1.8.1/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk     2022-03-01 15:11:50.027548105 +0000
  46 @@ -27,6 +27,8 @@
  47
  48  $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
  49      external/mariadb-connector-c/clang-cl.patch.0 \
  50 +    external/mariadb-connector-c/01-fix-size_socket.patch \
  51 +    external/mariadb-connector-c/02-cfi-issue.patch \
  52  ))
  53
  54  # TODO are any "plugins" needed?