summaryrefslogtreecommitdiff
path: root/graphite
diff options
context:
space:
mode:
authorMartin Hosken <martin_hosken@sil.org>2011-09-22 22:46:33 +0700
committerMartin Hosken <martin_hosken@sil.org>2011-09-22 22:49:07 +0700
commit162676cb6a940636e958b5787a626d814865ab86 (patch)
treefd1b3e5b360077e339019a6f230998cffb64e1cf /graphite
parentd543cb25e16b1f80d0b2826dc1046ba752199e81 (diff)
Upgrade graphite to 1.0.3 fix surrogate support
Diffstat (limited to 'graphite')
-rw-r--r--graphite/graphite2.patch4
-rw-r--r--graphite/graphite_make.patch4
-rw-r--r--graphite/makefile.mk7
3 files changed, 7 insertions, 8 deletions
diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index a13ef0757fb1..d5a956553ad1 100644
--- a/graphite/graphite2.patch
+++ b/graphite/graphite2.patch
@@ -1,5 +1,5 @@
---- 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
+--- misc/graphite2-1.0.3/include/graphite2/Types.h 2011-02-12 16:54:16.000000000 +0100
++++ misc/build/graphite2-1.0.3/include/graphite2/Types.h 2011-03-15 21:38:06.264788098 +0100
@@ -36,7 +36,8 @@
};
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
index c137c127b05e..4532163be5b0 100644
--- a/graphite/graphite_make.patch
+++ b/graphite/graphite_make.patch
@@ -1,5 +1,5 @@
---- 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
+--- misc/build/graphite2-1.0.3/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700
++++ misc/build/graphite2-1.0.3/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700
@@ -1,1 +1,38 @@
-dummy
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 522c26187daa..3793d6c54778 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -45,11 +45,10 @@ all:
# --- Files --------------------------------------------------------
.IF "$(ENABLE_GRAPHITE)"=="TRUE"
-TARFILE_NAME=graphite2-1.0.2
-TARFILE_MD5=3115c721f5cb7c464f01c2dddccfaba6
+TARFILE_NAME=graphite2-1.0.3
+TARFILE_MD5=3bf481ca95109b14435125c0dd1f2217
PATCH_FILES= graphite2.patch \
- graphite_make.patch \
- graphite2.placementnew.patch
+ graphite_make.patch
ADDITIONAL_FILES= \
src/makefile.mk