2 files changed, 43 insertions, 22 deletions
diff --git a/sciteco/patches/0001-glib2-version.patch b/sciteco/patches/0001-glib2-version.patch
new file mode 100644
index 0000000..8fe3840
--- /dev/null
+++ b/sciteco/patches/0001-glib2-version.patch
@@ -0,0 +1,43 @@
+NanoNote's OpenWRT fork only has glib2 v2.26.1
+This turns out to be sufficient
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,7 +77,7 @@ AC_SUBST(DOXYGEN_HAVE_DOT)
+ AC_CHECK_PROG(SCITECO, sciteco, sciteco)
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(LIBGLIB, [glib-2.0 >= 2.28], [
++PKG_CHECK_MODULES(LIBGLIB, [glib-2.0 >= 2.26.1], [
+ 	CFLAGS="$CFLAGS $LIBGLIB_CFLAGS"
+ 	CXXFLAGS="$CXXFLAGS $LIBGLIB_CFLAGS"
+ 	LIBS="$LIBS $LIBGLIB_LIBS"
+--- a/src/sciteco.h	2015-09-22 04:44:52.941205805 +0200
++++ b/src/sciteco.h	2015-09-22 04:52:31.705192570 +0200
+@@ -24,6 +24,11 @@
+ 
+ #include "interface.h"
+ 
++#if !GLIB_CHECK_VERSION(2,28,0)
++#define g_slist_free_full(LIST,FUNC) \
++        g_slist_foreach(LIST, (GFunc)FUNC, NULL)
++#endif
++
+ namespace SciTECO {
+ 
+ #if TECO_INTEGER == 32
+--- a/src/spawn.cpp	2015-09-22 04:56:34.069185578 +0200
++++ b/src/spawn.cpp	2015-09-22 04:58:58.089181423 +0200
+@@ -73,6 +73,13 @@
+ 
+ #endif
+ 
++#ifndef G_SOURCE_CONTINUE
++#define G_SOURCE_CONTINUE TRUE
++#endif
++#ifndef G_SOURCE_REMOVE
++#define G_SOURCE_REMOVE FALSE
++#endif
++
+ namespace SciTECO {
+ 
+ namespace States {
diff --git a/sciteco/patches/0001-scinterm-build.patch b/sciteco/patches/0001-scinterm-build.patch
deleted file mode 100644
index 948e504..0000000
--- a/sciteco/patches/0001-scinterm-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/scintilla/scinterm/Makefile	2012-12-11 01:26:02.000000000 +0100
-+++ b/scintilla/scinterm/Makefile	2013-01-24 01:30:55.806042954 +0100
-@@ -4,8 +4,8 @@
- 
- CXX = g++
- INCLUDEDIRS = -I ../include -I ../src -I ../lexlib
--CXXFLAGS = -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long \
--           -pedantic -DNCURSES -DSCI_LEXER $(INCLUDEDIRS)
-+CXXFLAGS += -Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long \
-+            -pedantic -DNCURSES -DSCI_LEXER $(INCLUDEDIRS)
- ifdef DEBUG
-   CXXFLAGS += -DDEBUG -g
- else
-@@ -30,7 +30,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)