external/libetonyek/UnpackedTarball_libetonyek.mk | 2 ++ external/libwpd/UnpackedTarball_libwpd.mk | 2 ++ external/libwpg/UnpackedTarball_libwpg.mk | 2 ++ 3 files changed, 6 insertions(+)
New commits: commit d48b942f3ce9bda4707bde7cc9c8d9feed2d71dc Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Thu Jul 25 14:35:22 2019 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Thu Jul 25 16:19:03 2019 +0200 Skip these patches for iOS, too Change-Id: I18f4531bc78f8abe6e82d0bfb6102e2a8ad48a25 Reviewed-on: https://gerrit.libreoffice.org/76317 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index d64d7e45212b..81685831fb60 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -24,11 +24,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ ifneq ($(OS),MACOSX) ifneq ($(OS),WNT) +ifneq ($(OS),iOS) $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ external/libetonyek/libetonyek-bundled-soname.patch.0 \ )) endif endif +endif ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index ca2afe92b4ed..ca6689043b10 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -23,10 +23,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ ifneq ($(OS),MACOSX) ifneq ($(OS),WNT) +ifneq ($(OS),iOS) $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-bundled-soname.patch.0 \ )) endif endif +endif # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk index f9aa0f6b0996..9ca55c669d72 100644 --- a/external/libwpg/UnpackedTarball_libwpg.mk +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -21,10 +21,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ ifneq ($(OS),MACOSX) ifneq ($(OS),WNT) +ifneq ($(OS),iOS) $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ external/libwpg/libwpg-bundled-soname.patch.0 \ )) endif endif +endif # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits