From 72bb1b1166675d421a724b1382f0a2e39a51a197 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Wed, 20 Aug 2014 19:40:29 +0200
Subject: updated minimum required Scintilla version to 3.4.2 and Scinterm to
 v1.3

 * this allows us to remove the last patch to the Scintilla/Scinterm code
   base (for the time being at least)
---
 INSTALL                           |  6 +++---
 distribute                        |  4 ++--
 patches/050-scinterm-lexlib.patch | 17 -----------------
 3 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 patches/050-scinterm-lexlib.patch

diff --git a/INSTALL b/INSTALL
index d2e6726..52dc083 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,10 +16,10 @@ SciTECO Build and Runtime Dependencies
  * Autotools, GNU C/C++ (v4.4 or later) or LLVM/gcc or LLVM/Clang
  * Glib 2 as a cross-platform runtime library:
    https://launchpad.net/~robin-haberkorn/+archive/sciteco
- * Scintilla (v3.3.7 or later):
+ * Scintilla (v3.4.2 to v3.4.4):
    http://www.scintilla.org/
  * Curses interface:
-   * Scinterm (v1.2 or later):
+   * Scinterm (v1.3 or later):
      http://foicica.com/scinterm/
    * NCurses (http://www.gnu.org/software/ncurses/),
      PDCurses/XCurses (http://pdcurses.sourceforge.net/) or
@@ -84,7 +84,7 @@ from a source bundle:
    Usually you unpack Scinterm into a subdirectory of Scintilla
    and run make...
  * But before that, apply the patches contained in the SciTECO
-   sources: patches/*.patch
+   sources if there are any: patches/*.patch
    For instance:
    # cd ~/scintilla
    # for patch in SCITECO_PATH/patches/*.patch; do
diff --git a/distribute b/distribute
index 2af9c6c..0f94c44 100755
--- a/distribute
+++ b/distribute
@@ -3,10 +3,10 @@
 SCITECO_VERSION = 0.6
 SCITECO_SRC = sciteco-$(SCITECO_VERSION).tar.gz
 
-SCINTILLA_VERSION = 339
+SCINTILLA_VERSION = 344
 SCINTILLA_SRC = scintilla$(SCINTILLA_VERSION).tgz
 
-SCINTERM_VERSION = 1.2
+SCINTERM_VERSION = 1.3
 SCINTERM_SRC = scinterm_$(SCINTERM_VERSION).zip
 
 $(SCITECO_SRC):
diff --git a/patches/050-scinterm-lexlib.patch b/patches/050-scinterm-lexlib.patch
deleted file mode 100644
index bdc3fd8..0000000
--- a/patches/050-scinterm-lexlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Link the entire lexlib into Scinterm's scintilla.a.
-The author forgot to add CharacterCategory.o.
---- a/scintilla/scinterm/Makefile	2014-02-16 06:44:03.572368461 +0100
-+++ b/scintilla/scinterm/Makefile	2014-02-16 06:47:07.495772994 +0100
-@@ -28,9 +28,9 @@
-               Document.o Editor.o ExternalLexer.o Indicator.o KeyMap.o \
-               LineMarker.o PerLine.o PositionCache.o RESearch.o RunStyles.o \
-               ScintillaBase.o Selection.o Style.o UniConversion.o ViewStyle.o \
--              XPM.o Accessor.o CharacterSet.o LexerBase.o LexerModule.o \
--              LexerNoExceptions.o LexerSimple.o PropSetSimple.o StyleContext.o \
--              WordList.o $(lexers) ScintillaTerm.o
-+              XPM.o Accessor.o CharacterCategory.o CharacterSet.o LexerBase.o \
-+              LexerModule.o LexerNoExceptions.o LexerSimple.o PropSetSimple.o \
-+              StyleContext.o WordList.o $(lexers) ScintillaTerm.o
- 	$(AR) rc $@ $^
- 	touch $@
- clean:
-- 
cgit v1.2.3