[Libreoffice-commits] .: graphite/graphite2-0.9.2.patch graphite/graphite_make.patch graphite/makefile.mk

[Fridrich Strba]

 graphite/graphite2-0.9.2.patch |   11 +++++++++++
 graphite/graphite_make.patch   |    3 ++-
 graphite/makefile.mk           |    3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 0959957527ff9d14090c10f627828bb0a7d705e4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Mar 11 11:35:10 2011 +0100

    fix graphite build on Linux 64-bit

diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch
index 5f13299..9b30039 100644
--- a/graphite/graphite2-0.9.2.patch
+++ b/graphite/graphite2-0.9.2.patch
@@ -380,3 +380,14 @@ diff current src/List.h
      iterator            begin()         { return m_first; }
      const_iterator      begin() const   { return m_first; }
 
+--- misc/graphite2-0.9.2/src/Code.cpp	2011-02-12 16:54:16.000000000 +0100
++++ misc/build/graphite2-0.9.2/src/Code.cpp	2011-03-11 11:28:11.700215286 +0100
+@@ -168,7 +168,7 @@
+         face.getGlyphFaceCache()->numAttrs(),
+         face.numFeatures(), 
+         {1,1,1,1,1,1,1,1, 
+-         1,1,1,1,1,1,1,-1, 
++         1,1,1,1,1,1,1,(uint8)-1, 
+          1,1,1,1,1,1,1,1, 
+          1,1,1,1,1,1,0,0, 
+          0,0,0,0,0,0,0,0, 
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
index 033f335..20c3fe0 100644
--- a/graphite/graphite_make.patch
+++ b/graphite/graphite_make.patch
@@ -1,6 +1,7 @@
 --- 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
-@@ -0,0 +1,54 @@
+@@ -1,1 +1,54 @@
+-dummy
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +
 +PRJ=..$/..$/..$/..$/..
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index f2444a7..e580b40 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -50,6 +50,9 @@ TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108
 PATCH_FILES= graphite2-0.9.2.patch \
         graphite_make.patch
 
+ADDITIONAL_FILES= \
+    src/makefile.mk
+
 # convert line-endings to avoid problems when patching
 CONVERTFILES=