summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-10-17 19:46:33 +0200
committerDavid Tardon <dtardon@redhat.com>2013-10-18 06:55:25 +0000
commit27a1ae650d17bb588108a20af2ecec6d061e596e (patch)
treeeebb51c07998fe250695336f7c01071920712e98
parent1fdb6185a18990818199ad355b89c72102c6a0da (diff)
fdo#70393: move fontconfig to a subdir of external
Change-Id: I467e83b4c1ca938f5cdc333d9af103bcd01832f2 Reviewed-on: https://gerrit.libreoffice.org/6303 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/fontconfig/ExternalPackage_fontconfig.mk (renamed from fontconfig/ExternalPackage_fontconfig.mk)0
-rw-r--r--external/fontconfig/ExternalProject_fontconfig.mk (renamed from fontconfig/ExternalProject_fontconfig.mk)0
-rw-r--r--external/fontconfig/Makefile (renamed from fontconfig/Makefile)0
-rw-r--r--external/fontconfig/Module_fontconfig.mk (renamed from fontconfig/Module_fontconfig.mk)0
-rw-r--r--external/fontconfig/README (renamed from fontconfig/README)0
-rw-r--r--external/fontconfig/UnpackedTarball_fontconfig.mk (renamed from fontconfig/UnpackedTarball_fontconfig.mk)2
-rw-r--r--external/fontconfig/fontconfig-2.8.0.patch (renamed from fontconfig/fontconfig-2.8.0.patch)0
9 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 4701511c9463..740d5e01528d 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 97a2181e851c..a21badee7586 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
index bee7f01d94af..bee7f01d94af 100644
--- a/fontconfig/ExternalPackage_fontconfig.mk
+++ b/external/fontconfig/ExternalPackage_fontconfig.mk
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk
index a956e70c0807..a956e70c0807 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
diff --git a/fontconfig/Makefile b/external/fontconfig/Makefile
index ccb1c85a04da..ccb1c85a04da 100644
--- a/fontconfig/Makefile
+++ b/external/fontconfig/Makefile
diff --git a/fontconfig/Module_fontconfig.mk b/external/fontconfig/Module_fontconfig.mk
index 1bfcbdb7878a..1bfcbdb7878a 100644
--- a/fontconfig/Module_fontconfig.mk
+++ b/external/fontconfig/Module_fontconfig.mk
diff --git a/fontconfig/README b/external/fontconfig/README
index 220ee6078a65..220ee6078a65 100644
--- a/fontconfig/README
+++ b/external/fontconfig/README
diff --git a/fontconfig/UnpackedTarball_fontconfig.mk b/external/fontconfig/UnpackedTarball_fontconfig.mk
index fc2be74be632..413ffeffc7fa 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
index 5c89a40381dd..5c89a40381dd 100644
--- a/fontconfig/fontconfig-2.8.0.patch
+++ b/external/fontconfig/fontconfig-2.8.0.patch