From d255bd6711955192f98bed8bf0b98872dab7fca6 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Fri, 7 Apr 2017 18:10:12 -0400
Subject: Effectively updated to Scintilla 3.7.4 with select backports to
 3.7.3. Scintilla 3.7.4 requires a C++11 compiler, which I do not have.

---
 src/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index fa5f3e16..f0c7fc36 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -425,10 +425,15 @@ bombay_zip = bombay.zip
 cloc = cloc-1.60.pl
 
 $(scintilla_tgz): ; wget http://prdownloads.sourceforge.net/scintilla/$@ -O $@
-scintilla: scintilla.patch | $(scintilla_tgz)
-	if [ -d $@ ]; then rm -r $@; fi
-	mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@
-	patch -d $@ -N -p1 < $<
+scintilla: $(wildcard scintilla_backports/*.patch) scintilla.patch | \
+           $(scintilla_tgz)
+	if [ -d $@/.hg ]; then \
+		hg --cwd $@ update -C -r rel-3-7-3; \
+	else \
+		if [ -d $@ ]; then rm -r $@; fi; \
+		mkdir $@ && tar xzf $| -C $@ && mv $@/*/* $@; \
+	fi
+	for patch in $^; do echo Applying $$patch; patch -d $@ -N -p1 < $$patch; done
 $(tre_zip): ; wget https://github.com/laurikari/tre/archive/$@ -O $@
 tre: tre.patch | $(tre_zip)
 	if [ -d $@ ]; then rm -r $@; fi
-- 
cgit v1.2.3