diff options
| author | Andras Timar <andras.timar@collabora.com> | 2016-11-11 11:31:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-11-11 16:11:03 +0000 |
| commit | 0220020a620a69eae493070ddd88cc74825400b1 (patch) | |
| tree | b1a663dafd543ebed75f643aa62e86b268a6d6b4 /external/graphite | |
| parent | f908ec9c2230a65db309fe5ed3e43390d72bbe51 (diff) | |
new release of Graphite lib: 1.3.9
Change-Id: I4e9a7ebf323848a03e02da3e9ed39377d1df6715
Reviewed-on: https://gerrit.libreoffice.org/30771
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external/graphite')
| -rw-r--r-- | external/graphite/graphite2.win64.patch.1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/external/graphite/graphite2.win64.patch.1 b/external/graphite/graphite2.win64.patch.1 index 4e1172ad8222..d7cf11e63189 100644 --- a/external/graphite/graphite2.win64.patch.1 +++ b/external/graphite/graphite2.win64.patch.1 @@ -21,7 +21,7 @@ diff -urN graphite2-1.3.4.orig/src/inc/Main.h graphite2-1.3.4/src/inc/Main.h +#ifdef _WIN32 +#pragma warning(disable: 4510 4610) +#endif - + #include <cstdlib> #include "graphite2/Types.h" diff -urN graphite2-1.3.4.orig/src/json.cpp graphite2-1.3.4/src/json.cpp @@ -36,11 +36,11 @@ diff -urN graphite2-1.3.4.orig/src/json.cpp graphite2-1.3.4/src/json.cpp +#endif json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ? "true" : "false", _stream); return *this; } json & json::operator << (json::_null_t) throw() { context(seq); fputs("null",_stream); return *this; } - + diff -urN graphite2-1.3.4.orig/src/Pass.cpp graphite2-1.3.4/src/Pass.cpp --- graphite2-1.3.4.orig/src/Pass.cpp 2015-12-22 14:25:46.399566417 +0100 +++ graphite2-1.3.4/src/Pass.cpp 2015-12-22 14:26:13.439722846 +0100 -@@ -554,7 +554,7 @@ +@@ -568,7 +568,7 @@ if (r->rule->preContext > fsm.slots.context()) continue; *fsm.dbgout << json::flat << json::object @@ -49,8 +49,8 @@ diff -urN graphite2-1.3.4.orig/src/Pass.cpp graphite2-1.3.4/src/Pass.cpp << "failed" << true << "input" << json::flat << json::object << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, -r->rule->preContext))) -@@ -568,7 +568,7 @@ - void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, Machine & m, const Rule & r, Slot * const last_slot) const +@@ -582,7 +582,7 @@ + void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, const Rule & r, Slot * const last_slot) const { *fsm.dbgout << json::item << json::flat << json::object - << "id" << &r - m_rules |