Mercurial > mxe-octave

changeset 4975:e770e9162424

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update to v2.1..1 * dist-files.mk: remove old patch file refs * src/qscintilla-1-fixes.patch: update patch * src/qscintilla.mk: update version, checksum * src/qscintilla-2-matlab-block-comment.patch, src/qscintilla-3-matlab-end-op.patch, src/qscintilla-4-matlab-while-fold.patch: remove patch files
author John Donoghue
date Tue, 26 Feb 2019 14:08:32 -0500
parents b105f055a6fe
children 443463cb9e4a
files dist-files.mk src/qscintilla-1-fixes.patch src/qscintilla-2-matlab-block-comment.patch src/qscintilla-3-matlab-end-op.patch src/qscintilla-4-matlab-while-fold.patch src/qscintilla.mk
diffstat 6 files changed, 8 insertions(+), 126 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue Feb 26 11:37:37 2019 -0500
+++ b/dist-files.mk	Tue Feb 26 14:08:32 2019 -0500
@@ -619,9 +619,6 @@
   qrupdate-1-fixes.patch \
   qrupdate.mk \
   qscintilla-1-fixes.patch \
-  qscintilla-2-matlab-block-comment.patch \
-  qscintilla-3-matlab-end-op.patch \
-  qscintilla-4-matlab-while-fold.patch \
   qscintilla.mk \
   qt-1-cherrypicks.patch \
   qt-2-shared-tools-fixes.patch \
--- a/src/qscintilla-1-fixes.patch	Tue Feb 26 11:37:37 2019 -0500
+++ b/src/qscintilla-1-fixes.patch	Tue Feb 26 14:08:32 2019 -0500
@@ -1,8 +1,8 @@
-diff -ur QScintilla_gpl-2.10.1.orig/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.10.1/Qt4Qt5/qscintilla.pro
---- QScintilla_gpl-2.10.1.orig/Qt4Qt5/qscintilla.pro	2017-07-05 08:05:16.558914764 -0400
-+++ QScintilla_gpl-2.10.1/Qt4Qt5/qscintilla.pro	2017-07-05 08:05:34.640424452 -0400
+diff -ur QScintilla_gpl-2.11.1.orig/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.11.1/Qt4Qt5/qscintilla.pro
+--- QScintilla_gpl-2.11.1.orig/Qt4Qt5/qscintilla.pro	2019-02-26 13:51:51.426342211 -0500
++++ QScintilla_gpl-2.11.1/Qt4Qt5/qscintilla.pro	2019-02-26 13:52:39.639554334 -0500
 @@ -23,7 +23,7 @@
- !win32:VERSION = 13.0.0
+ !win32:VERSION = 15.0.0
  
  TEMPLATE = lib
 -CONFIG += qt warn_off thread exceptions hide_symbols
@@ -10,3 +10,4 @@
  
  CONFIG(debug, debug|release) {
      mac: {
+Only in QScintilla_gpl-2.11.1/Qt4Qt5: qscintilla.pro.orig
--- a/src/qscintilla-2-matlab-block-comment.patch	Tue Feb 26 11:37:37 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-diff -ur QScintilla_gpl-2.10.1.orig/lexers/LexMatlab.cpp QScintilla_gpl-2.10.1/lexers/LexMatlab.cpp
---- QScintilla_gpl-2.10.1.orig/lexers/LexMatlab.cpp	2017-07-05 08:05:16.545914398 -0400
-+++ QScintilla_gpl-2.10.1/lexers/LexMatlab.cpp	2017-07-05 08:19:56.616722104 -0400
-@@ -73,6 +73,15 @@
- 	return 0;
- }
- 
-+static bool IsSpaceToEOL(Sci_PositionU startPos, Accessor &styler) {
-+        Sci_Position line = styler.GetLine(startPos);
-+	Sci_PositionU eol_pos = styler.LineStart(line + 1) - 1;
-+	for (Sci_PositionU i = startPos; i < eol_pos; i++) {
-+		char ch = styler[i];
-+		if(!IsASpace(ch)) return false;
-+	}
-+	return true;
-+}
- 
- static void ColouriseMatlabOctaveDoc(
-             Sci_PositionU startPos, Sci_Position length, int initStyle,
-@@ -180,7 +189,7 @@
- 			}
- 		} else if (sc.state == SCE_MATLAB_COMMENT) {
- 			// end or start of a nested a block comment?
--			if( IsCommentChar(sc.ch) && sc.chNext == '}' && nonSpaceColumn == column) {
-+			if( IsCommentChar(sc.ch) && sc.chNext == '}' && nonSpaceColumn == column && IsSpaceToEOL(sc.currentPos+2, styler)) {
-                            	if(commentDepth > 0) commentDepth --;
- 
- 				curLine = styler.GetLine(sc.currentPos);
-@@ -192,7 +201,7 @@
- 					transpose = false;
- 				}
-                         }
--                        else if( IsCommentChar(sc.ch) && sc.chNext == '{' && nonSpaceColumn == column)
-+                        else if( IsCommentChar(sc.ch) && sc.chNext == '{' && nonSpaceColumn == column && IsSpaceToEOL(sc.currentPos+2, styler))
-                         {
-  				commentDepth ++;
- 
-@@ -213,9 +222,12 @@
- 		// check start of a new state
- 		if (sc.state == SCE_MATLAB_DEFAULT) {
- 			if (IsCommentChar(sc.ch)) {
--				// ncrement depth if we are a block comment
--				if(sc.chNext == '{' && nonSpaceColumn == column)
--					commentDepth ++;
-+				// Increment depth if we are a block comment
-+				if(sc.chNext == '{' && nonSpaceColumn == column) {
-+					if(IsSpaceToEOL(sc.currentPos+2, styler)) {
-+						commentDepth ++;
-+					}
-+				}
- 				curLine = styler.GetLine(sc.currentPos);
- 				styler.SetLineState(curLine, commentDepth);
- 				sc.SetState(SCE_MATLAB_COMMENT);
-@@ -288,9 +300,9 @@
- 		// a line that starts with a comment
- 		if (style == SCE_MATLAB_COMMENT && IsComment(ch) && visibleChars == 0) {
- 			// start/end of block comment 
--			if (chNext == '{')
-+			if (chNext == '{' && IsSpaceToEOL(i+2, styler))
- 				levelNext ++;
--			if (chNext == '}')
-+			if (chNext == '}' && IsSpaceToEOL(i+2, styler))
- 				levelNext --;
- 		}
- 		// keyword
-Only in QScintilla_gpl-2.10.1/lexers: LexMatlab.cpp.orig
-Only in QScintilla_gpl-2.10.1/lexers: LexMatlab.cpp.rej
--- a/src/qscintilla-3-matlab-end-op.patch	Tue Feb 26 11:37:37 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-diff -ur QScintilla_gpl-2.10.1.orig/lexers/LexMatlab.cpp QScintilla_gpl-2.10.1/lexers/LexMatlab.cpp
---- QScintilla_gpl-2.10.1.orig/lexers/LexMatlab.cpp	2017-07-05 08:21:58.527158553 -0400
-+++ QScintilla_gpl-2.10.1/lexers/LexMatlab.cpp	2017-07-05 08:22:26.304941561 -0400
-@@ -97,6 +97,9 @@
- 	// of a string
- 	bool transpose = false;
- 
-+	// count for brackets for when 'end' could be an operator not a keyword
-+	int allow_end_op = 0;
-+
- 	// approximate position of first non space character in a line
- 	int nonSpaceColumn = -1;
- 	// approximate column position of the current character in a line
-@@ -151,6 +154,9 @@
- 				char s[100];
- 				sc.GetCurrentLowered(s, sizeof(s));
- 				if (keywords.InList(s)) {
-+					if (strcmp ("end", s) == 0 && allow_end_op > 0) {
-+						sc.ChangeState(SCE_MATLAB_NUMBER);
-+					}
- 					sc.SetState(SCE_MATLAB_DEFAULT);
- 					transpose = false;
- 				} else {
-@@ -250,6 +256,12 @@
- 			} 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 == '[' || sc.ch == '{') {
-+					allow_end_op ++;
-+				} else if ((sc.ch == ')' || sc.ch == ']' || sc.ch == '}') && (allow_end_op > 0)) {
-+					allow_end_op --;
-+				}
-+
- 				if (sc.ch == ')' || sc.ch == ']' || sc.ch == '}') {
- 					transpose = true;
- 				} else {
-Only in QScintilla_gpl-2.10.1/lexers: LexMatlab.cpp.orig
-Only in QScintilla_gpl-2.10.1/lexers: LexMatlab.cpp.rej
--- a/src/qscintilla-4-matlab-while-fold.patch	Tue Feb 26 11:37:37 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -ur QScintilla_gpl-2.10.2.orig/lexers/LexMatlab.cpp QScintilla_gpl-2.10.2/lexers/LexMatlab.cpp
---- QScintilla_gpl-2.10.2.orig/lexers/LexMatlab.cpp	2018-01-02 08:15:29.183313917 -0500
-+++ QScintilla_gpl-2.10.2/lexers/LexMatlab.cpp	2018-01-02 08:16:40.754287756 -0500
-@@ -62,6 +62,7 @@
- 	if (strcmp ("if", str) == 0 ||
- 		strcmp ("for", str) == 0 ||
- 		strcmp ("switch", str) == 0 ||
-+		strcmp ("while", str) == 0 ||
- 		strcmp ("try", str) == 0 ||
- 		strcmp ("do", str) == 0 ||
- 		strcmp ("parfor", str) == 0 ||
--- a/src/qscintilla.mk	Tue Feb 26 11:37:37 2019 -0500
+++ b/src/qscintilla.mk	Tue Feb 26 14:08:32 2019 -0500
@@ -3,11 +3,11 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.10.8
-$(PKG)_CHECKSUM := 678f24ef98045eb40c29801b9abf1cbf8ca35e8e
+$(PKG)_VERSION  := 2.11.1
+$(PKG)_CHECKSUM := be05da5b4b548c650d8cc18370680b8f030c9f09
 $(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)
+$(PKG)_URL      := https://www.riverbankcomputing.com/static/Downloads/QScintilla//$($(PKG)_FILE)
 
 
 ifeq ($(ENABLE_QT5),yes)