From ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Mon, 12 Mar 2018 18:20:24 -0400
Subject: Start using Scintilla's LongTerm3, which now includes Scintillua and
Scinterm. Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required.
Since C++11 includes regex capability, drop TRE dependency.
---
src/scintilla_backports/6342_52f12c3eebcd.patch | 69 -------------------------
1 file changed, 69 deletions(-)
delete mode 100644 src/scintilla_backports/6342_52f12c3eebcd.patch
(limited to 'src/scintilla_backports/6342_52f12c3eebcd.patch')
diff --git a/src/scintilla_backports/6342_52f12c3eebcd.patch b/src/scintilla_backports/6342_52f12c3eebcd.patch
deleted file mode 100644
index 6f7a340a..00000000
--- a/src/scintilla_backports/6342_52f12c3eebcd.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-# HG changeset patch
-# User Justin Dailey
-# Date 1499559915 -36000
-# Node ID 52f12c3eebcd37757503136e1c3a3c693120c50b
-# Parent 040330eec86d765ffdaffe85e55b30c794302c2b
-Bug [#1955]. The data parameter to ILoader::AddData made const.
-
-diff -r 040330eec86d -r 52f12c3eebcd doc/ScintillaDoc.html
---- a/doc/ScintillaDoc.html Sun Jul 09 10:03:53 2017 +1000
-+++ b/doc/ScintillaDoc.html Sun Jul 09 10:25:15 2017 +1000
-@@ -5761,7 +5761,7 @@
- public:
- virtual int SCI_METHOD Release() = 0;
- // Returns a status code from SC_STATUS_*
-- virtual int SCI_METHOD AddData(char *data, int length) = 0;
-+ virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
- virtual void * SCI_METHOD ConvertToDocument() = 0;
- };
-
-diff -r 040330eec86d -r 52f12c3eebcd doc/ScintillaHistory.html
---- a/doc/ScintillaHistory.html Sun Jul 09 10:03:53 2017 +1000
-+++ b/doc/ScintillaHistory.html Sun Jul 09 10:25:15 2017 +1000
-@@ -542,6 +542,10 @@
- An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
-
-
-+ The data parameter to ILoader::AddData made const.
-+ Bug #1955.
-+
-+
- SciTE's embedded Lua interpreter updated to Lua 5.3.
-
-
-diff -r 040330eec86d -r 52f12c3eebcd include/ILexer.h
---- a/include/ILexer.h Sun Jul 09 10:03:53 2017 +1000
-+++ b/include/ILexer.h Sun Jul 09 10:25:15 2017 +1000
-@@ -85,7 +85,7 @@
- public:
- virtual int SCI_METHOD Release() = 0;
- // Returns a status code from SC_STATUS_*
-- virtual int SCI_METHOD AddData(char *data, Sci_Position length) = 0;
-+ virtual int SCI_METHOD AddData(const char *data, Sci_Position length) = 0;
- virtual void * SCI_METHOD ConvertToDocument() = 0;
- };
-
-diff -r 040330eec86d -r 52f12c3eebcd src/Document.cxx
---- a/src/Document.cxx Sun Jul 09 10:03:53 2017 +1000
-+++ b/src/Document.cxx Sun Jul 09 10:25:15 2017 +1000
-@@ -1138,7 +1138,7 @@
- insertion.assign(s, length);
- }
-
--int SCI_METHOD Document::AddData(char *data, Sci_Position length) {
-+int SCI_METHOD Document::AddData(const char *data, Sci_Position length) {
- try {
- Sci::Position position = static_cast(Length());
- InsertString(position, data, static_cast(length));
-diff -r 040330eec86d -r 52f12c3eebcd src/Document.h
---- a/src/Document.h Sun Jul 09 10:03:53 2017 +1000
-+++ b/src/Document.h Sun Jul 09 10:25:15 2017 +1000
-@@ -316,7 +316,7 @@
- bool DeleteChars(Sci::Position pos, Sci::Position len);
- Sci::Position InsertString(Sci::Position position, const char *s, Sci::Position insertLength);
- void ChangeInsertion(const char *s, Sci::Position length);
-- int SCI_METHOD AddData(char *data, Sci_Position length);
-+ int SCI_METHOD AddData(const char *data, Sci_Position length);
- void * SCI_METHOD ConvertToDocument();
- Sci::Position Undo();
- Sci::Position Redo();
--
cgit v1.2.3