summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog7
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-02-solaris-variables19
-rw-r--r--Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp4
3 files changed, 28 insertions, 2 deletions
diff --git a/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog
index 52de1e7063e..98c15161fa9 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog
+++ b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-solaris-variables (new): Upstream patch to not clash
+ with <regset.h> on Solaris.
+ From http://projects.palaso.org/projects/graphitedev/repository/
+ revisions/1132 and revisions/1136.
+
2013-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported graphite2-1.2.1 source tree from:
diff --git a/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-02-solaris-variables b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-02-solaris-variables
new file mode 100644
index 00000000000..a6fb5d20b3d
--- /dev/null
+++ b/Build/source/libs/graphite2/graphite2-1.2.1-PATCHES/patch-02-solaris-variables
@@ -0,0 +1,19 @@
+ Upstream patch: Workaround for a bug of compiler on Solaris
+ using ES and CS variables in <regset.h>
+
+diff -ur graphite2-1.2.1.orig/src/Bidi.cpp graphite2-1.2.1/src/Bidi.cpp
+--- graphite2-1.2.1.orig/src/Bidi.cpp 2013-02-27 20:32:04.000000000 +0100
++++ graphite2-1.2.1/src/Bidi.cpp 2013-03-27 14:26:53.000000000 +0100
+@@ -37,10 +37,10 @@
+ R = 2, // right-to-left, strong - R
+ AL = 3, // Arabic letter, right-to-left, strong, AR
+ EN = 4, // European number, left-to-right, weak - EN
+- ES = 5, // European separator, left-to-right, weak - ES
++ EUS = 5, // European separator, left-to-right, weak - ES
+ ET = 6, // European number terminator, left-to-right, weak - ET
+ AN = 7, // Arabic number, left-to-right, weak - AN
+- CS = 8, // Common number separator, left-to-right, weak - CS
++ CUS = 8, // Common number separator, left-to-right, weak - CS
+ WS = 9, // white space, neutral - WS
+ BN = 10, // boundary neutral - BN
+
diff --git a/Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp b/Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp
index b612a81e647..c97eeb1738d 100644
--- a/Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp
+++ b/Build/source/libs/graphite2/graphite2-1.2.1/src/Bidi.cpp
@@ -37,10 +37,10 @@ enum DirCode { // Hungarian: dirc
R = 2, // right-to-left, strong - R
AL = 3, // Arabic letter, right-to-left, strong, AR
EN = 4, // European number, left-to-right, weak - EN
- ES = 5, // European separator, left-to-right, weak - ES
+ EUS = 5, // European separator, left-to-right, weak - ES
ET = 6, // European number terminator, left-to-right, weak - ET
AN = 7, // Arabic number, left-to-right, weak - AN
- CS = 8, // Common number separator, left-to-right, weak - CS
+ CUS = 8, // Common number separator, left-to-right, weak - CS
WS = 9, // white space, neutral - WS
BN = 10, // boundary neutral - BN