Upgrade graphite to 1.0.2 and simplify patches

graphite/graphite2.patch

+--- misc/graphite2-1.0.2/include/graphite2/Types.h	2011-02-12 16:54:16.000000000 +0100
++++ misc/build/graphite2-1.0.2/include/graphite2/Types.h	2011-03-15 21:38:06.264788098 +0100
+@@ -36,7 +36,7 @@
+ };
+ 
+ // Definitions for library publicly exported symbols
+-#if defined _WIN32 || defined __CYGWIN__
++#if ( defined _WIN32 || defined __CYGWIN__ ) && !defined GR2_STATIC
+   #ifdef GR2_EXPORTING
+     #ifdef __GNUC__
+       #define GR2_API    __attribute__((dllexport))

graphite/graphite_make.patch

---- misc/build/graphite2-0.9.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
-+++ misc/build/graphite2-0.9.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
-@@ -1,1 +1,54 @@
+--- misc/build/graphite2-1.0.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
++++ misc/build/graphite2-1.0.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
+@@ -1,1 +1,34 @@
 -dummy
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +
@@ -18,37 +18,17 @@
 +CFLAGS+=-O3 -DNDEBUG
 +.ENDIF
 +
-+VMACHINE=call
++_NS := GR2
++
++GR2_MACHINE=call
 +.IF "$(COM)"=="GCC"
-+VMACHINE=direct
++GR2_MACHINE=direct
 +CFLAGSCXX+=-fpermissive
 +.ENDIF
 +
-+SLOFILES= \
-+    $(SLO)/$(VMACHINE)_machine.obj \
-+    $(SLO)/gr_char_info.obj \
-+    $(SLO)/gr_features.obj \
-+    $(SLO)/gr_face.obj \
-+    $(SLO)/gr_font.obj \
-+    $(SLO)/gr_segment.obj \
-+    $(SLO)/gr_slot.obj \
-+    $(SLO)/CachedFace.obj \
-+    $(SLO)/CmapCache.obj \
-+    $(SLO)/Code.obj \
-+    $(SLO)/Face.obj \
-+    $(SLO)/FeatureMap.obj \
-+    $(SLO)/Font.obj \
-+    $(SLO)/GlyphFace.obj \
-+    $(SLO)/GlyphFaceCache.obj \
-+    $(SLO)/NameTable.obj \
-+    $(SLO)/Pass.obj \
-+    $(SLO)/SegCache.obj \
-+    $(SLO)/SegCacheEntry.obj \
-+    $(SLO)/SegCacheStore.obj \
-+    $(SLO)/Segment.obj \
-+    $(SLO)/Silf.obj \
-+    $(SLO)/Slot.obj \
-+    $(SLO)/TtfUtil.obj
++.INCLUDE : files.mk
++
++SLOFILES= $(foreach,i,$(GR2_SOURCES:b) $(SLO)/$i.obj)
 +
 +LIB1ARCHIV=$(LB)$/lib$(TARGET).a
 +LIB1TARGET=$(SLB)$/$(TARGET).lib
@@ -56,4 +36,3 @@
 +OUT2INC=../include/graphite2
 +
 +.INCLUDE : target.mk
-

graphite/makefile.mk

@@ -45,9 +45,9 @@ all:
 
 # --- Files --------------------------------------------------------
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
-TARFILE_NAME=graphite2-0.9.2
-TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108
-PATCH_FILES= graphite2-0.9.2.patch \
+TARFILE_NAME=graphite2-1.0.2
+TARFILE_MD5=3115c721f5cb7c464f01c2dddccfaba6
+PATCH_FILES= graphite2.patch \
         graphite_make.patch
 
 ADDITIONAL_FILES= \

ooo.lst.in

@@ -87,7 +87,7 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
 9b8eb71bf58b006ac0d2f0b464786cee-libvisio-0.0.5.tar.bz2
 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
 http://dev-www.libreoffice.org/extern