RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/graphite/Makefile | 7 ++
external/graphite/Module_graphite.mk | 17 ++++++
external/graphite/README | 4 +
external/graphite/StaticLibrary_graphite.mk | 70 ++++++++++++++++++++++++++
external/graphite/UnpackedTarball_graphite.mk | 21 +++++++
external/graphite/graphite2.issue1115.patch.1 | 22 ++++++++
external/graphite/graphite2.patch | 29 ++++++++++
graphite/Makefile | 7 --
graphite/Module_graphite.mk | 21 -------
graphite/README | 4 -
graphite/StaticLibrary_graphite.mk | 70 --------------------------
graphite/UnpackedTarball_graphite.mk | 21 -------
graphite/graphite2.issue1115.patch.1 | 22 --------
graphite/graphite2.patch | 29 ----------
16 files changed, 171 insertions(+), 175 deletions(-)
New commits:
commit d985257069d22d1a2d4b1491685094082c174e60
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Thu Oct 17 19:54:11 2013 +0200
fdo#70393: move graphite to a subdir of external
Change-Id: If0f3c19fd539d2b1323016df032b9f959a0adf66
Reviewed-on: https://gerrit.libreoffice.org/6305
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index ea74705..c7d1748 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 287398f..6902a71 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
similarity index 100%
rename from graphite/Makefile
rename to external/graphite/Makefile
diff --git a/graphite/Module_graphite.mk b/external/graphite/Module_graphite.mk
similarity index 93%
rename from graphite/Module_graphite.mk
rename to external/graphite/Module_graphite.mk
index 2791eff..ff98161 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
similarity index 100%
rename from graphite/README
rename to external/graphite/README
diff --git a/graphite/StaticLibrary_graphite.mk
b/external/graphite/StaticLibrary_graphite.mk
similarity index 100%
rename from graphite/StaticLibrary_graphite.mk
rename to external/graphite/StaticLibrary_graphite.mk
diff --git a/graphite/UnpackedTarball_graphite.mk
b/external/graphite/UnpackedTarball_graphite.mk
similarity index 87%
rename from graphite/UnpackedTarball_graphite.mk
rename to external/graphite/UnpackedTarball_graphite.mk
index a690ac3..35ca233 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
similarity index 100%
rename from graphite/graphite2.issue1115.patch.1
rename to external/graphite/graphite2.issue1115.patch.1
diff --git a/graphite/graphite2.patch b/external/graphite/graphite2.patch
similarity index 100%
rename from graphite/graphite2.patch
rename to external/graphite/graphite2.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
