diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/010-scintilla-teco-control-codes.patch (renamed from patches/scintilla-teco-control-codes.patch) | 8 | ||||
| -rw-r--r-- | patches/020-scinterm-fix-64-bit.patch (renamed from patches/scinterm-fix-64-bit.patch) | 4 | ||||
| -rw-r--r-- | patches/030-scinterm-crosscompile.patch | 19 | ||||
| -rw-r--r-- | patches/035-scinterm-curses-header.patch | 11 |
4 files changed, 36 insertions, 6 deletions
diff --git a/patches/scintilla-teco-control-codes.patch b/patches/010-scintilla-teco-control-codes.patch index 55e52ad..f479909 100644 --- a/patches/scintilla-teco-control-codes.patch +++ b/patches/010-scintilla-teco-control-codes.patch @@ -2,8 +2,8 @@ Hacks Scintilla to display control characters like TECO does: Caret followed by code+64 with a few exceptions. Also improves Scinterm's heuristics for printing control characters. ---- scintilla/src/Editor.cxx 2013-01-19 21:51:58.002270685 +0100 -+++ scintilla/src/Editor.cxx 2013-01-20 02:07:27.212272030 +0100 +--- a/scintilla/src/Editor.cxx 2013-01-19 21:51:58.002270685 +0100 ++++ b/scintilla/src/Editor.cxx 2013-01-20 02:07:27.212272030 +0100 @@ -351,10 +351,10 @@ const char *ControlCharacterString(unsigned char ch) { @@ -19,8 +19,8 @@ characters. }; if (ch < (sizeof(reps) / sizeof(reps[0]))) { return reps[ch]; ---- scintilla/scinterm/ScintillaTerm.cxx 2013-01-19 23:49:46.092268831 +0100 -+++ scintilla/scinterm/ScintillaTerm.cxx 2013-01-20 01:55:36.213521263 +0100 +--- a/scintilla/scinterm/ScintillaTerm.cxx 2013-01-19 23:49:46.092268831 +0100 ++++ b/scintilla/scinterm/ScintillaTerm.cxx 2013-01-20 01:55:36.213521263 +0100 @@ -290,8 +290,7 @@ void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, diff --git a/patches/scinterm-fix-64-bit.patch b/patches/020-scinterm-fix-64-bit.patch index 2196b03..47c7e6d 100644 --- a/patches/scinterm-fix-64-bit.patch +++ b/patches/020-scinterm-fix-64-bit.patch @@ -1,7 +1,7 @@ Fixes (void *) to (attr_t) casting on certain target configurations where sizeof(attr_t) < sizeof(void *) ---- scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:22:04.864167902 +0100 -+++ scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:44:48.832401507 +0100 +--- a/scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:22:04.864167902 +0100 ++++ b/scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:44:48.832401507 +0100 @@ -9,6 +9,7 @@ #include <stdio.h> #include <stdlib.h> diff --git a/patches/030-scinterm-crosscompile.patch b/patches/030-scinterm-crosscompile.patch new file mode 100644 index 0000000..e4bcd46 --- /dev/null +++ b/patches/030-scinterm-crosscompile.patch @@ -0,0 +1,19 @@ +--- a/scintilla/scinterm/Makefile 2013-02-18 20:41:07.357813654 +0100 ++++ b/scintilla/scinterm/Makefile 2013-02-18 20:42:31.535828138 +0100 +@@ -2,6 +2,7 @@ + + .SUFFIXES: .cxx .c .o .h .a + ++AR = ar + CXX = g++ + INCLUDEDIRS = -I ../include -I ../src -I ../lexlib + CXXFLAGS = -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long \ +@@ -30,7 +31,7 @@ + CharacterSet.o LexerBase.o LexerModule.o LexerNoExceptions.o \ + LexerSimple.o PropSetSimple.o StyleContext.o WordList.o \ + $(lexers) ScintillaTerm.o +- ar rc $@ $^ ++ $(AR) rc $@ $^ + touch $@ + clean: + rm -f *.o $(scintilla) diff --git a/patches/035-scinterm-curses-header.patch b/patches/035-scinterm-curses-header.patch new file mode 100644 index 0000000..fbce286 --- /dev/null +++ b/patches/035-scinterm-curses-header.patch @@ -0,0 +1,11 @@ +--- a/scintilla/scinterm/ScintillaTerm.cxx 2013-03-19 18:32:55.511861027 +0100 ++++ b/scintilla/scinterm/ScintillaTerm.cxx 2013-03-19 18:33:05.747736822 +0100 +@@ -15,7 +15,7 @@ + #include <vector> + #include <map> + +-#include <ncurses.h> ++#include <curses.h> + + #include "Platform.h" + |