From 06448095946f635dd5753fd2db6079ca14bcfde7 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 10 Dec 2012 16:14:03 +0100
Subject: Reported graphite2 patch upstream

Change-Id: Idca64b8925199f3d275e7966c1d0e13fee4967a8
---
 graphite/UnpackedTarball_graphite.mk |  3 ++-
 graphite/graphite2.issue1115.patch.1 | 22 ++++++++++++++++++++++
 graphite/graphite2.narrowing.patch.1 | 22 ----------------------
 3 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 graphite/graphite2.issue1115.patch.1
 delete mode 100644 graphite/graphite2.narrowing.patch.1

(limited to 'graphite')

diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk
index 25638dad8ea6..a25b3166e280 100644
--- a/graphite/UnpackedTarball_graphite.mk
+++ b/graphite/UnpackedTarball_graphite.mk
@@ -12,10 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
 $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 
 # http://projects.palaso.org/issues/1030
+# http://projects.palaso.org/issues/1115
 $(eval $(call gb_UnpackedTarball_add_patches,graphite,\
 	graphite/graphite2.patch \
 	graphite/graphite2.issue1030.patch.1 \
-	graphite/graphite2.narrowing.patch.1 \
+	graphite/graphite2.issue1115.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/graphite/graphite2.issue1115.patch.1 b/graphite/graphite2.issue1115.patch.1
new file mode 100644
index 000000000000..f19c8a3749f4
--- /dev/null
+++ b/graphite/graphite2.issue1115.patch.1
@@ -0,0 +1,22 @@
+--- graphite/src/Code.cpp
++++ graphite/src/Code.cpp
+@@ -169,8 +169,8 @@ Machine::Code::Code(bool is_constraint,
+         bytecode_end,
+         pre_context,
+         rule_length,
+-        silf.numClasses(),
+-        face.glyphs().numAttrs(),
++        static_cast<uint16>(silf.numClasses()),
++        static_cast<uint16>(face.glyphs().numAttrs()),
+         face.numFeatures(), 
+         {1,1,1,1,1,1,1,1, 
+          1,1,1,1,1,1,1,255,
+@@ -178,7 +178,7 @@ Machine::Code::Code(bool is_constraint,
+          1,1,1,1,1,1,0,0, 
+          0,0,0,0,0,0,0,0, 
+          0,0,0,0,0,0,0,0, 
+-         0,0,0,0,0,0,0, silf.numUser()}
++         0,0,0,0,0,0,0, static_cast<byte>(silf.numUser())}
+     };
+     
+     decoder dec(lims, *this);
diff --git a/graphite/graphite2.narrowing.patch.1 b/graphite/graphite2.narrowing.patch.1
deleted file mode 100644
index f19c8a3749f4..000000000000
--- a/graphite/graphite2.narrowing.patch.1
+++ /dev/null
@@ -1,22 +0,0 @@
---- graphite/src/Code.cpp
-+++ graphite/src/Code.cpp
-@@ -169,8 +169,8 @@ Machine::Code::Code(bool is_constraint,
-         bytecode_end,
-         pre_context,
-         rule_length,
--        silf.numClasses(),
--        face.glyphs().numAttrs(),
-+        static_cast<uint16>(silf.numClasses()),
-+        static_cast<uint16>(face.glyphs().numAttrs()),
-         face.numFeatures(), 
-         {1,1,1,1,1,1,1,1, 
-          1,1,1,1,1,1,1,255,
-@@ -178,7 +178,7 @@ Machine::Code::Code(bool is_constraint,
-          1,1,1,1,1,1,0,0, 
-          0,0,0,0,0,0,0,0, 
-          0,0,0,0,0,0,0,0, 
--         0,0,0,0,0,0,0, silf.numUser()}
-+         0,0,0,0,0,0,0, static_cast<byte>(silf.numUser())}
-     };
-     
-     decoder dec(lims, *this);
-- 
cgit