external/redland/UnpackedTarball_raptor.mk | 1 +
external/redland/raptor/raptor-emscripten.patch.1 | 12 ++++++++++++
2 files changed, 13 insertions(+)
New commits:
commit 044cf67f1362088723908747d576aff81cdf4e61
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Jan 12 16:01:00 2023 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Jan 12 17:45:21 2023 +0000
Adapt to newer Emscripten SDK
The check for platform in raptor's sort_r.h no longer worked with
Emscripten 3.1.30. Looking for __EMSCRIPTEN__ explicitly helps.
Change-Id: Ieccf723d809b4e90d44a8a510f71e12bd1d2e529
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145408
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/external/redland/UnpackedTarball_raptor.mk
b/external/redland/UnpackedTarball_raptor.mk
index 619116c3380c..f829f6fb736b 100644
--- a/external/redland/UnpackedTarball_raptor.mk
+++ b/external/redland/UnpackedTarball_raptor.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,raptor,0))
$(eval $(call gb_UnpackedTarball_add_patches,raptor,\
external/redland/raptor/raptor-freebsd.patch.1 \
external/redland/raptor/raptor-msvc.patch.1 \
+ external/redland/raptor/raptor-emscripten.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) \
external/redland/raptor/ubsan.patch \
diff --git a/external/redland/raptor/raptor-emscripten.patch.1
b/external/redland/raptor/raptor-emscripten.patch.1
new file mode 100644
index 000000000000..e3c53b35b7b0
--- /dev/null
+++ b/external/redland/raptor/raptor-emscripten.patch.1
@@ -0,0 +1,12 @@
+-*- Mode: Diff -*-
+--- raptor/src/sort_r.h
++++ raptor/src/sort_r.h
+@@ -27,7 +27,7 @@
+ defined AMIGA)
+ # define _SORT_R_BSD
+ #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
+- defined __linux__ || defined __MINGW32__ || defined __GLIBC__)
++ defined __linux__ || defined __MINGW32__ || defined __GLIBC__ ||
defined __EMSCRIPTEN__)
+ # define _SORT_R_LINUX
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ # define _SORT_R_WINDOWS
