Mercurial > mxe-octave
changeset 3914:774f488e33cd
qscintilla: update to v2.9
* src/qscintilla.mk: update version, checksum
* src/qscintilla-1-transpose-fix.patch: removed file
* src/qscintilla-2-bang-fix.patch: removed file
* dist-files.mk: update for removed files
| author | John Donoghue |
|---|---|
| date | Wed, 22 Apr 2015 09:01:59 -0400 |
| parents | 0267d1a7cffa |
| children | 1aff35ff98c1 |
| files | dist-files.mk src/qscintilla-1-transpose-fix.patch src/qscintilla-2-bang-fix.patch src/qscintilla.mk |
| diffstat | 4 files changed, 2 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Wed Apr 22 20:03:04 2015 -0400 +++ b/dist-files.mk Wed Apr 22 09:01:59 2015 -0400 @@ -559,8 +559,6 @@ qjson.mk \ qrupdate-1-fixes.patch \ qrupdate.mk \ - qscintilla-1-transpose-fix.patch \ - qscintilla-2-bang-fix.patch \ qscintilla.mk \ qt-1-cherrypicks.patch \ qt-test.cpp \
--- a/src/qscintilla-1-transpose-fix.patch Wed Apr 22 20:03:04 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -ur QScintilla-gpl-2.8.3.orig/lexers/LexMatlab.cpp QScintilla-gpl-2.8.3/lexers/LexMatlab.cpp ---- QScintilla-gpl-2.8.3.orig/lexers/LexMatlab.cpp 2014-08-01 07:57:01.175910086 -0400 -+++ QScintilla-gpl-2.8.3/lexers/LexMatlab.cpp 2014-08-01 08:01:05.815912051 -0400 -@@ -213,7 +213,7 @@ - } else if (isalpha(sc.ch)) { - sc.SetState(SCE_MATLAB_KEYWORD); - } else if (isoperator(static_cast<char>(sc.ch)) || sc.ch == '@' || sc.ch == '\\') { -- if (sc.ch == ')' || sc.ch == ']') { -+ if (sc.ch == ')' || sc.ch == ']' || sc.ch == '}') { - transpose = true; - } else { - transpose = false;
--- a/src/qscintilla-2-bang-fix.patch Wed Apr 22 20:03:04 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -diff -ur QScintilla-gpl-2.8.orig/lexers/LexMatlab.cpp QScintilla-gpl-2.8.bang/lexers/LexMatlab.cpp ---- QScintilla-gpl-2.8.orig/lexers/LexMatlab.cpp 2014-01-18 09:19:16 -0500 -+++ QScintilla-gpl-2.8.bang/lexers/LexMatlab.cpp 2014-01-18 17:09:25 -0500 -@@ -57,7 +57,7 @@ - static void ColouriseMatlabOctaveDoc( - unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler, -- bool (*IsCommentChar)(int)) { -+ bool (*IsCommentChar)(int), bool ismatlab) { - - WordList &keywords = *keywordlists[0]; - -@@ -199,7 +199,11 @@ - styler.SetLineState(curLine, commentDepth); - sc.SetState(SCE_MATLAB_COMMENT); - } else if (sc.ch == '!' && sc.chNext != '=' ) { -- sc.SetState(SCE_MATLAB_COMMAND); -+ if (ismatlab) { -+ sc.SetState(SCE_MATLAB_COMMAND); -+ } else { -+ sc.SetState(SCE_MATLAB_OPERATOR); -+ } - } else if (sc.ch == '\'') { - if (transpose) { - sc.SetState(SCE_MATLAB_OPERATOR); -@@ -229,12 +233,12 @@ - - static void ColouriseMatlabDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler) { -- ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar); -+ ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsMatlabCommentChar, true); - } - - static void ColouriseOctaveDoc(unsigned int startPos, int length, int initStyle, - WordList *keywordlists[], Accessor &styler) { -- ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar); -+ ColouriseMatlabOctaveDoc(startPos, length, initStyle, keywordlists, styler, IsOctaveCommentChar, false); - } - - static void FoldMatlabOctaveDoc(unsigned int startPos, int length, int,
--- a/src/qscintilla.mk Wed Apr 22 20:03:04 2015 -0400 +++ b/src/qscintilla.mk Wed Apr 22 09:01:59 2015 -0400 @@ -3,8 +3,8 @@ PKG := qscintilla $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.4 -$(PKG)_CHECKSUM := 7e15c261a7c1842f3a75e4878a880ab667224494 +$(PKG)_VERSION := 2.9 +$(PKG)_CHECKSUM := de807f026ac47d4e9472836c73ab8b8039716c37 $(PKG)_SUBDIR := QScintilla-gpl-$($(PKG)_VERSION) $(PKG)_FILE := QScintilla-gpl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE)