RepositoryExternal.mk | 9 +++++++++
external/libzmf/ExternalProject_libzmf.mk | 2 ++
2 files changed, 11 insertions(+)
New commits:
commit 5955e7bf5e4c8dcc13a7eee383dbc4d6dfcdab0f
Author: David Tardon <dtar...@redhat.com>
Date: Thu Nov 3 13:58:29 2016 +0100
update deps for libzmf
Change-Id: I627b3037d7e2dcecfed496068abf697c3258480d
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f93c819..b3fbeba 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2665,6 +2665,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
+gb_ExternalProject__use_png :=
+
else # !SYSTEM_LIBPNG
define gb_LinkTarget__use_png
@@ -2679,6 +2681,13 @@ $(call gb_LinkTarget__use_zlib,$(1))
endef
+define gb_ExternalProject__use_png
+$(call gb_ExternalProject_use_static_libraries,$(1),\
+ png \
+)
+
+endef
+
endif # !SYSTEM_LIBPNG
diff --git a/external/libzmf/ExternalProject_libzmf.mk
b/external/libzmf/ExternalProject_libzmf.mk
index 87e6693..da720fb 100644
--- a/external/libzmf/ExternalProject_libzmf.mk
+++ b/external/libzmf/ExternalProject_libzmf.mk
@@ -18,7 +18,9 @@ $(eval $(call gb_ExternalProject_register_targets,libzmf,\
$(eval $(call gb_ExternalProject_use_externals,libzmf,\
boost_headers \
icu \
+ png \
revenge \
+ zlib \
))
$(call gb_ExternalProject_get_state_target,libzmf,build) :
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
