[Libreoffice-commits] core.git: external/fontconfig external/Module_external.mk fontconfig/ExternalPackage_fontconfig.mk fontconfig/ExternalProject_fontconfig.mk fontconfig/fontconfig-2.8.0.patch fontconfig/Makefile fontconfig/Module_fontconfig.mk fontconfig/README fontconfig/UnpackedTarball_fontconfig.mk RepositoryModule_host.mk

[Khaled Hosny]

 RepositoryModule_host.mk                          |    1 
 external/Module_external.mk                       |    1 
 external/fontconfig/ExternalPackage_fontconfig.mk |   18 ++++++
 external/fontconfig/ExternalProject_fontconfig.mk |   34 +++++++++++
 external/fontconfig/Makefile                      |    7 ++
 external/fontconfig/Module_fontconfig.mk          |   22 +++++++
 external/fontconfig/README                        |    6 ++
 external/fontconfig/UnpackedTarball_fontconfig.mk |   20 ++++++
 external/fontconfig/fontconfig-2.8.0.patch        |   64 ++++++++++++++++++++++
 fontconfig/ExternalPackage_fontconfig.mk          |   18 ------
 fontconfig/ExternalProject_fontconfig.mk          |   34 -----------
 fontconfig/Makefile                               |    7 --
 fontconfig/Module_fontconfig.mk                   |   22 -------
 fontconfig/README                                 |    6 --
 fontconfig/UnpackedTarball_fontconfig.mk          |   20 ------
 fontconfig/fontconfig-2.8.0.patch                 |   64 ----------------------
 16 files changed, 172 insertions(+), 172 deletions(-)

New commits:
commit 27a1ae650d17bb588108a20af2ecec6d061e596e
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Oct 17 19:46:33 2013 +0200

    fdo#70393: move fontconfig to a subdir of external
    
    Change-Id: I467e83b4c1ca938f5cdc333d9af103bcd01832f2
    Reviewed-on: https://gerrit.libreoffice.org/6303
    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 4701511..740d5e0 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	extras \
 	fileaccess \
 	filter \
-	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
 	formula \
 	fpicker \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 97a2181..a21bade 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,EPM,epm) \
 	$(call gb_Helper_optional,EXPAT,expat) \
 	$(call gb_Helper_optional,FIREBIRD,firebird) \
+	$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
diff --git a/fontconfig/ExternalPackage_fontconfig.mk b/external/fontconfig/ExternalPackage_fontconfig.mk
similarity index 100%
rename from fontconfig/ExternalPackage_fontconfig.mk
rename to external/fontconfig/ExternalPackage_fontconfig.mk
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
similarity index 100%
rename from fontconfig/ExternalProject_fontconfig.mk
rename to external/fontconfig/ExternalProject_fontconfig.mk
diff --git a/fontconfig/Makefile b/external/fontconfig/Makefile
similarity index 100%
rename from fontconfig/Makefile
rename to external/fontconfig/Makefile
diff --git a/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk
similarity index 100%
rename from fontconfig/Module_fontconfig.mk
rename to external/fontconfig/Module_fontconfig.mk
diff --git a/fontconfig/README b/external/fontconfig/README
similarity index 100%
rename from fontconfig/README
rename to external/fontconfig/README
diff --git a/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk
similarity index 93%
rename from fontconfig/UnpackedTarball_fontconfig.mk
rename to external/fontconfig/UnpackedTarball_fontconfig.mk
index fc2be74..413ffef 100644
--- a/fontconfig/UnpackedTarball_fontconfig.mk
+++ b/external/fontconfig/UnpackedTarball_fontconfig.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,f
 $(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,fontconfig,\
-	fontconfig/fontconfig-2.8.0.patch \
+	external/fontconfig/fontconfig-2.8.0.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/fontconfig/fontconfig-2.8.0.patch b/external/fontconfig/fontconfig-2.8.0.patch
similarity index 100%
rename from fontconfig/fontconfig-2.8.0.patch
rename to external/fontconfig/fontconfig-2.8.0.patch