From 72bb1b1166675d421a724b1382f0a2e39a51a197 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn 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) --- patches/050-scinterm-lexlib.patch | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 patches/050-scinterm-lexlib.patch (limited to 'patches') 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