Update bundled Graphite to 1.2.4

Change-Id: Id8c90b58c40bd449617c58f6c9e7cdea035a1c41
Reviewed-on: https://gerrit.libreoffice.org/7056Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Makefile.fetch

@@ -80,6 +80,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
 		$(call fetch_Optional,ETONYEK,ETONYEK_TARBALL) \
 		$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
+		$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
 		$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
 		$(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
 		$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
@@ -117,7 +118,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 		$(call fetch_Optional,FONTCONFIG,$(FONTCONFIG_TARBALL)) \
 		$(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \
 		$(GOOGLE_DOCS_EXTENSION_PACK) \
-		$(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \
 		$(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \
 		$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
 		$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \

download.lst

@@ -18,6 +18,8 @@ FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2
 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
 # export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz
+GRAPHITE_MD5SUM := 2ef839348fe28e3b923bf8cced440227
+export GRAPHITE_TARBALL := graphite2-1.2.4.tgz
 HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
 export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
@@ -53,7 +55,6 @@ export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.
 export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz
 export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz
 export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
-export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz

external/graphite/UnpackedTarball_graphite.mk

@@ -11,10 +11,8 @@ $(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,\
-	external/graphite/graphite2.patch \
 	external/graphite/graphite2.issue1115.patch.1 \
 ))
 

external/graphite/graphite2.patch

---- 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 ()
- {