diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 22:17:08 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:37:53 +0000 |
| commit | 5c077d3b85f0fab70bc6e78fbc3c307e81f13ad7 (patch) | |
| tree | 0180d89ebf6ced3e49eb8c9d63c1dc71acc8c4f1 | |
| parent | 392726f04252fa3802ade7c31ca65fac57896861 (diff) | |
fdo#70393: move libvisio to a subdir of external
Change-Id: I8887369a0d355e803e31c52d7358c88d133cf89b
Reviewed-on: https://gerrit.libreoffice.org/6335
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch (renamed from libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch) | 0 | ||||
| -rw-r--r-- | external/libvisio/ExternalProject_libvisio.mk (renamed from libvisio/ExternalProject_libvisio.mk) | 0 | ||||
| -rw-r--r-- | external/libvisio/Makefile (renamed from libvisio/Makefile) | 2 | ||||
| -rw-r--r-- | external/libvisio/Module_libvisio.mk (renamed from libvisio/Module_libvisio.mk) | 4 | ||||
| -rw-r--r-- | external/libvisio/README (renamed from libvisio/README) | 0 | ||||
| -rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk (renamed from libvisio/UnpackedTarball_libvisio.mk) | 2 |
8 files changed, 3 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index aa47dfb47284..835e41ee7d7c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ librelogo \ - $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ $(call gb_Helper_optional,WPS,libwps) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 13846f4d7734..2072aac28c1a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,ORCUS,liborcus) \ + $(call gb_Helper_optional,VISIO,libvisio) \ )) # vim: set noet sw=4 ts=4: diff --git a/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch b/external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch index 6c7135f36ea4..6c7135f36ea4 100644 --- a/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch +++ b/external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch diff --git a/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index ea5286bffa6c..ea5286bffa6c 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk diff --git a/libvisio/Makefile b/external/libvisio/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libvisio/Makefile +++ b/external/libvisio/Makefile @@ -2,6 +2,6 @@ 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: diff --git a/libvisio/Module_libvisio.mk b/external/libvisio/Module_libvisio.mk index 9a8159f08489..00b05d25d18d 100644 --- a/libvisio/Module_libvisio.mk +++ b/external/libvisio/Module_libvisio.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libvisio)) -ifeq ($(SYSTEM_VISIO),NO) - $(eval $(call gb_Module_add_targets,libvisio,\ ExternalProject_libvisio \ UnpackedTarball_libvisio \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libvisio/README b/external/libvisio/README index 216fee969d27..216fee969d27 100644 --- a/libvisio/README +++ b/external/libvisio/README diff --git a/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index c2a2000a77b6..4680d78346b5 100644 --- a/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -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_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: |