[Libreoffice-commits] core.git: external/libvisio external/Module_external.mk libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch libvisio/ExternalProject_libvisio.mk libvisio/Makefile libvisio/Module_libvisio.mk libvisio/README libvisio/UnpackedTarball_libvisio.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                                                  |    1 
 external/Module_external.mk                                               |    1 
 external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch |   26 +++++
 external/libvisio/ExternalProject_libvisio.mk                             |   45 ++++++++++
 external/libvisio/Makefile                                                |    7 +
 external/libvisio/Module_libvisio.mk                                      |   17 +++
 external/libvisio/README                                                  |    4 
 external/libvisio/UnpackedTarball_libvisio.mk                             |   20 ++++
 libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch          |   26 -----
 libvisio/ExternalProject_libvisio.mk                                      |   45 ----------
 libvisio/Makefile                                                         |    7 -
 libvisio/Module_libvisio.mk                                               |   21 ----
 libvisio/README                                                           |    4 
 libvisio/UnpackedTarball_libvisio.mk                                      |   20 ----
 14 files changed, 120 insertions(+), 124 deletions(-)

New commits:
commit 5c077d3b85f0fab70bc6e78fbc3c307e81f13ad7
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:17:08 2013 +0200

    fdo#70393: move libvisio to a subdir of external
    
    Change-Id: I8887369a0d355e803e31c52d7358c88d133cf89b
    Reviewed-on: https://gerrit.libreoffice.org/6335
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index aa47dfb..835e41e 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 13846f4..2072aac 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
similarity index 100%
rename from libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch
rename to 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
similarity index 100%
rename from libvisio/ExternalProject_libvisio.mk
rename to external/libvisio/ExternalProject_libvisio.mk
diff --git a/libvisio/Makefile b/external/libvisio/Makefile
similarity index 71%
rename from libvisio/Makefile
rename to external/libvisio/Makefile
index ccb1c85..e4968cf 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
similarity index 93%
rename from libvisio/Module_libvisio.mk
rename to external/libvisio/Module_libvisio.mk
index 9a8159f..00b05d2 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
similarity index 100%
rename from libvisio/README
rename to external/libvisio/README
diff --git a/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
similarity index 88%
rename from libvisio/UnpackedTarball_libvisio.mk
rename to external/libvisio/UnpackedTarball_libvisio.mk
index c2a2000..4680d78 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: