components/desktop/libreoffice/patches/12-illumos-raptor.patch

   1 --- libreoffice-7.1.8.1/external/redland/UnpackedTarball_raptor.mk.old  2022-03-01 14:16:56.125876607 +0000
   2 +++ libreoffice-7.1.8.1/external/redland/UnpackedTarball_raptor.mk      2022-03-01 14:17:32.716422003 +0000
   3 @@ -21,6 +21,7 @@
   4
   5  $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
   6         external/redland/raptor/raptor-freebsd.patch.1 \
   7 +       external/redland/raptor/raptor-illumos.patch \
   8         external/redland/raptor/raptor-msvc.patch.1 \
   9         $(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
  10         $(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
  11 diff -Naur libreoffice-7.1.8.1/external/redland/raptor.old/raptor-illumos.patch libreoffice-7.1.8.1/external/redland/raptor/raptor-illumos.patch
  12 --- libreoffice-7.1.8.1/external/redland/raptor.old/raptor-illumos.patch        1969-12-31 19:00:00.000000000 +0000
  13 +++ libreoffice-7.1.8.1/external/redland/raptor/raptor-illumos.patch    2022-03-01 14:16:35.011222651 +0000
  14 @@ -0,0 +1,37 @@
  15 +--- src/sort_r.h.orig  2014-10-10 01:00:44.000000000 +0000
  16 ++++ src/sort_r.h       2020-10-11 15:42:02.343998167 +0000
  17 +@@ -31,6 +31,8 @@
  18 + #  define _SORT_R_LINUX
  19 + #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
  20 + #  define _SORT_R_WINDOWS
  21 ++#elif (defined __illumos__)
  22 ++#  define _SORT_R_ILLUMOS
  23 + #else
  24 + #  error Cannot detect operating system
  25 + #endif
  26 +@@ -85,6 +87,7 @@
  27 +     extern void qsort_r(void *base, size_t nel, size_t width,
  28 +                         __compar_d_fn_t __compar, void *arg)
  29 +       __attribute__((nonnull (1, 4)));
  30 ++  #elif defined _SORT_R_ILLUMOS
  31 +
  32 +   #endif
  33 +
  34 +@@ -105,6 +108,10 @@
  35 +       tmp.compar = compar;
  36 +       qsort_r(base, nel, width, &tmp, sort_r_arg_swap);
  37 +
  38 ++    #elif defined _SORT_R_ILLUMOS
  39 ++
  40 ++      qsort_r(base, nel, width, compar, arg);
  41 ++
  42 +     #else /* defined _SORT_R_WINDOWS */
  43 +
  44 +       struct sort_r_data tmp;
  45 +@@ -120,5 +127,6 @@
  46 + #undef _SORT_R_WINDOWS
  47 + #undef _SORT_R_LINUX
  48 + #undef _SORT_R_BSD
  49 ++#undef _SORT_R_ILLUMOS
  50 +
  51 + #endif /* SORT_R_H_ */