[Libreoffice-commits] core.git: external/libetonyek external/libwpd external/libwpg

[Libreoffice Gerrit user]

 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 7fc28192864c30ae95b24aceb9cdf7e869dc9dcf
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Jan 7 12:36:19 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jan 7 13:06:31 2019 +0200

    Skip these patches for iOS, too
    
    Change-Id: I2b99cd30b151eaa0302abaa9fdfa92fe8300a4d5

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 9baf6d9fce0d..8d0227b9379d 100644
--- a/external/libwpd/UnpackedTarball_libwpd.mk
+++ b/external/libwpd/UnpackedTarball_libwpd.mk
@@ -22,10 +22,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: