6 files changed, 115 insertions, 49 deletions

diff --git a/x11-toolkits/scintilla/files/patch-gtk_makefile b/x11-toolkits/scintilla/files/patch-gtk_makefile
new file mode 100644
index 000000000000..d569907be131
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-gtk_makefile
@@ -0,0 +1,39 @@
+--- gtk/makefile.orig	2020-09-11 10:44:28 UTC
++++ gtk/makefile
+@@ -16,8 +16,6 @@ basedir = $(srcdir)/..
+ 
+ WARNINGS = -Wpedantic -Wall
+ ifdef CLANG
+-CXX = clang++
+-CC = clang
+ WARNINGS += -Wno-deprecated-register
+ ifdef windir
+ # Turn off some warnings that occur when Clang is being used on Windows where it
+@@ -35,7 +33,7 @@ endif
+ # thread also need to create Position Independent Executable -> search online documentation
+ SANITIZE = address
+ #SANITIZE = undefined
+-BASE_FLAGS += -fsanitize=$(SANITIZE)
++#BASE_FLAGS += -fsanitize=$(SANITIZE)
+ endif
+ ARFLAGS = rc
+ RANLIB ?= ranlib
+@@ -69,7 +67,8 @@ DEL = rm -f
+ LEXILLA = liblexilla.so
+ endif
+ COMPLIB=$(basedir)/bin/scintilla.a
+-COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
++SONAME=libscintilla.$(SHAREDEXTENSION)
++COMPONENT=$(basedir)/bin/$(SONAME)
+ 
+ vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
+ vpath %.c $(srcdir)
+@@ -185,7 +184,7 @@ $(COMPLIB): $(SRC_OBJS) $(LEXLIBL_OBJS) $(GTK_OBJS) $(
+ 	$(RANLIB) $@
+ 
+ $(COMPONENT): $(SRC_OBJS) $(LEXLIBS_OBJS) $(GTK_OBJS) $(MARSHALLER)
+-	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
++	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@ $(CONFIGLIB)
+ 
+ Catalogue.o: Catalogue.cxx
+ 	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
diff --git a/x11-toolkits/scintilla/files/patch-lexilla_src_makefile b/x11-toolkits/scintilla/files/patch-lexilla_src_makefile
new file mode 100644
index 000000000000..23b16e320df7
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-lexilla_src_makefile
@@ -0,0 +1,27 @@
+--- lexilla/src/makefile.orig	2020-05-31 23:08:11 UTC
++++ lexilla/src/makefile
+@@ -35,13 +35,13 @@ else
+     BASE_FLAGS += -fvisibility=hidden
+ endif
+ 
+-LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
++SONAME=$(SHARED_NAME).$(SHAREDEXTENSION)
++LEXILLA=$(DIR_BIN)/$(SONAME)
+ LIBLEXILLA=$(DIR_BIN)/liblexilla.a
+ 
+ BASE_FLAGS += --std=c++17
+ 
+ ifdef CLANG
+-CXX = clang++
+ ifdef windir
+ # Clang on Win32 uses MSVC headers so will complain about strcpy without this
+ DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
+@@ -119,7 +119,7 @@ LEXILLA_OBJS=\
+ 	$(LEXERS:.cxx=.o)
+ 
+ $(LEXILLA): $(LEXILLA_OBJS) $(VERSION_RESOURCE)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -Wl,-soname,$(SONAME) -o $@
+ 
+ $(LIBLEXILLA):  $(LEXILLA_OBJS)
+ 	$(AR) rc $@ $^
diff --git a/x11-toolkits/scintilla/files/patch-makefile b/x11-toolkits/scintilla/files/patch-makefile
deleted file mode 100644
index 67c37c9ccf3b..000000000000
--- a/x11-toolkits/scintilla/files/patch-makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- makefile.orig	2020-01-02 00:45:04 UTC
-+++ makefile
-@@ -16,8 +16,6 @@ basedir = $(srcdir)/..
- 
- WARNINGS = -Wpedantic -Wall
- ifdef CLANG
--CXX = clang++
--CC = clang
- WARNINGS += -Wno-deprecated-register
- ifdef windir
- # Turn off some warnings that occur when Clang is being used on Windows where it
-@@ -58,7 +56,12 @@ DEL = del /q
- else
- DEL = rm -f
- endif
--COMPLIB=$(basedir)/bin/scintilla.a
-+COMPLIB_NAME=libscintilla.so
-+COMPLIB_SONAME=$(COMPLIB_NAME).$(MAJOR)
-+COMPLIB=$(COMPLIB_SONAME).$(AGE).$(REVISION)
-+LEXRLIB_NAME=libscintilla_lexers.so
-+LEXRLIB_SONAME=$(LEXRLIB_NAME).$(MAJOR)
-+LEXRLIB=$(LEXRLIB_SONAME).$(AGE).$(REVISION)
- 
- vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
- vpath %.c $(srcdir)
-@@ -81,7 +84,7 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS
- CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
- MARSHALLER=scintilla-marshal.o
- 
--all: $(COMPLIB)
-+all: $(COMPLIB) $(LEXRLIB)
- 
- clean:
- 	$(DEL) *.o $(call normalize,$(COMPLIB)) *.plist
-@@ -158,9 +161,11 @@ GTK_OBJS = \
- 	ScintillaGTK.o \
- 	ScintillaGTKAccessible.o
- 
--$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
--	$(AR) $(ARFLAGS) $@ $^
--	$(RANLIB) $@
-+$(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(COMPLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
-+
-+$(LEXRLIB): $(LEXLIB_OBJS) $(LEX_OBJS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LEXRLIB_SONAME) -o $@ $^ -Wl,--as-needed $(CONFIGLIBS)
- 
- # Automatically generate header dependencies with "make deps"
- include deps.mak
diff --git a/x11-toolkits/scintilla/files/patch-src_PositionCache.h b/x11-toolkits/scintilla/files/patch-src_PositionCache.h
new file mode 100644
index 000000000000..bd0ed01f438f
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-src_PositionCache.h
@@ -0,0 +1,12 @@
+--- src/PositionCache.h.orig	2020-07-18 05:40:22 UTC
++++ src/PositionCache.h
+@@ -187,8 +187,8 @@ class PositionCacheEntry { (public)
+ 	PositionCacheEntry() noexcept;
+ 	// Copy constructor not currently used, but needed for being element in std::vector.
+ 	PositionCacheEntry(const PositionCacheEntry &);
++	PositionCacheEntry(PositionCacheEntry &&) noexcept = default;
+ 	// Deleted so PositionCacheEntry objects can not be assigned.
+-	PositionCacheEntry(PositionCacheEntry &&) = delete;
+ 	void operator=(const PositionCacheEntry &) = delete;
+ 	void operator=(PositionCacheEntry &&) = delete;
+ 	~PositionCacheEntry();
diff --git a/x11-toolkits/scintilla/files/patch-src_Style.cxx b/x11-toolkits/scintilla/files/patch-src_Style.cxx
new file mode 100644
index 000000000000..0a4dba0d9482
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-src_Style.cxx
@@ -0,0 +1,14 @@
+--- src/Style.cxx.orig	2020-04-23 01:50:17 UTC
++++ src/Style.cxx
+@@ -24,6 +24,11 @@ FontAlias::FontAlias(const FontAlias &other) noexcept 
+ 	SetID(other.fid);
+ }
+ 
++FontAlias::FontAlias(FontAlias &&other) noexcept : Font() {
++	SetID(other.fid);
++	other.ClearFont();
++}
++
+ FontAlias::~FontAlias() {
+ 	SetID(FontID{});
+ 	// ~Font will not release the actual font resource since it is now 0
diff --git a/x11-toolkits/scintilla/files/patch-src_Style.h b/x11-toolkits/scintilla/files/patch-src_Style.h
new file mode 100644
index 000000000000..668308df5673
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-src_Style.h
@@ -0,0 +1,23 @@
+--- src/Style.h.orig	2020-04-23 01:50:17 UTC
++++ src/Style.h
+@@ -33,9 +33,9 @@ struct FontSpecification {
+ class FontAlias : public Font {
+ public:
+ 	FontAlias() noexcept;
+-	// FontAlias objects can not be assigned except for initialization
++	// FontAlias objects can be copy or move constructed but not be assigned
+ 	FontAlias(const FontAlias &) noexcept;
+-	FontAlias(FontAlias &&)  = delete;
++	FontAlias(FontAlias &&) noexcept;
+ 	FontAlias &operator=(const FontAlias &) = delete;
+ 	FontAlias &operator=(FontAlias &&) = delete;
+ 	~FontAlias() override;
+@@ -72,7 +72,7 @@ class Style : public FontSpecification, public FontMea
+ 
+ 	Style();
+ 	Style(const Style &source) noexcept;
+-	Style(Style &&) = delete;
++	Style(Style &&) noexcept = default;
+ 	~Style();
+ 	Style &operator=(const Style &source) noexcept;
+ 	Style &operator=(Style &&) = delete;