diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 19:48:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:55:57 +0000 |
| commit | 27d330950f975322bd68edf836d7e3b91f76e57f (patch) | |
| tree | 3013b973a0e86af1c122f57a7d40751f2e2c9c86 | |
| parent | 27a1ae650d17bb588108a20af2ecec6d061e596e (diff) | |
fdo#70393: move freetype to a subdir of external
Change-Id: I533d855e30e46b937d27d185eabc0ca3a3473f4d
Reviewed-on: https://gerrit.libreoffice.org/6304
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/freetype/ExternalPackage_freetype.mk (renamed from freetype/ExternalPackage_freetype.mk) | 0 | ||||
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk (renamed from freetype/ExternalProject_freetype.mk) | 0 | ||||
| -rw-r--r-- | external/freetype/Makefile (renamed from freetype/Makefile) | 0 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk (renamed from freetype/Module_freetype.mk) | 0 | ||||
| -rw-r--r-- | external/freetype/README (renamed from freetype/README) | 0 | ||||
| -rw-r--r-- | external/freetype/UnpackedTarball_freetype.mk (renamed from freetype/UnpackedTarball_freetype.mk) | 2 | ||||
| -rw-r--r-- | external/freetype/freetype-2.4.8.patch (renamed from freetype/freetype-2.4.8.patch) | 0 |
9 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 740d5e01528d..ea74705bfabc 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -55,7 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ formula \ fpicker \ framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HELP,helpcontent2) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index a21badee7586..287398f49d0b 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,EXPAT,expat) \ $(call gb_Helper_optional,FIREBIRD,firebird) \ $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ + $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ diff --git a/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk index 87067ad18407..87067ad18407 100644 --- a/freetype/ExternalPackage_freetype.mk +++ b/external/freetype/ExternalPackage_freetype.mk diff --git a/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index ba22a64838f0..ba22a64838f0 100644 --- a/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk diff --git a/freetype/Makefile b/external/freetype/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/freetype/Makefile +++ b/external/freetype/Makefile diff --git a/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index e0965a0deb2b..e0965a0deb2b 100644 --- a/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk diff --git a/freetype/README b/external/freetype/README index c90f9509fb1a..c90f9509fb1a 100644 --- a/freetype/README +++ b/external/freetype/README diff --git a/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk index c1ba0ae8a003..600185108de9 100644 --- a/freetype/UnpackedTarball_freetype.mk +++ b/external/freetype/UnpackedTarball_freetype.mk @@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freet $(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3)) $(eval $(call gb_UnpackedTarball_add_patches,freetype,\ - freetype/freetype-2.4.8.patch \ + external/freetype/freetype-2.4.8.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/freetype/freetype-2.4.8.patch b/external/freetype/freetype-2.4.8.patch index 9ae69a3a6b45..9ae69a3a6b45 100644 --- a/freetype/freetype-2.4.8.patch +++ b/external/freetype/freetype-2.4.8.patch |