Fix and update scite and scintilla to version 3.7.5

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Fix and update scite and scintilla to version 3.7.5
From: Daniel Oelschlegel <amoibos%gmail.com@localhost>
Date: Sun, 25 Jun 2017 16:21:35 +0000
Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sun Jun 25 16:21:35 2017 +0000
Changeset:	8eee15126cf77b5f61e843ba5dcd15638da6ca16

Modified Files:
	scintilla/DESCR
	scintilla/Makefile
	scintilla/PLIST
	scintilla/buildlink3.mk
	scintilla/distinfo
	scite/DESCR
	scite/Makefile
	scite/PLIST
	scite/distinfo
Added Files:
	scintilla/patches/patch-gtk_makefile
	scite/patches/patch-gtk_makefile
Removed Files:
	scintilla/patches/patch-aa
	scite/patches/patch-aa

Log Message:
Fix and update scite and scintilla to version 3.7.5

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8eee15126cf77b5f61e843ba5dcd15638da6ca16

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 scintilla/DESCR                      |   0
 scintilla/Makefile                   |   4 +-
 scintilla/PLIST                      |   0
 scintilla/buildlink3.mk              |   0
 scintilla/distinfo                   |  10 +--
 scintilla/patches/patch-aa           |  60 ------------------
 scintilla/patches/patch-gtk_makefile |  62 +++++++++++++++++++
 scite/DESCR                          |   0
 scite/Makefile                       |   4 +-
 scite/PLIST                          |   0
 scite/distinfo                       |  10 +--
 scite/patches/patch-aa               |  80 ------------------------
 scite/patches/patch-gtk_makefile     | 114 +++++++++++++++++++++++++++++++++++
 13 files changed, 190 insertions(+), 154 deletions(-)

diffs:
diff --git a/scintilla/DESCR b/scintilla/DESCR
old mode 100644
new mode 100755
diff --git a/scintilla/Makefile b/scintilla/Makefile
old mode 100644
new mode 100755
index 7fba42c034..5de5c17de8
--- a/scintilla/Makefile
+++ b/scintilla/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.23 2015/04/25 14:20:40 tnn Exp $
 #
 
-DISTNAME=	scintilla374
-PKGNAME=	scintilla-3.7.4
+DISTNAME=	scintilla375
+PKGNAME=	scintilla-3.7.5
 #PKGREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
diff --git a/scintilla/PLIST b/scintilla/PLIST
old mode 100644
new mode 100755
diff --git a/scintilla/buildlink3.mk b/scintilla/buildlink3.mk
old mode 100644
new mode 100755
diff --git a/scintilla/distinfo b/scintilla/distinfo
old mode 100644
new mode 100755
index 801e1d784b..a251a8ab3e
--- a/scintilla/distinfo
+++ b/scintilla/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.6 2015/11/03 03:29:32 agc Exp $
 
-SHA1 (scintilla374.tgz) = 07f6d50b55df382c7b2649bda1fffe8724e35092
-RMD160 (scintilla374.tgz) = 2e04007973fc1be1d35e127bb00c5580ec8002d7
-SHA512 (scintilla374.tgz) = 856750ce7e4252d00ca1a1d76754afae27cbe24a2a32ecca67e87eb90f2c4d88f5f485f5331e6294fdd43310966af2420f8d3cd6529fe9665892105e034d3e81
-Size (scintilla374.tgz) = 1374622 bytes
-SHA1 (patch-aa) = f63a03876b3e4684c7bcdd6b1abf1278e5b8a5b8
+SHA1 (scintilla375.tgz) = f21505524a16a4bcd2b4f24032add5e5b441f260
+RMD160 (scintilla375.tgz) = 619ee362787f11f574239922f006f4c47877415e
+SHA512 (scintilla375.tgz) = 59181be198704577614bc229e7e4d289d4156459881f2a01625ec4a9dd3a4d2e571f2df18b9065434856bd7e18e4b95d402707402c68f6eaa857027232aff647
+Size (scintilla375.tgz) = 1423525 bytes
+SHA1 (patch-gtk_makefile) = bf3342823ab218f479d88e63478fc46345b707d7
diff --git a/scintilla/patches/patch-aa b/scintilla/patches/patch-aa
deleted file mode 100644
index c29f7f4b13..0000000000
--- a/scintilla/patches/patch-aa
+++ /dev/null
@@ -1,60 +0,0 @@
---- gtk/makefile.orig	2016-12-01 09:53:41.000000000 +0000
-+++ gtk/makefile	2017-01-03 23:11:02.512337723 +0000
-@@ -9,14 +9,7 @@
- srcdir ?= .
- 
- .SUFFIXES: .cxx .c .o .h .a .list
--ifdef CLANG
--CXX = clang++ -Wno-deprecated-register
--CC = clang
--# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
--# thread also need to create Position Independent Executable -> search online documentation
--SANITIZE = address
--#SANITIZE = undefined
--endif
-+AR = ar
- ARFLAGS = rc
- RANLIB = touch
- 
-@@ -45,7 +38,8 @@
- COMPLIB=$(srcdir)\..\bin\scintilla.a
- else
- DEL = rm -f
--COMPLIB=$(srcdir)/../bin/scintilla.a
-+COMPLIB=$(srcdir)/../bin/libscintilla.a
-+LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
- endif
- 
- vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -98,7 +92,7 @@
- 
- LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))
- 
--all: $(COMPLIB)
-+all: $(COMPLIB) $(LEXERLIB)
- 
- clean:
- 	$(DEL) *.o $(COMPLIB) *.plist
-@@ -113,14 +107,20 @@
- deps.mak:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.* //' | grep [a-zA-Z] > $@
- 
--$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
-+LIBOBJS= Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
- 	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
- 	ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \
- 	PropSetSimple.o PlatGTK.o \
- 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
- 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
- 	$(MARSHALLER) $(LEXOBJS)
--	$(AR) $(ARFLAGS) $@ $^
-+
-+$(COMPLIB): $(LIBOBJS)
-+	$(AR) rc $@ $^
-+	$(RANLIB) $@
-+	
-+$(LEXERLIB): $(LEXOBJS)
-+	$(AR) rc $@ $^
- 	$(RANLIB) $@
- 
- # Automatically generate header dependencies with "make deps"
diff --git a/scintilla/patches/patch-gtk_makefile b/scintilla/patches/patch-gtk_makefile
new file mode 100755
index 0000000000..ae12f4cd39
--- /dev/null
+++ b/scintilla/patches/patch-gtk_makefile
@@ -0,0 +1,62 @@
+$NetBSD$
+
+--- gtk/makefile.orig	2017-05-24 01:26:25.000000000 +0000
++++ gtk/makefile	2017-06-18 13:36:02.221339873 +0000
+@@ -9,14 +9,7 @@
+ srcdir ?= .
+ 
+ .SUFFIXES: .cxx .c .o .h .a .list
+-ifdef CLANG
+-CXX = clang++ -Wno-deprecated-register
+-CC = clang
+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
+-# thread also need to create Position Independent Executable -> search online documentation
+-SANITIZE = address
+-#SANITIZE = undefined
+-endif
++AR = ar
+ ARFLAGS = rc
+ RANLIB = touch
+ 
+@@ -45,7 +38,8 @@
+ COMPLIB=$(srcdir)\..\bin\scintilla.a
+ else
+ DEL = rm -f
+-COMPLIB=$(srcdir)/../bin/scintilla.a
++COMPLIB=$(srcdir)/../bin/libscintilla.a
++LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
+ endif
+ 
+ vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
+@@ -98,7 +92,7 @@
+ 
+ LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
+ 
+-all: $(COMPLIB)
++all: $(COMPLIB) $(LEXERLIB)
+ 
+ clean:
+ 	$(DEL) *.o $(COMPLIB) *.plist
+@@ -113,14 +107,20 @@
+ deps.mak:
+ 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.* //' | grep [a-zA-Z] > $@
+ 
+-$(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
++LIBOBJS= Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
+ 	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
+ 	ScintillaBase.o ContractionState.o EditModel.o Editor.o EditView.o ExternalLexer.o MarginView.o \
+ 	PropSetSimple.o PlatGTK.o \
+ 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
+ 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+ 	$(MARSHALLER) $(LEXOBJS)
+-	$(AR) $(ARFLAGS) $@ $^
++
++$(COMPLIB): $(LIBOBJS)
++	$(AR) rc $@ $^
++	$(RANLIB) $@
++	
++$(LEXERLIB): $(LEXOBJS)
++	$(AR) rc $@ $^
+ 	$(RANLIB) $@
+ 
+ # Automatically generate header dependencies with "make deps"
diff --git a/scite/DESCR b/scite/DESCR
old mode 100644
new mode 100755
diff --git a/scite/Makefile b/scite/Makefile
old mode 100644
new mode 100755
index fee7cce7d2..bd0635a259
--- a/scite/Makefile
+++ b/scite/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.25 2016/02/25 08:27:03 jperkin Exp $
 #
-DISTNAME=	scite374
-PKGNAME=	scite-3.7.4
+DISTNAME=	scite375
+PKGNAME=	scite-3.7.5
 #PKGREVISION=	0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scintilla/}
diff --git a/scite/PLIST b/scite/PLIST
old mode 100644
new mode 100755
diff --git a/scite/distinfo b/scite/distinfo
old mode 100644
new mode 100755
index 6f42fac9a6..425b36bbe1
--- a/scite/distinfo
+++ b/scite/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.8 2015/11/03 03:32:21 agc Exp $
 
-SHA1 (scite374.tgz) = d21414ce4a700e20a7181b7912ce1fdaf33520c1
-RMD160 (scite374.tgz) = aa3736a951f50fb9554441f37d1f82e00592e29b
-SHA512 (scite374.tgz) = c1096ceca2c78801c9c82491ef80750988da5defeed67a0f61df726ed82f48bb934add7684c2fd70b3df9ce34ac402a6f1d98b0c72a2aac372de440c236998ad
-Size (scite374.tgz) = 2329831 bytes
-SHA1 (patch-aa) = c7283f7f7ac61050f490ac0058cfb8d493a8f2ca
+SHA1 (scite375.tgz) = 28f4ce1c7b2aaead0009a93ef5e469fb9a2e55f6
+RMD160 (scite375.tgz) = 5cfc34714fee7c7b6ac75f4aa8a202ba128fff97
+SHA512 (scite375.tgz) = d4c39e73f9bf7ae02f98774ddefc6f8ee92fea3dff62aeae0c8d10744cb3093828034449498756253c07d83169ca40da6864a23a2ded6a5749dc1614bbd51864
+Size (scite375.tgz) = 2380823 bytes
+SHA1 (patch-gtk_makefile) = 32703e9339e1e228120870fd1a55e3e27a46cbea
diff --git a/scite/patches/patch-aa b/scite/patches/patch-aa
deleted file mode 100644
index 1a72338163..0000000000
--- a/scite/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD$
-Overwrite paths and defaults, patch inspired by OpenBSD port version 3.5.2
---- gtk/makefile.orig	2016-10-16 03:10:33.000000000 +0000
-+++ gtk/makefile	2016-10-16 20:44:27.385048978 +0000
-@@ -33,13 +33,14 @@
- ifdef gnomeprefix
-   prefix=$(gnomeprefix)
- else
--  prefix=/usr
-+  prefix=$(PREFIX)
- endif
- endif
- datadir=$(prefix)/share
- pixmapdir=$(datadir)/pixmaps
- bindir=$(prefix)/bin
- SYSCONF_PATH=$(prefix)/share/scite
-+DOCPATH=$(PREFIX)/share/doc/scite
- 
- INSTALL=install
- 
-@@ -47,10 +48,10 @@
- 
- all: $(PROG)
- 
--vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include
-+vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../scintilla
- vpath %.cxx $(srcdir) $(srcdir)/../src
- 
--INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
-+INCLUDEDIRS=-I $(PREFIX)/include/scintilla -I $(srcdir)/../src -I $(prefix)/include
- ifdef CHECK_DEPRECATED
- DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
- endif
-@@ -62,7 +63,9 @@
- CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
- endif
- 
--ifndef NO_LUA
-+LIBS= -L $(PREFIX)/lib -lscintilla -lscintilla_lexers
-+
-+ifdef LUA
- LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- 		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
- 		ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -74,7 +77,7 @@
- 
- vpath %.c $(srcdir)/../lua/src $(srcdir)/../lua/src/lib
- 
--INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I$(srcdir)/../lua/include
-+INCLUDEDIRS+=-I$(srcdir)/../lua/include
- 
- .c.o:
- 	$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
-@@ -111,16 +114,13 @@
- deps.mak:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
- 
--# make should be run in ../../scintilla/gtk to compile all the lexers.
--COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a
--
- $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
- FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
- ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
- MatchMarker.o StringHelpers.o \
- PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
- 	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
-+	$(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
- 
- # Automatically generate header dependencies with "make deps"
- include deps.mak
-@@ -141,7 +141,7 @@
- ifdef gnomeprefix
- 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
- 	$(INSTALL) -m 755 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
--	$(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
- endif
- 
- uninstall:
diff --git a/scite/patches/patch-gtk_makefile b/scite/patches/patch-gtk_makefile
new file mode 100755
index 0000000000..0d768dcb2c
--- /dev/null
+++ b/scite/patches/patch-gtk_makefile
@@ -0,0 +1,114 @@
+$NetBSD$
+
+--- gtk/makefile.orig	2017-05-08 01:13:24.000000000 +0000
++++ gtk/makefile	2017-06-18 15:02:39.186736662 +0000
+@@ -7,16 +7,6 @@
+ srcdir ?= .
+ 
+ .SUFFIXES: .cxx .o .h .a .c
+-ifdef CLANG
+-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
+-# thread also need to create Position Independent Executable -> search online documentation
+-SANITIZE = address
+-#SANITIZE = undefined
+-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
+-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
+-else
+-MISLEADING=-Wno-misleading-indentation
+-endif
+ 
+ ifdef GTK3
+ GTKVERSION=gtk+-3.0
+@@ -28,41 +18,44 @@
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+ CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
+ CONFIGTHREADS:=
+-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
++gnomeprefix:=${PREFIX}
+ ifndef prefix
+ ifdef gnomeprefix
+   prefix=$(gnomeprefix)
+ else
+-  prefix=/usr
++  prefix=${PREFIX}
+ endif
+ endif
+ datadir=$(prefix)/share
+ pixmapdir=$(datadir)/pixmaps
+ bindir=$(prefix)/bin
+ SYSCONF_PATH=$(prefix)/share/scite
++DOCPATH=$(PREFIX)/share/doc/scite
+ 
+-INSTALL=install
++INSTALL=install -o root -g bin
+ 
+ PROG	= $(srcdir)/../bin/SciTE
+ 
+ all: $(PROG)
+ 
+-vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../../scintilla/include
++vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../scintilla
+ vpath %.cxx $(srcdir) $(srcdir)/../src
+ 
+-INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src
++INCLUDEDIRS=-I $(PREFIX)/include/scintilla -I $(srcdir)/../src -I $(prefix)/include
+ ifdef CHECK_DEPRECATED
+ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+ endif
+-CXXBASEFLAGS=-W -Wall -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-W -Wall -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
+ 
+ ifdef DEBUG
+-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
++CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS)
+ else
+-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
++CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS)
+ endif
+ 
+-ifndef NO_LUA
++LIBS= -L $(PREFIX)/lib -lscintilla -lscintilla_lexers
++
++ifdef LUA
+ LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
+ 		ltable.o ltm.o lundump.o lvm.o lzio.o
+@@ -74,7 +67,7 @@
+ 
+ vpath %.c $(srcdir)/../lua/src $(srcdir)/../lua/src/lib
+ 
+-INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I$(srcdir)/../lua/include
++INCLUDEDIRS+=-I$(srcdir)/../lua/include
+ 
+ .c.o:
+ 	$(CC) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
+@@ -111,17 +104,14 @@
+ deps.mak:
+ 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >$@
+ 
+-# make should be run in ../../scintilla/gtk to compile all the lexers.
+-COMPLIB=$(srcdir)/../../scintilla/bin/scintilla.a
+-
+ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \
+ ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
+ MatchMarker.o StringHelpers.o \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
+-	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
+-	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+-
++	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
++	$(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
++	$(LDFLAGS) $(LIBS) -Wl,--as-needed $(CONFIGLIB)
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
+ 
+@@ -141,7 +131,7 @@
+ ifdef gnomeprefix
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
+ 	$(INSTALL) -m 755 $(srcdir)/SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+-	$(INSTALL) -m 644 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++	$(INSTALL) -m 444 $(srcdir)/Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ endif
+ 
+ uninstall:
Prev by Date: Update mosquitto to version 1.4.12 which includes fix for CVE-2017-7650.
Next by Date: retroarch: Add back platform patch for paths
Previous by Thread: Update mosquitto to version 1.4.12 which includes fix for CVE-2017-7650.
Next by Thread: retroarch: Add back platform patch for paths
Indexes:
Home | Main Index | Thread Index | Old Index