[Libreoffice-commits] .: Branch 'libreoffice-3-4' - graphite/graphite2.patch graphite/graphite_make.patch graphite/makefile.mk

[Michael Meeks]

 graphite/graphite2.patch     |    4 ++--
 graphite/graphite_make.patch |    4 ++--
 graphite/makefile.mk         |    7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 2cd89a55941292b3416070b9a5b90274deb59370
Author: Martin Hosken <martin_hosken at sil.org>
Date:   Thu Oct 20 14:25:46 2011 +0100

    Upgrade graphite to 1.0.3 fix surrogate support
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/graphite/graphite2.patch b/graphite/graphite2.patch
index fcd486c..067c747 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
++++ misc/build/graphite2-1.0.3/include/graphite2/Types.h
 @@ -36,7 +36,7 @@
  };
  
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
index c137c12..4532163 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 522c261..3793d6c 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