diff options
author | Andras Timar <andras.timar@collabora.com> | 2016-02-24 11:26:30 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-02-24 11:26:30 +0100 |
commit | 8799c67cc38dc3975aeac71201b63d44951f3a65 (patch) | |
tree | 931ad62e522664dd73097de514e07b0ca90c02ac /external | |
parent | 09284fcfeb1afdeb3454b0966db80888777925a8 (diff) |
recreate failing graphite patch
Change-Id: I38e1015052058f8245eda0800e974486f01bdb27
Diffstat (limited to 'external')
-rw-r--r-- | external/graphite/graphite2.win64.patch.1 | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/external/graphite/graphite2.win64.patch.1 b/external/graphite/graphite2.win64.patch.1 index e7c36c63c21b..a766b54e919f 100644 --- a/external/graphite/graphite2.win64.patch.1 +++ b/external/graphite/graphite2.win64.patch.1 @@ -1,19 +1,6 @@ -diff -ur graphite.org/src/inc/Main.h graphite/src/inc/Main.h ---- graphite.org/src/inc/Main.h 2015-09-07 20:09:25.572279671 +0700 ---- graphite/src/inc/Main.h 2015-09-07 20:09:25.572279671 +0700 -@@ -25,6 +25,9 @@ - of the License or (at your option) any later version. - */ - #pragma once -+#ifdef _WIN32 -+#pragma warning(disable: 4510 4610) -+#endif - - #include <cstdlib> - #include "graphite2/Types.h" diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h ---- graphite.org/src/inc/json.h 2015-02-03 14:49:24.408101900 +0100 -+++ graphite/src/inc/json.h 2015-02-03 14:50:59.697552200 +0100 +--- graphite.org/src/inc/json.h 2016-02-24 11:22:12.001153846 +0100 ++++ graphite/src/inc/json.h 2016-02-24 11:24:18.981152383 +0100 @@ -85,6 +85,9 @@ json & operator << (string) throw(); json & operator << (number) throw(); @@ -24,10 +11,24 @@ diff -ur graphite.org/src/inc/json.h graphite/src/inc/json.h json & operator << (long unsigned int d) throw(); json & operator << (boolean) throw(); json & operator << (_null_t) throw(); +diff -ur graphite.org/src/inc/Main.h graphite/src/inc/Main.h +--- graphite.org/src/inc/Main.h 2016-02-24 11:22:12.001153846 +0100 ++++ graphite/src/inc/Main.h 2016-02-24 11:24:18.981152383 +0100 +@@ -25,6 +25,9 @@ + of the License or (at your option) any later version. + */ + #pragma once ++#ifdef _WIN32 ++#pragma warning(disable: 4510 4610) ++#endif + + #include <cstdlib> + #include "graphite2/Types.h" diff -ur graphite.org/src/json.cpp graphite/src/json.cpp ---- graphite.org/src/json.cpp 2015-02-03 14:49:24.409102000 +0100 -+++ graphite/src/json.cpp 2015-02-03 14:50:49.814986900 +0100 -@@ -134,5 +134,8 @@ +--- graphite.org/src/json.cpp 2016-02-24 11:22:12.001153846 +0100 ++++ graphite/src/json.cpp 2016-02-24 11:24:18.981152383 +0100 +@@ -133,6 +133,9 @@ + } json & json::operator << (json::integer d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } json & json::operator << (long unsigned d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } +#ifdef _WIN64 @@ -37,9 +38,9 @@ diff -ur graphite.org/src/json.cpp graphite/src/json.cpp json & json::operator << (json::_null_t) throw() { context(seq); fputs("null",_stream); return *this; } diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp ---- graphite.org/src/Pass.cpp 2015-02-03 14:49:24.413102200 +0100 -+++ graphite/src/Pass.cpp 2015-02-03 14:50:37.873303900 +0100 -@@ -544,7 +544,7 @@ +--- graphite.org/src/Pass.cpp 2016-02-24 11:22:12.001153846 +0100 ++++ graphite/src/Pass.cpp 2016-02-24 11:24:18.981152383 +0100 +@@ -554,7 +554,7 @@ if (r->rule->preContext > fsm.slots.context()) continue; *fsm.dbgout << json::flat << json::object @@ -48,7 +49,7 @@ diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp << "failed" << true << "input" << json::flat << json::object << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, -r->rule->preContext))) -@@ -558,7 +558,7 @@ +@@ -568,7 +568,7 @@ void Pass::dumpRuleEventOutput(const FiniteStateMachine & fsm, Machine & m, const Rule & r, Slot * const last_slot) const { *fsm.dbgout << json::item << json::flat << json::object @@ -57,3 +58,4 @@ diff -ur graphite.org/src/Pass.cpp graphite/src/Pass.cpp << "failed" << false << "input" << json::flat << json::object << "start" << objectid(dslot(&fsm.slots.segment, input_slot(fsm.slots, 0))) +Only in graphite/src: Pass.cpp.orig |