summaryrefslogtreecommitdiff
path: root/graphite
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-10-17 19:54:11 +0200
committerDavid Tardon <dtardon@redhat.com>2013-10-18 06:56:32 +0000
commitd985257069d22d1a2d4b1491685094082c174e60 (patch)
tree65745eaea029b198882668f551d40b75c9956cf6 /graphite
parent27d330950f975322bd68edf836d7e3b91f76e57f (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>
Diffstat (limited to 'graphite')
-rw-r--r--graphite/Makefile7
-rw-r--r--graphite/Module_graphite.mk21
-rw-r--r--graphite/README4
-rw-r--r--graphite/StaticLibrary_graphite.mk70
-rw-r--r--graphite/UnpackedTarball_graphite.mk21
-rw-r--r--graphite/graphite2.issue1115.patch.122
-rw-r--r--graphite/graphite2.patch29
7 files changed, 0 insertions, 174 deletions
diff --git a/graphite/Makefile b/graphite/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/graphite/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/graphite/Module_graphite.mk b/graphite/Module_graphite.mk
deleted file mode 100644
index 2791eff83c78..000000000000
--- a/graphite/Module_graphite.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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/graphite/README
deleted file mode 100644
index aac0d0df366c..000000000000
--- a/graphite/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Library for providing rendering capabilities for complex non-Roman writing systems.
-
-From:
-[http://graphite.sil.org/]
diff --git a/graphite/StaticLibrary_graphite.mk b/graphite/StaticLibrary_graphite.mk
deleted file mode 100644
index de3950f10b86..000000000000
--- a/graphite/StaticLibrary_graphite.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,graphite))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,graphite,graphite))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,graphite))
-
-$(eval $(call gb_StaticLibrary_set_include,graphite,\
- -I$(call gb_UnpackedTarball_get_dir,graphite/include) \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_add_defs,graphite,\
- -DDISABLE_TRACING \
- -DGR2_STATIC \
-))
-
-ifeq ($(COM),GCC)
-ifneq ($(COM_GCC_IS_CLANG),TRUE)
-$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\
- -fpermissive \
-))
-endif
-endif
-
-$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp))
-
-$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,graphite,\
- UnpackedTarball/graphite/src/$(if $(filter GCC,$(COM)),direct,call)_machine \
- UnpackedTarball/graphite/src/gr_char_info \
- UnpackedTarball/graphite/src/gr_face \
- UnpackedTarball/graphite/src/gr_features \
- UnpackedTarball/graphite/src/gr_font \
- UnpackedTarball/graphite/src/gr_logging \
- UnpackedTarball/graphite/src/gr_segment \
- UnpackedTarball/graphite/src/gr_slot \
- UnpackedTarball/graphite/src/json \
- UnpackedTarball/graphite/src/Bidi \
- UnpackedTarball/graphite/src/CachedFace \
- UnpackedTarball/graphite/src/CmapCache \
- UnpackedTarball/graphite/src/Code \
- UnpackedTarball/graphite/src/Face \
- UnpackedTarball/graphite/src/FeatureMap \
- UnpackedTarball/graphite/src/FileFace \
- UnpackedTarball/graphite/src/Font \
- UnpackedTarball/graphite/src/GlyphCache \
- UnpackedTarball/graphite/src/GlyphFace \
- UnpackedTarball/graphite/src/Justifier \
- UnpackedTarball/graphite/src/NameTable \
- UnpackedTarball/graphite/src/Pass \
- UnpackedTarball/graphite/src/SegCache \
- UnpackedTarball/graphite/src/SegCacheEntry \
- UnpackedTarball/graphite/src/SegCacheStore \
- UnpackedTarball/graphite/src/Segment \
- UnpackedTarball/graphite/src/Silf \
- UnpackedTarball/graphite/src/Slot \
- UnpackedTarball/graphite/src/Sparse \
- UnpackedTarball/graphite/src/TtfUtil \
- UnpackedTarball/graphite/src/UtfCodec \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk
deleted file mode 100644
index a690ac3c3a91..000000000000
--- a/graphite/UnpackedTarball_graphite.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
-
-$(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 \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.issue1115.patch.1 b/graphite/graphite2.issue1115.patch.1
deleted file mode 100644
index f19c8a3749f4..000000000000
--- a/graphite/graphite2.issue1115.patch.1
+++ /dev/null
@@ -1,22 +0,0 @@
---- graphite/src/Code.cpp
-+++ graphite/src/Code.cpp
-@@ -169,8 +169,8 @@ Machine::Code::Code(bool is_constraint,
- bytecode_end,
- pre_context,
- rule_length,
-- silf.numClasses(),
-- face.glyphs().numAttrs(),
-+ static_cast<uint16>(silf.numClasses()),
-+ static_cast<uint16>(face.glyphs().numAttrs()),
- face.numFeatures(),
- {1,1,1,1,1,1,1,1,
- 1,1,1,1,1,1,1,255,
-@@ -178,7 +178,7 @@ Machine::Code::Code(bool is_constraint,
- 1,1,1,1,1,1,0,0,
- 0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,
-- 0,0,0,0,0,0,0, silf.numUser()}
-+ 0,0,0,0,0,0,0, static_cast<byte>(silf.numUser())}
- };
-
- decoder dec(lims, *this);
diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
deleted file mode 100644
index c7739ad441cb..000000000000
--- a/graphite/graphite2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- misc/graphite2-1.2.0/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100
-+++ misc/build/graphite2-1.2.0/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100
-@@ -41,7 +41,8 @@
- };
-
- // Definitions for library publicly exported symbols
--#if defined _WIN32 || defined __CYGWIN__
-+#define GR2_STATIC 1
-+#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
- #if defined GRAPHITE2_STATIC
- #define GR2_API
- #elif defined GRAPHITE2_EXPORTING
---- misc/graphite2-1.2.0/src/inc/json.h
-+++ misc/build/graphite2-1.2.0/src/inc/json.h
-@@ -146,6 +146,14 @@
- inline
- json & operator << (json & j, unsigned int d) throw() { return j << json::integer(d); }
-
-+#if defined(_WIN64)
-+inline
-+json & operator << (json & j, __int64 d) throw() { return j << json::integer((unsigned int)d); }
-+
-+inline
-+json & operator << (json & j, size_t d) throw() { return j << json::integer((unsigned int)d); }
-+
-+#endif
- inline
- json & operator << (json & j, char c) throw ()
- {