[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/graphite

[Tomáš Chvátal]

 external/graphite/graphite2.win64.patch.1 |   51 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 25 deletions(-)

New commits:
commit 1b436e4635a4567dcb5324ec4643b541caac8b26
Author: Tomáš Chvátal <tchvatal at suse.com>
Date:   Tue Dec 22 15:41:25 2015 +0100

    Refresh graphite2.win64.patch.1 to apply using sle11 patch binary.
    
    Change-Id: If43ca99631fab5a3a04e7dead9b694cf52944666
    Reviewed-on: https://gerrit.libreoffice.org/20882
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/21193
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/external/graphite/graphite2.win64.patch.1 b/external/graphite/graphite2.win64.patch.1
index e7c36c6..4e1172a 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
+diff -urN graphite2-1.3.4.orig/src/inc/json.h graphite2-1.3.4/src/inc/json.h
+--- graphite2-1.3.4.orig/src/inc/json.h	2015-12-22 14:25:46.403566441 +0100
++++ graphite2-1.3.4/src/inc/json.h	2015-12-22 14:26:13.439722846 +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/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 @@
+diff -urN graphite2-1.3.4.orig/src/inc/Main.h graphite2-1.3.4/src/inc/Main.h
+--- graphite2-1.3.4.orig/src/inc/Main.h	2015-12-22 14:25:46.399566417 +0100
++++ graphite2-1.3.4/src/inc/Main.h	2015-12-22 14:26:13.439722846 +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 -urN graphite2-1.3.4.orig/src/json.cpp graphite2-1.3.4/src/json.cpp
+--- graphite2-1.3.4.orig/src/json.cpp	2015-12-22 14:25:46.399566417 +0100
++++ graphite2-1.3.4/src/json.cpp	2015-12-22 14:26:13.439722846 +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
@@ -36,10 +37,10 @@ diff -ur graphite.org/src/json.cpp graphite/src/json.cpp
  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 -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 @@
+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 @@
          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