libreoffice: update to 7.5.4.2

iigs

2023-06-21 3a54eb1c3bdf5ef3b00f2ebd2d8889535a78f7de

libreoffice: update to 7.5.4.2

 components/desktop/libreoffice/Makefile

@@ -18,17 +18,16 @@
BITS=64

COMPONENT_NAME=         libreoffice
COMPONENT_VERSION=      7.5.1
COMPONENT_VERSION=      7.5.4
COMPONENT_RC_VERSION=    2
COMPONENT_FULL_VERSION=$(COMPONENT_VERSION).$(COMPONENT_RC_VERSION)
COMPONENT_REVISION=        1
COMPONENT_SUMMARY=      LibreOffice is a powerful office suite
COMPONENT_PROJECT_URL=  https://www.libreoffice.org/
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_FULL_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_URL=  https://download.documentfoundation.org/libreoffice/src/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_ARCHIVE_HASH= sha256:6deaf83a0c2b83c5c8c53c2a9443e2ece51e19469494be2027d4fef3a61bc6a2
COMPONENT_ARCHIVE_HASH= sha256:4f2dbe571e2116ce11df71d72b4ae03f7a3ca82c72578c1724afb3bd26d38d08
COMPONENT_FMRI=         desktop/office/libreoffice
COMPONENT_CLASSIFICATION= Applications/Office
COMPONENT_LICENSE=      MPL2.0
@@ -58,60 +57,60 @@
COMPONENT_ARCHIVE_HASH_6 = sha256:f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
COMPONENT_ARCHIVE_URL_6 = https://dev-www.libreoffice.org/extern/$(COMPONENT_ARCHIVE_6)

#COMPONENT_ARCHIVE_7 = a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
#COMPONENT_ARCHIVE_HASH_7 = sha256:fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
#COMPONENT_ARCHIVE_URL_7 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_7)
COMPONENT_ARCHIVE_7 = mariadb-connector-c-3.1.8-src.tar.gz
COMPONENT_ARCHIVE_HASH_7 = sha256:431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
COMPONENT_ARCHIVE_URL_7 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_7)

COMPONENT_ARCHIVE_8 = raptor2-2.0.15-patched.tar.bz2
COMPONENT_ARCHIVE_HASH_8 = sha256:e0a4bbe6421c115fba4684f6fa009541ed041f64fca609569967805831b0a9db
COMPONENT_ARCHIVE_URL_8 = http://dlc.openindiana.org/oi-userland/source-archives/$(COMPONENT_ARCHIVE_8)
COMPONENT_ARCHIVE_8 = a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
COMPONENT_ARCHIVE_HASH_8 = sha256:ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
COMPONENT_ARCHIVE_URL_8 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_8)

COMPONENT_ARCHIVE_9 = a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
COMPONENT_ARCHIVE_HASH_9 = sha256:1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
COMPONENT_ARCHIVE_9 = mythes-1.2.5.tar.xz
COMPONENT_ARCHIVE_HASH_9 = sha256:19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d
COMPONENT_ARCHIVE_URL_9 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_9)

COMPONENT_ARCHIVE_10 = bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
COMPONENT_ARCHIVE_HASH_10 = sha256:d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
COMPONENT_ARCHIVE_10 = glm-0.9.9.8.zip 
COMPONENT_ARCHIVE_HASH_10 = sha256:6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
COMPONENT_ARCHIVE_URL_10 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_10)

COMPONENT_ARCHIVE_11 = CoinMP-1.7.6.tgz
COMPONENT_ARCHIVE_HASH_11 = sha256:86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
COMPONENT_ARCHIVE_11 = CoinMP-1.8.4.tgz
COMPONENT_ARCHIVE_HASH_11 = sha256:3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d
COMPONENT_ARCHIVE_URL_11 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_11)

COMPONENT_ARCHIVE_12 = e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
COMPONENT_ARCHIVE_HASH_12 = sha256:de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
COMPONENT_ARCHIVE_URL_12 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_12)

COMPONENT_ARCHIVE_13 = language-subtag-registry-2019-09-16.tar.bz2
COMPONENT_ARCHIVE_HASH_13 = sha256:07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a
COMPONENT_ARCHIVE_13 = language-subtag-registry-2022-08-08.tar.bz2
COMPONENT_ARCHIVE_HASH_13 = sha256:e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
COMPONENT_ARCHIVE_URL_13 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_13)

COMPONENT_ARCHIVE_14 = libexttextcat-3.4.5.tar.xz
COMPONENT_ARCHIVE_HASH_14 = sha256:13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
COMPONENT_ARCHIVE_14 = libexttextcat-3.4.6.tar.xz
COMPONENT_ARCHIVE_HASH_14 = sha256:6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df
COMPONENT_ARCHIVE_URL_14 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_14)

COMPONENT_ARCHIVE_15 = libnumbertext-1.0.7.tar.xz
COMPONENT_ARCHIVE_HASH_15 = sha256:17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc
COMPONENT_ARCHIVE_15 = libnumbertext-1.0.11.tar.xz
COMPONENT_ARCHIVE_HASH_15 = sha256:5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0
COMPONENT_ARCHIVE_URL_15 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_15)

COMPONENT_ARCHIVE_16 = liborcus-0.16.1.tar.bz2
COMPONENT_ARCHIVE_HASH_16 = sha256:c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4
COMPONENT_ARCHIVE_16 = liborcus-0.18.1.tar.xz
COMPONENT_ARCHIVE_HASH_16 = sha256:6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb
COMPONENT_ARCHIVE_URL_16 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_16)

COMPONENT_ARCHIVE_17 = QR-Code-generator-1.4.0.tar.gz
COMPONENT_ARCHIVE_HASH_17 = sha256:fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
COMPONENT_ARCHIVE_URL_17 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_17)

COMPONENT_ARCHIVE_18 = xmlsec1-1.2.32.tar.gz
COMPONENT_ARCHIVE_HASH_18 = sha256:e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043
COMPONENT_ARCHIVE_18 = xmlsec1-1.3.1.tar.gz
COMPONENT_ARCHIVE_HASH_18 = sha256:605e2b2fbe4301ad859d4cabf5dff61212b14f51e1f700601954612a956ed2ad
COMPONENT_ARCHIVE_URL_18 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_18)

COMPONENT_ARCHIVE_19 = libreoffice-translations-$(COMPONENT_FULL_VERSION).tar.xz
COMPONENT_ARCHIVE_HASH_19 = sha256:a3fc9e7b6a8b3cbc853d5bc52cacac773737ec33a2fb4c0a62e08faf1b29b91a
COMPONENT_ARCHIVE_HASH_19 = sha256:7eb264c2cd66f028831535bec0d3fcdfb687fae4deb77d200cfe4034ca3a10ad
COMPONENT_ARCHIVE_URL_19 = https://download.documentfoundation.org/libreoffice/src/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE_19)

COMPONENT_ARCHIVE_20 = libreoffice-dictionaries-$(COMPONENT_FULL_VERSION).tar.xz
COMPONENT_ARCHIVE_HASH_20 = sha256:0e4e3d6388f9849d91afedac6126e1583c3a809cc28d095c909bf36eb82fd93a
COMPONENT_ARCHIVE_HASH_20 = sha256:4f2dbe571e2116ce11df71d72b4ae03f7a3ca82c72578c1724afb3bd26d38d08
COMPONENT_ARCHIVE_URL_20 = https://download.documentfoundation.org/libreoffice/src/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE_20)

#COMPONENT_ARCHIVE_21 = boost_1_69_0.tar.bz2
@@ -122,12 +121,12 @@
COMPONENT_ARCHIVE_HASH_22 = sha256:cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
COMPONENT_ARCHIVE_URL_22 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_22)

COMPONENT_ARCHIVE_23 = zxing-cpp-1.1.1.tar.gz
COMPONENT_ARCHIVE_HASH_23 = sha256:e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86
COMPONENT_ARCHIVE_23 = zxing-cpp-2.0.0.tar.gz
COMPONENT_ARCHIVE_HASH_23 = sha256:12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76
COMPONENT_ARCHIVE_URL_23 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_23)

COMPONENT_ARCHIVE_24 = box2d-2.3.1.tar.gz
COMPONENT_ARCHIVE_HASH_24 = sha256:58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
COMPONENT_ARCHIVE_24 = box2d-2.4.1.tar.gz
COMPONENT_ARCHIVE_HASH_24 = sha256:d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
COMPONENT_ARCHIVE_URL_24 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_24)


@@ -135,33 +134,27 @@
COMPONENT_ARCHIVE_HASH_25 = sha256:0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
COMPONENT_ARCHIVE_URL_25 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_25)

COMPONENT_ARCHIVE_26 = glm-0.9.9.7.zip
COMPONENT_ARCHIVE_HASH_26 = sha256:c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95
COMPONENT_ARCHIVE_26 = skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz
COMPONENT_ARCHIVE_HASH_26 = sha256:0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9
COMPONENT_ARCHIVE_URL_26 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_26)


COMPONENT_ARCHIVE_27 = skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
COMPONENT_ARCHIVE_HASH_27 = sha256:abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
COMPONENT_ARCHIVE_27 = libcmis-0.5.2.tar.xz
COMPONENT_ARCHIVE_HASH_27 = sha256:d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
COMPONENT_ARCHIVE_URL_27 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_27)

COMPONENT_ARCHIVE_28 = libcmis-0.5.2.tar.xz
COMPONENT_ARCHIVE_HASH_28 = sha256:d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
COMPONENT_ARCHIVE_28 = gpgme-1.18.0.tar.bz2
COMPONENT_ARCHIVE_HASH_28 = sha256:361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
COMPONENT_ARCHIVE_URL_28 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_28)

COMPONENT_ARCHIVE_29 = gpgme-1.13.1.tar.bz2
COMPONENT_ARCHIVE_HASH_29 = sha256:c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
COMPONENT_ARCHIVE_29 = libassuan-2.5.5.tar.bz2
COMPONENT_ARCHIVE_HASH_29 = sha256:8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
COMPONENT_ARCHIVE_URL_29 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_29)

COMPONENT_ARCHIVE_30 = libassuan-2.5.3.tar.bz2
COMPONENT_ARCHIVE_HASH_30 = sha256:91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702
COMPONENT_ARCHIVE_30 = libgpg-error-1.46.tar.bz2
COMPONENT_ARCHIVE_HASH_30 = sha256:b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d
COMPONENT_ARCHIVE_URL_30 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_30)

COMPONENT_ARCHIVE_31 = libgpg-error-1.37.tar.bz2
COMPONENT_ARCHIVE_HASH_31 = sha256:b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763
COMPONENT_ARCHIVE_URL_31 = https://dev-www.libreoffice.org/src/$(COMPONENT_ARCHIVE_31)
# ignore archive 7 (mariadb client)
# ignore archive 21 (boost)
NUM_EXTRA_ARCHIVES = $(shell seq 1 6) $(shell 8 20) $(shell 22 31)
NUM_EXTRA_ARCHIVES = $(shell seq 1 20) $(shell 22 30)

include $(WS_MAKE_RULES)/common.mk


 components/desktop/libreoffice/libreoffice.p5m

@@ -53,13 +53,9 @@
<transform file path=usr/lib/$(MACH64)/libreoffice/program/uri-encode -> default mode 0555>
<transform file path=usr/lib/$(MACH64)/libreoffice/program/xpdfimport -> default mode 0555>

# customize these two lines from sample-manifest by adding mode=0555
# sample-manifest files and links copied below:
link path=usr/bin/libreoffice \
    target=../lib/$(MACH64)/libreoffice/program/soffice mode=0555
link path=usr/bin/soffice target=../lib/$(MACH64)/libreoffice/program/soffice mode=0555

# rest of sample-manifest is below

    target=/usr/lib/$(MACH64)/libreoffice/program/soffice
file path=usr/bin/lobase
file path=usr/bin/localc
file path=usr/bin/lodraw
@@ -69,7 +65,7 @@
file path=usr/bin/lomath
file path=usr/bin/loweb
file path=usr/bin/lowriter
#link path=usr/bin/soffice target=/usr/lib/$(MACH64)/libreoffice/program/soffice
link path=usr/bin/soffice target=/usr/lib/$(MACH64)/libreoffice/program/soffice
file path=usr/bin/unopkg
file path=usr/lib/$(MACH64)/libreoffice/CREDITS.fodt
file path=usr/lib/$(MACH64)/libreoffice/LICENSE
@@ -4855,6 +4851,8 @@
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sifr_dark_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sifr_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura_dark.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura_dark_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/soffice.cfg/cui/ui/aboutconfigdialog.ui
file path=usr/lib/$(MACH64)/libreoffice/share/config/soffice.cfg/cui/ui/aboutconfigvaluedialog.ui

 components/desktop/libreoffice/manifests/sample-manifest.p5m

@@ -4820,6 +4820,8 @@
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sifr_dark_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sifr_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura_dark.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura_dark_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/images_sukapura_svg.zip
file path=usr/lib/$(MACH64)/libreoffice/share/config/soffice.cfg/cui/ui/aboutconfigdialog.ui
file path=usr/lib/$(MACH64)/libreoffice/share/config/soffice.cfg/cui/ui/aboutconfigvaluedialog.ui

 components/desktop/libreoffice/patches/12-change-download.patch

File was deleted

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

New file
@@ -0,0 +1,51 @@
--- libreoffice-7.1.8.1/external/redland/UnpackedTarball_raptor.mk.old    2022-03-01 14:16:56.125876607 +0000
+++ libreoffice-7.1.8.1/external/redland/UnpackedTarball_raptor.mk    2022-03-01 14:17:32.716422003 +0000
@@ -21,6 +21,7 @@
 
 $(eval $(call gb_UnpackedTarball_add_patches,raptor,\
     external/redland/raptor/raptor-freebsd.patch.1 \
+    external/redland/raptor/raptor-illumos.patch \
     external/redland/raptor/raptor-msvc.patch.1 \
     $(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \
     $(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \
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
--- libreoffice-7.1.8.1/external/redland/raptor.old/raptor-illumos.patch    1969-12-31 19:00:00.000000000 +0000
+++ libreoffice-7.1.8.1/external/redland/raptor/raptor-illumos.patch    2022-03-01 14:16:35.011222651 +0000
@@ -0,0 +1,37 @@
+--- src/sort_r.h.orig    2014-10-10 01:00:44.000000000 +0000
++++ src/sort_r.h    2020-10-11 15:42:02.343998167 +0000
+@@ -31,6 +31,8 @@
+ #  define _SORT_R_LINUX
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ #  define _SORT_R_WINDOWS
++#elif (defined __illumos__)
++#  define _SORT_R_ILLUMOS
+ #else
+ #  error Cannot detect operating system
+ #endif
+@@ -85,6 +87,7 @@
+     extern void qsort_r(void *base, size_t nel, size_t width,
+                         __compar_d_fn_t __compar, void *arg)
+       __attribute__((nonnull (1, 4)));
++  #elif defined _SORT_R_ILLUMOS
+ 
+   #endif
+ 
+@@ -105,6 +108,10 @@
+       tmp.compar = compar;
+       qsort_r(base, nel, width, &tmp, sort_r_arg_swap);
+ 
++    #elif defined _SORT_R_ILLUMOS
++
++      qsort_r(base, nel, width, compar, arg);
++
+     #else /* defined _SORT_R_WINDOWS */
+ 
+       struct sort_r_data tmp;
+@@ -120,5 +127,6 @@
+ #undef _SORT_R_WINDOWS
+ #undef _SORT_R_LINUX
+ #undef _SORT_R_BSD
++#undef _SORT_R_ILLUMOS
+ 
+ #endif /* SORT_R_H_ */

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

New file
@@ -0,0 +1,54 @@
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
--- libreoffice-7.1.8.1/external/mariadb-connector-c.old/01-fix-size_socket.patch    1969-12-31 19:00:00.000000000 +0000
+++ libreoffice-7.1.8.1/external/mariadb-connector-c/01-fix-size_socket.patch    2022-03-01 15:08:54.663929944 +0000
@@ -0,0 +1,14 @@
+--- include/ma_global.h.old    2022-01-13 11:29:56.408961936 +0000
++++ include/ma_global.h    2022-01-13 11:31:03.461998277 +0000
+@@ -353,7 +353,11 @@
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
++#ifdef _SOCKLEN_T
++#define size_socket socklen_t   /* Type of last arg to accept */
++#else
+ typedef SOCKET_SIZE_TYPE size_socket;
++#endif
+ 
+ #ifndef SOCKOPT_OPTLEN_TYPE
+ #define SOCKOPT_OPTLEN_TYPE size_socket
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
--- libreoffice-7.1.8.1/external/mariadb-connector-c.old/02-cfi-issue.patch    1969-12-31 19:00:00.000000000 +0000
+++ libreoffice-7.1.8.1/external/mariadb-connector-c/02-cfi-issue.patch    2022-03-01 15:09:07.718708982 +0000
@@ -0,0 +1,20 @@
+--- libmariadb/ma_context.c.old    2022-01-13 11:40:47.480970827 +0000
++++ libmariadb/ma_context.c    2022-01-13 11:41:19.570077161 +0000
+@@ -202,7 +202,7 @@
+     (
+      "movq %%rsp, (%[save])\n\t"
+      "movq %[stack], %%rsp\n\t"
+-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
++#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER) && !defined(__sun)
+      /*
+        This emits a DWARF DW_CFA_undefined directive to make the return address
+        undefined. This indicates that this is the top of the stack frame, and
+@@ -441,7 +441,7 @@
+     (
+      "movl %%esp, (%[save])\n\t"
+      "movl %[stack], %%esp\n\t"
+-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER)
++#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER) && !defined(__sun)
+      /*
+        This emits a DWARF DW_CFA_undefined directive to make the return address
+        undefined. This indicates that this is the top of the stack frame, and
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
--- libreoffice-7.1.8.1/external/mariadb-connector-c.old/UnpackedTarball_mariadb-connector-c.mk    2021-12-03 16:40:28.000000000 +0000
+++ libreoffice-7.1.8.1/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk    2022-03-01 15:11:50.027548105 +0000
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb-connector-c,\
     external/mariadb-connector-c/clang-cl.patch.0 \
+    external/mariadb-connector-c/01-fix-size_socket.patch \
+    external/mariadb-connector-c/02-cfi-issue.patch \
 ))
 
 # TODO are any "plugins" needed?

 components/desktop/libreoffice/patches/18-show-illumos-version-in-about.patch

New file
@@ -0,0 +1,20 @@
--- libreoffice-7.5.3.1/vcl/unx/generic/app/geninst.cxx.old    2023-04-22 20:44:29.692052052 -0400
+++ libreoffice-7.5.3.1/vcl/unx/generic/app/geninst.cxx    2023-04-22 20:45:58.686866426 -0400
@@ -22,7 +22,7 @@
 #if defined(LINUX)
 #  include <stdio.h>
 #endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__illumos__)
 #  include <sys/utsname.h>
 #endif
 
@@ -72,7 +72,7 @@
         }
         fclose( pVersion );
     }
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__illumos__)
     struct utsname stName;
     if ( uname( &stName ) != 0 )
         return aKernelVer;

 components/desktop/libreoffice/patches/19-skia-libs-solaris.patch

New file
@@ -0,0 +1,11 @@
--- libreoffice-7.5.3.1/external/skia/Library_skia.mk.old    2023-04-22 20:48:42.387319778 -0400
+++ libreoffice-7.5.3.1/external/skia/Library_skia.mk    2023-04-22 20:49:54.180660732 -0400
@@ -96,7 +96,7 @@
     libpng \
 ))
 
-ifeq ($(OS),LINUX)
+ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,skia,\
     -lm \
     -ldl \

 components/desktop/libreoffice/test/results-all.master

Diff too large