summaryrefslogtreecommitdiff
path: root/graphite
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-03-11 11:35:10 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-03-11 11:36:35 +0100
commitdb993edbdc3743860c42fa5aef11f1fd207d7cb1 (patch)
treeaab53e6385e2e1437a527c7105a0c8b751dac86e /graphite
parent64c58dfa9fcf0e1a3ba53ebbd73af9025cf56f0f (diff)
fix graphite build on Linux 64-bit
Diffstat (limited to 'graphite')
-rw-r--r--graphite/graphite2-0.9.2.patch11
-rw-r--r--graphite/graphite_make.patch3
-rw-r--r--graphite/makefile.mk3
3 files changed, 16 insertions, 1 deletions
diff --git a/graphite/graphite2-0.9.2.patch b/graphite/graphite2-0.9.2.patch
index 5f132997d4e8..9b3003967f8d 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 033f335f1e6b..20c3fe045eeb 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 f2444a75ff19..e580b405b63a 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=