# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1398090019 14400
# Node ID 19fa26d02e6d2db65fec7cac5f430af0595c035b
# Parent  0702284abe694e6996d6921624012cf94d35ee39
qscintilla: update to 2.8.1

* src/qscintilla.mk: update to version 2.8.1.

* src/qscintilla-1-fixes.patch: removed.

* dist-files.mk: removed qscintilla-1-fixes.patch.

diff -r 0702284abe69 -r 19fa26d02e6d dist-files.mk
--- a/dist-files.mk	Wed Apr 23 20:14:24 2014 -0400
+++ b/dist-files.mk	Mon Apr 21 10:20:19 2014 -0400
@@ -502,7 +502,6 @@
   qjson.mk \
   qrupdate-1-fixes.patch \
   qrupdate.mk \
-  qscintilla-1-fixes.patch \
   qscintilla-2-bang-fix.patch \
   qscintilla.mk \
   qt-1-cherrypicks.patch \
diff -r 0702284abe69 -r 19fa26d02e6d src/qscintilla-1-fixes.patch
--- a/src/qscintilla-1-fixes.patch	Wed Apr 23 20:14:24 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt3/qscilexeroctave.cpp
---- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt3/qscilexeroctave.cpp	2013-12-07 12:41:01.000000000 -0500
-+++ QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt3/qscilexeroctave.cpp	2013-12-09 21:30:04.000000000 -0500
-@@ -61,10 +61,13 @@
- {
-     if (set == 1)
-         return
--            "break case catch continue do else elseif end end_unwind_protect "
--            "endfor endfunction endif endswitch endwhile for function "
--            "global if otherwise persistent return switch try until "
--            "unwind_protect unwind_protect_cleanup while";
-+            "__FILE__ __LINE__ break case catch classdef continue do else "
-+            "elseif end end_try_catch end_unwind_protect endclassdef "
-+            "endenumeration endevents endfor endfunction endif endmethods "
-+            "endparfor endproperties endswitch endwhile enumeration events "
-+            "for function get global if methods otherwise parfor persistent "
-+            "properties return set static switch try until unwind_protect "
-+            "unwind_protect_cleanup while";
- 
-     return 0;
- }
-diff -ur QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp
---- QScintilla-gpl-2.8.1-snapshot-194a2142c9b6.orig/Qt4Qt5/qscilexeroctave.cpp	2013-12-07 12:41:01.000000000 -0500
-+++ QScintilla-gpl-2.8.1-snapshot-9ccf1c74f266/Qt4Qt5/qscilexeroctave.cpp	2013-12-09 21:30:04.000000000 -0500
-@@ -61,10 +61,13 @@
- {
-     if (set == 1)
-         return
--            "break case catch continue do else elseif end end_unwind_protect "
--            "endfor endfunction endif endswitch endwhile for function "
--            "global if otherwise persistent return switch try until "
--            "unwind_protect unwind_protect_cleanup while";
-+            "__FILE__ __LINE__ break case catch classdef continue do else "
-+            "elseif end end_try_catch end_unwind_protect endclassdef "
-+            "endenumeration endevents endfor endfunction endif endmethods "
-+            "endparfor endproperties endswitch endwhile enumeration events "
-+            "for function get global if methods otherwise parfor persistent "
-+            "properties return set static switch try until unwind_protect "
-+            "unwind_protect_cleanup while";
- 
-     return 0;
- }
diff -r 0702284abe69 -r 19fa26d02e6d src/qscintilla.mk
--- a/src/qscintilla.mk	Wed Apr 23 20:14:24 2014 -0400
+++ b/src/qscintilla.mk	Mon Apr 21 10:20:19 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := qscintilla
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8
-$(PKG)_CHECKSUM := 3edf9d476d4e6af0706a4d33401667a38e3a697e
+$(PKG)_VERSION  := 2.8.1
+$(PKG)_CHECKSUM := 7eb468ddda24b015c11c5e5a964dc6e692941ad8
 $(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)