Kaydet (Commit) 5c077d3b authored tarafından Khaled Hosny's avatar Khaled Hosny Kaydeden (comit) David Tardon

fdo#70393: move libvisio to a subdir of external

Change-Id: I8887369a0d355e803e31c52d7358c88d133cf89b
Reviewed-on: https://gerrit.libreoffice.org/6335Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 392726f0
...@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ ...@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmfwk \ jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
librelogo \ librelogo \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \ $(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \ $(call gb_Helper_optional,WPS,libwps) \
......
...@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ ...@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk include $(module_directory)/../../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -9,13 +9,9 @@ ...@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libvisio)) $(eval $(call gb_Module_Module,libvisio))
ifeq ($(SYSTEM_VISIO),NO)
$(eval $(call gb_Module_add_targets,libvisio,\ $(eval $(call gb_Module_add_targets,libvisio,\
ExternalProject_libvisio \ ExternalProject_libvisio \
UnpackedTarball_libvisio \ UnpackedTarball_libvisio \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL))) ...@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,1)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,1))
$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \ external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment