Mercurial > mxe-octave

diff src/qscintilla-1-fixes.patch @ 4410:9b1f851080b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscitilla: update to 2.10.1 * src/qscintilla.mk: update version, checksum, use -std=c++11, use _qtX notation of lib names * src/qscintilla-1-fixes.patch: update patch * src/qscintilla-2-matlab-fold.patch: removed patch * src/qscintilla-3-matlab-block-comment.patch: update patch, rename => qscintilla-2-matlab-block-comment.patch * src/qscintilla-4-matlab-end-op.patch: update patch, rename => qscintilla-3-matlab-end-op.patch * dist-files.mk: add qscintilla-2-matlab-block-comment.patch, scintilla-3-matlab-end-op.patch, remove qscintilla-2-matlab-fold.patch qscintilla-4-matlab-end-op.patch qscintilla-3-matlab-block-comment.patch
author John D
date Mon, 10 Jul 2017 17:00:55 -0400
parents 601ff07b0776
children e770e9162424
line wrap: on
line diff
--- a/src/qscintilla-1-fixes.patch	Mon Jul 10 14:31:09 2017 -0400
+++ b/src/qscintilla-1-fixes.patch	Mon Jul 10 17:00:55 2017 -0400
@@ -1,12 +1,12 @@
-diff -ur QScintilla-gpl-2.9.2.orig/Qt4Qt5/qscintilla.pro QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
---- QScintilla-gpl-2.9.2.orig/Qt4Qt5/qscintilla.pro	2016-09-09 09:27:33.180610774 -0400
-+++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro	2016-09-09 09:28:05.519426207 -0400
-@@ -24,7 +24,7 @@
+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
+@@ -23,7 +23,7 @@
+ !win32:VERSION = 13.0.0
  
  TEMPLATE = lib
- TARGET = qscintilla2
--CONFIG += qt warn_off release thread exceptions hide_symbols
+-CONFIG += qt warn_off thread exceptions hide_symbols
 +CONFIG += qt warn_off release thread exceptions
- INCLUDEPATH += . ../include ../lexlib ../src
  
- !CONFIG(staticlib) {
+ CONFIG(debug, debug|release) {
+     mac: {