RepositoryModule_build.mk | 1 RepositoryModule_host.mk | 1 external/Module_external.mk | 2 external/vigra/Makefile | 7 external/vigra/Module_vigra.mk | 20 external/vigra/README | 3 external/vigra/UnpackedTarball_vigra.mk | 20 external/vigra/vigra1.6.0-unused-parameters.patch | 31 external/vigra/vigra1.6.0.patch | 1453 ++++++++++++++++++++++ vigra/Makefile | 7 vigra/Module_vigra.mk | 20 vigra/README | 3 vigra/UnpackedTarball_vigra.mk | 20 vigra/vigra1.6.0-unused-parameters.patch | 31 vigra/vigra1.6.0.patch | 1453 ---------------------- 15 files changed, 1536 insertions(+), 1536 deletions(-)
New commits: commit 112c60b48463e30e930c0856ebf37461697a0863 Author: Khaled Hosny <[email protected]> Date: Sun Nov 3 20:43:21 2013 +0200 fdo#70393: move vigra to a subdir of external Change-Id: I98e2ae25865c4ec38da19a24ba4347540d170e4f Reviewed-on: https://gerrit.libreoffice.org/6554 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 1a4c033..4ef18d8 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -78,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ ucb \ unoxml \ vcl \ - $(call gb_Helper_optional,VIGRA,vigra) \ xmloff \ xmlscript \ ) \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 92ff4f1..ccae97c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -144,7 +144,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ uui \ vbahelper \ vcl \ - $(call gb_Helper_optional,VIGRA,vigra) \ wizards \ writerfilter \ writerperfect \ diff --git a/external/Module_external.mk b/external/Module_external.mk index f5484e4..d6c1184 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,REDLAND,redland) \ $(call gb_Helper_optional,RHINO,rhino) \ $(call gb_Helper_optional,UCPP,ucpp) \ + $(call gb_Helper_optional,VIGRA,vigra) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ @@ -83,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,NSS,nss) \ + $(call gb_Helper_optional,VIGRA,vigra) \ ) \ ) \ )) diff --git a/vigra/Makefile b/external/vigra/Makefile similarity index 71% rename from vigra/Makefile rename to external/vigra/Makefile index ccb1c85..e4968cf 100644 --- a/vigra/Makefile +++ b/external/vigra/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/vigra/Module_vigra.mk b/external/vigra/Module_vigra.mk similarity index 100% rename from vigra/Module_vigra.mk rename to external/vigra/Module_vigra.mk diff --git a/vigra/README b/external/vigra/README similarity index 100% rename from vigra/README rename to external/vigra/README diff --git a/vigra/UnpackedTarball_vigra.mk b/external/vigra/UnpackedTarball_vigra.mk similarity index 86% rename from vigra/UnpackedTarball_vigra.mk rename to external/vigra/UnpackedTarball_vigra.mk index efab478..c368e21 100644 --- a/vigra/UnpackedTarball_vigra.mk +++ b/external/vigra/UnpackedTarball_vigra.mk @@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,vigra)) $(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,vigra,\ - vigra/vigra1.6.0.patch \ + external/vigra/vigra1.6.0.patch \ $(if $(filter GCC,$(COM)), \ - vigra/vigra1.6.0-unused-parameters.patch) \ + external/vigra/vigra1.6.0-unused-parameters.patch) \ )) # vim: set noet sw=4 ts=4: diff --git a/vigra/vigra1.6.0-unused-parameters.patch b/external/vigra/vigra1.6.0-unused-parameters.patch similarity index 100% rename from vigra/vigra1.6.0-unused-parameters.patch rename to external/vigra/vigra1.6.0-unused-parameters.patch diff --git a/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch similarity index 100% rename from vigra/vigra1.6.0.patch rename to external/vigra/vigra1.6.0.patch _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
