diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 19:54:11 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-18 06:56:32 +0000 |
| commit | d985257069d22d1a2d4b1491685094082c174e60 (patch) | |
| tree | 65745eaea029b198882668f551d40b75c9956cf6 | |
| parent | 27d330950f975322bd68edf836d7e3b91f76e57f (diff) | |
fdo#70393: move graphite to a subdir of external
Change-Id: If0f3c19fd539d2b1323016df032b9f959a0adf66
Reviewed-on: https://gerrit.libreoffice.org/6305
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/graphite/Makefile (renamed from graphite/Makefile) | 0 | ||||
| -rw-r--r-- | external/graphite/Module_graphite.mk (renamed from graphite/Module_graphite.mk) | 4 | ||||
| -rw-r--r-- | external/graphite/README (renamed from graphite/README) | 0 | ||||
| -rw-r--r-- | external/graphite/StaticLibrary_graphite.mk (renamed from graphite/StaticLibrary_graphite.mk) | 0 | ||||
| -rw-r--r-- | external/graphite/UnpackedTarball_graphite.mk (renamed from graphite/UnpackedTarball_graphite.mk) | 4 | ||||
| -rw-r--r-- | external/graphite/graphite2.issue1115.patch.1 (renamed from graphite/graphite2.issue1115.patch.1) | 0 | ||||
| -rw-r--r-- | external/graphite/graphite2.patch (renamed from graphite/graphite2.patch) | 0 |
9 files changed, 3 insertions, 7 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index ea74705bfabc..c7d174896821 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,GRAPHITE,graphite) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HELP,helpcontent2) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 287398f49d0b..6902a7142af3 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FIREBIRD,firebird) \ $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ diff --git a/graphite/Makefile b/external/graphite/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/graphite/Makefile +++ b/external/graphite/Makefile diff --git a/graphite/Module_graphite.mk b/external/graphite/Module_graphite.mk index 2791eff83c78..ff981612b566 100644 --- a/graphite/Module_graphite.mk +++ b/external/graphite/Module_graphite.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,graphite)) -ifeq ($(SYSTEM_GRAPHITE),NO) - $(eval $(call gb_Module_add_targets,graphite,\ StaticLibrary_graphite \ UnpackedTarball_graphite \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/graphite/README b/external/graphite/README index aac0d0df366c..aac0d0df366c 100644 --- a/graphite/README +++ b/external/graphite/README diff --git a/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk index de3950f10b86..de3950f10b86 100644 --- a/graphite/StaticLibrary_graphite.mk +++ b/external/graphite/StaticLibrary_graphite.mk diff --git a/graphite/UnpackedTarball_graphite.mk b/external/graphite/UnpackedTarball_graphite.mk index a690ac3c3a91..35ca233268c3 100644 --- a/graphite/UnpackedTarball_graphite.mk +++ b/external/graphite/UnpackedTarball_graphite.mk @@ -14,8 +14,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL))) # http://projects.palaso.org/issues/1030 # http://projects.palaso.org/issues/1115 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\ - graphite/graphite2.patch \ - graphite/graphite2.issue1115.patch.1 \ + external/graphite/graphite2.patch \ + external/graphite/graphite2.issue1115.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/graphite/graphite2.issue1115.patch.1 b/external/graphite/graphite2.issue1115.patch.1 index f19c8a3749f4..f19c8a3749f4 100644 --- a/graphite/graphite2.issue1115.patch.1 +++ b/external/graphite/graphite2.issue1115.patch.1 diff --git a/graphite/graphite2.patch b/external/graphite/graphite2.patch index c7739ad441cb..c7739ad441cb 100644 --- a/graphite/graphite2.patch +++ b/external/graphite/graphite2.patch |