Update Scintilla to 4.4.6
This commit is contained in:
parent
09c2e0e1c7
commit
6f57a9f985
|
@ -1,8 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.23 2015/04/25 14:20:40 tnn Exp $
|
||||
#
|
||||
|
||||
DISTNAME= scintilla375
|
||||
PKGNAME= scintilla-3.7.5
|
||||
DISTNAME= scintilla446
|
||||
PKGNAME= scintilla-4.4.6
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
@ -27,10 +27,13 @@ do-install:
|
|||
${WRKSRC}/include/Sci_Position.h \
|
||||
${WRKSRC}/include/Scintilla.iface \
|
||||
${WRKSRC}/include/ILexer.h \
|
||||
${WRKSRC}/include/ILoader.h \
|
||||
${DESTDIR}${PREFIX}/include/scintilla
|
||||
${INSTALL_LIB} ${WRKSRC}/bin/libscintilla.a ${DESTDIR}${PREFIX}/lib
|
||||
${INSTALL_LIB} ${WRKSRC}/bin/libscintilla_lexers.a ${DESTDIR}${PREFIX}/lib
|
||||
|
||||
${INSTALL_LIB} ${WRKSRC}/bin/libscintilla.a \
|
||||
${WRKSRC}/bin/libscintilla.so \
|
||||
${WRKSRC}/bin/liblexilla.a \
|
||||
${WRKSRC}/bin/liblexilla.so \
|
||||
${DESTDIR}${PREFIX}/lib
|
||||
|
||||
.include "../../x11/gtk2/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
@comment $NetBSD: PLIST,v 1.2 2013/04/10 11:20:38 drochner Exp $
|
||||
@comment $NetBSD$
|
||||
include/scintilla/ILexer.h
|
||||
include/scintilla/ILoader.h
|
||||
include/scintilla/Platform.h
|
||||
include/scintilla/SciLexer.h
|
||||
include/scintilla/Sci_Position.h
|
||||
include/scintilla/Scintilla.h
|
||||
include/scintilla/Scintilla.iface
|
||||
include/scintilla/ScintillaWidget.h
|
||||
lib/liblexilla.a
|
||||
lib/liblexilla.so
|
||||
lib/libscintilla.a
|
||||
lib/libscintilla_lexers.a
|
||||
lib/libscintilla.so
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.6 2015/11/03 03:29:32 agc Exp $
|
||||
|
||||
SHA1 (scintilla375.tgz) = f21505524a16a4bcd2b4f24032add5e5b441f260
|
||||
RMD160 (scintilla375.tgz) = 619ee362787f11f574239922f006f4c47877415e
|
||||
SHA512 (scintilla375.tgz) = 59181be198704577614bc229e7e4d289d4156459881f2a01625ec4a9dd3a4d2e571f2df18b9065434856bd7e18e4b95d402707402c68f6eaa857027232aff647
|
||||
Size (scintilla375.tgz) = 1423525 bytes
|
||||
SHA1 (patch-gtk_makefile) = bf3342823ab218f479d88e63478fc46345b707d7
|
||||
SHA1 (scintilla446.tgz) = 8423de32a5118acef897c40028680ff1b120f03b
|
||||
RMD160 (scintilla446.tgz) = e678ef0e1d4b2bce055c36a9c5e7ca46e733f849
|
||||
SHA512 (scintilla446.tgz) = 83a48f679786cfdf62e5908dc1c3d18af73cc398b21e39bdda0ce06ec8abe90a635daf3489014075cbe1da06b125c90bb89836a81a9c3f3c0a9ea34d4be1a373
|
||||
Size (scintilla446.tgz) = 1640227 bytes
|
||||
SHA1 (patch-gtk_makefile) = 7bd57c50ab327330b68846df7dc389d02f2ec2c4
|
||||
|
|
|
@ -1,62 +1,43 @@
|
|||
$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 ?= .
|
||||
--- gtk/makefile.orig 2021-01-06 19:22:48.159131948 +0000
|
||||
+++ gtk/makefile
|
||||
@@ -15,28 +15,7 @@ srcdir ?= .
|
||||
basedir = $(srcdir)/..
|
||||
|
||||
.SUFFIXES: .cxx .c .o .h .a .list
|
||||
WARNINGS = -Wpedantic -Wall
|
||||
-ifdef CLANG
|
||||
-CXX = clang++ -Wno-deprecated-register
|
||||
-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
|
||||
-# is including Microsoft headers.
|
||||
-# incompatible-ms-struct is because more complex structs are not quite the same as MSVC
|
||||
-WARNINGS += -Wno-incompatible-ms-struct
|
||||
-# language-extension-token is because of __int64 in glib-2.0 glibconfig.h
|
||||
-WARNINGS += -Wno-language-extension-token
|
||||
-# register may be used in glib
|
||||
-# This produces a warning since -Wno-register is not valid for C files but it still works
|
||||
-WARNINGS += -Wno-register
|
||||
-DEFINES += -D_CRT_SECURE_NO_DEPRECATE
|
||||
-endif
|
||||
-# 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
|
||||
-BASE_FLAGS += -fsanitize=$(SANITIZE)
|
||||
-endif
|
||||
+AR = ar
|
||||
ARFLAGS = rc
|
||||
RANLIB = touch
|
||||
|
||||
@@ -45,7 +38,8 @@
|
||||
COMPLIB=$(srcdir)\..\bin\scintilla.a
|
||||
else
|
||||
RANLIB ?= ranlib
|
||||
PKG_CONFIG ?= pkg-config
|
||||
@@ -68,7 +47,7 @@ else
|
||||
DEL = rm -f
|
||||
-COMPLIB=$(srcdir)/../bin/scintilla.a
|
||||
+COMPLIB=$(srcdir)/../bin/libscintilla.a
|
||||
+LEXERLIB=$(srcdir)/../bin/libscintilla_lexers.a
|
||||
LEXILLA = liblexilla.so
|
||||
endif
|
||||
-COMPLIB=$(basedir)/bin/scintilla.a
|
||||
+COMPLIB=$(basedir)/bin/libscintilla.a
|
||||
COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
|
||||
|
||||
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"
|
||||
vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
|
||||
|
|
Loading…
Reference in New Issue