From 79918fdbb0c566c2b1204ab027c560e2a30e94f8 Mon Sep 17 00:00:00 2001
From: Lauri Nurmi <lanurmi@iki.fi>
Date: Sun, 25 Jun 2017 13:16:44 +0300
Subject: [PATCH 1/3] Fix Scintilla compilation: include <algorithm> required
 for std::lower_bound

Compilation failed on CentOS 6.

Already fixed upstream:
https://sourceforge.net/p/scintilla/code/ci/e200a290ef8af55474b3b2d8eede21d375bc10dc/tree/lexers/LexProgress.cxx?diff=549924076878b10a962218b54f55a348a8a82214
---
 src/stc/scintilla/lexers/LexProgress.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/stc/scintilla/lexers/LexProgress.cxx b/src/stc/scintilla/lexers/LexProgress.cxx
index cede44ebea..1a7c52503b 100644
--- a/src/stc/scintilla/lexers/LexProgress.cxx
+++ b/src/stc/scintilla/lexers/LexProgress.cxx
@@ -25,6 +25,7 @@ Differentiate between labels and variables
 #include <string>
 #include <vector>
 #include <map>
+#include <algorithm>
 
 #include "ILexer.h"
 #include "Scintilla.h"

From 147d965f12cec99f41c2b7986dc1fd569d35f957 Mon Sep 17 00:00:00 2001
From: Lauri Nurmi <lanurmi@iki.fi>
Date: Sun, 25 Jun 2017 13:42:03 +0300
Subject: [PATCH 2/3] Fix gen_iface.py to be compatible with python <2.7

In python <2.7, a dictionary without values is invalid syntax.
---
 src/stc/gen_iface.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 1cc18062fe..cbba253924 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -72,14 +72,14 @@ FUNC_FOR_CMD = 1
 GENERATE_PROVISIONAL_ITEMS = 0
 
 # No wxSTC value will be generated for the following Scintilla values.
-notMappedSciValues = {
+notMappedSciValues = set([
     'SC_TECHNOLOGY_DIRECTWRITERETAIN',
     'SC_TECHNOLOGY_DIRECTWRITEDC',
     'INDIC0_MASK',
     'INDIC1_MASK',
     'INDIC2_MASK',
     'INDICS_MASK'
-}
+])
 
 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {

From b8f83725ed02538526c2d74a087634a9f26586e4 Mon Sep 17 00:00:00 2001
From: Oliver Smith <kfsone@gmail.com>
Date: Wed, 28 Jun 2017 02:51:30 +0200
Subject: [PATCH 3/3] Fix D2D wxGraphics build with wxUSE_UNICODE==0

Revert one of the changes of 5520702674951fa03008ae1101c7e1cbb532d846 which
replaced direct check with a call to lstrlen() which seems to be unneeded and
doesn't compile in non-Unicode build.
---
 src/msw/graphicsd2d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index e420519457..cd9d7e9684 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -2614,7 +2614,7 @@ wxD2DFontData::wxD2DFontData(wxGraphicsRenderer* renderer, ID2D1Factory* d2dFact
     wxCHECK_RET( n > 0, wxS("Failed to obtain font info") );
 
     // Ensure the LOGFONT object contains the correct font face name
-    if (lstrlen(logfont.lfFaceName) == 0)
+    if (logfont.lfFaceName[0] == L'\0')
     {
         // The length of the font name must not exceed LF_FACESIZE TCHARs,
         // including the terminating NULL.