[packages/scintilla] - updated to 3.10.3 (latest from LongTerm3 branch, sticked to C++11) - updated make patch

qboosh qboosh at pld-linux.org
Wed Apr 10 10:16:21 CEST 2019 

commit 89041e3448b600c4237f2ebaafeaa3172a45c60d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 10 10:16:22 2019 +0200

    - updated to 3.10.3 (latest from LongTerm3 branch, sticked to C++11)
    - updated make patch

 scintilla-make.patch | 93 +++++++++++++++++++++++++++++++++-------------------
 scintilla.spec       | 12 +++----
 2 files changed, 66 insertions(+), 39 deletions(-)
---
diff --git a/scintilla.spec b/scintilla.spec
index 5ef41fe..4226a9b 100644
--- a/scintilla.spec
+++ b/scintilla.spec
@@ -1,17 +1,17 @@
 Summary:	Free source code editing component for GTK+ and Win32
 Summary(pl.UTF-8):	Wolnodostępna kontrolka edycyjna dla GTK+ i Win32
 Name:		scintilla
-Version:	3.5.1
+Version:	3.10.3
 %define	fver	%(echo %{version} | tr -d .)
-Release:	4
+Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/scintilla/%{name}%{fver}.tgz
-# Source0-md5:	f390d60422e5245bc26c6a1fde24ff43
+# Source0-md5:	83db473eee8673970540197c9121c4f6
 Patch0:		%{name}-make.patch
 URL:		http://scintilla.org/
 BuildRequires:	gtk+3-devel >= 3.0
-BuildRequires:	libstdc++-devel >= 6:4.3
+BuildRequires:	libstdc++-devel >= 6:4.8
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,7 +49,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe scintilli
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtk+3-devel >= 3.0
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:4.8
 
 %description devel
 scintilla header files.
@@ -70,7 +70,7 @@ Static scintilla library.
 Statyczna biblioteka scintilla.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}%{fver}
 %patch0 -p1
 
 %build
diff --git a/scintilla-make.patch b/scintilla-make.patch
index 40c960f..ca6315e 100644
--- a/scintilla-make.patch
+++ b/scintilla-make.patch
@@ -1,24 +1,24 @@
---- scintilla/gtk/makefile.orig	2014-08-10 01:52:02.000000000 +0200
-+++ scintilla/gtk/makefile	2014-11-15 19:41:59.482473066 +0100
+--- scintilla3103/gtk/makefile.orig	2019-04-10 09:45:15.191390693 +0200
++++ scintilla3103/gtk/makefile	2019-04-10 09:48:56.756857036 +0200
 @@ -6,7 +6,7 @@
  # Builds for GTK+ 2 and no longer supports GTK+ 1.
  # Also works with ming32-make on Windows.
  
--.SUFFIXES: .cxx .c .o .h .a
-+.SUFFIXES: .cxx .c .o .h .a .lo .la
- ifdef CLANG
- CXX = clang++ -Wno-deprecated-register
- CC = clang
-@@ -36,7 +36,7 @@
- COMPLIB=..\bin\scintilla.a
+-.SUFFIXES: .cxx .c .o .h .a .list
++.SUFFIXES: .cxx .c .o .h .a .lo .la .list
+ 
+ srcdir ?= .
+ 
+@@ -49,7 +49,7 @@
+ COMPLIB=$(srcdir)\..\bin\scintilla.a
  else
  DEL = rm -f
--COMPLIB=../bin/scintilla.a
-+COMPLIB=../bin/libscintilla.la
+-COMPLIB=$(srcdir)/../bin/scintilla.a
++COMPLIB=$(srcdir)/../bin/libscintilla.la
  endif
  
- vpath %.h ../src ../include ../lexlib
-@@ -56,26 +56,31 @@
+ vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
+@@ -74,28 +74,28 @@
  
  ifdef DEBUG
  ifdef CLANG
@@ -33,46 +33,73 @@
 +CTFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
  endif
  
- CFLAGS:=$(CTFLAGS)
- CXXTFLAGS:=--std=c++0x $(CTFLAGS)
+ CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
+ ifdef LPEG_LEXER
+ CXXTFLAGS+=-DLPEG_LEXER -I ../src/lua
+ LUA_CFLAGS:=-std=c99 -pedantic -Wall -I ../src/lua -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-LUAOBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.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 \
+-         lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
+-         lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o \
+-         lpcap.o lpcode.o lpprint.o lptree.o lpvm.o
++LUAOBJS:=lapi.lo lcode.lo lctype.lo ldebug.lo ldo.lo ldump.lo lfunc.lo lgc.lo linit.lo \
++         llex.lo lmem.lo lobject.lo lopcodes.lo lparser.lo lstate.lo lstring.lo \
++         ltable.lo ltm.lo lundump.lo lvm.lo lzio.lo \
++         lauxlib.lo lbaselib.lo lbitlib.lo lcorolib.lo ldblib.lo liolib.lo \
++         lmathlib.lo loadlib.lo loslib.lo lstrlib.lo ltablib.lo lutf8lib.lo \
++         lpcap.lo lpcode.lo lpprint.lo lptree.lo lpvm.lo
+ endif
  
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 -MARSHALLER=scintilla-marshal.o
 +MARSHALLER=scintilla-marshal.lo
  
+ all: $(COMPLIB)
+ 
+@@ -104,10 +104,12 @@
+ 
  .cxx.o:
  	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
- .c.o:
- 	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
- 
--LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
 +.cxx.lo:
 +	libtool --tag=CXX --mode=compile $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
-+.c.lo:
-+	libtool --tag=CC --mode=compile $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
-+
-+LEXOBJS:=$(addsuffix .lo,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+ $(MARSHALLER): scintilla-marshal.c
+-	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
+-$(LUAOBJS): %.o: ../lua/src/%.c
+-	$(CC) $(LUA_CFLAGS) $(CFLAGS) -c $<
++	libtool --tag=CC --mode=compile $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
++$(LUAOBJS): %.lo: ../lua/src/%.c
++	libtool --tag=CC --mode=compile $(CC) $(LUA_CFLAGS) $(CFLAGS) -c $<
  
- all: $(COMPLIB)
+ GLIB_GENMARSHAL = glib-genmarshal
+ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
+@@ -117,7 +119,7 @@
+ .list.c:
+ 	$(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@
+ 
+-LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
++LEXOBJS:=$(addsuffix .lo,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
  
-@@ -88,15 +93,18 @@
- deps:
- 	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ analyze:
+ 	clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx $(srcdir)/../lexlib/*.cxx $(srcdir)/../lexers/*.cxx
+@@ -129,15 +131,18 @@
+ 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 \
+-$(COMPLIB): Accessor.o CharacterSet.o DefaultLexer.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 CellBuffer.o CharacterCategory.o ViewStyle.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 \
-+$(COMPLIB): Accessor.lo CharacterSet.lo LexerBase.lo LexerModule.lo LexerSimple.lo StyleContext.lo WordList.lo \
++$(COMPLIB): Accessor.lo CharacterSet.lo DefaultLexer.lo LexerBase.lo LexerModule.lo LexerSimple.lo StyleContext.lo WordList.lo \
 +	CharClassify.lo Decoration.lo Document.lo PerLine.lo Catalogue.lo CallTip.lo CaseConvert.lo CaseFolder.lo \
 +	ScintillaBase.lo ContractionState.lo EditModel.lo Editor.lo EditView.lo ExternalLexer.lo MarginView.lo \
 +	PropSetSimple.lo PlatGTK.lo \
-+	KeyMap.lo LineMarker.lo PositionCache.lo ScintillaGTK.lo CellBuffer.lo CharacterCategory.lo ViewStyle.lo \
++	KeyMap.lo LineMarker.lo PositionCache.lo ScintillaGTK.lo ScintillaGTKAccessible.lo CellBuffer.lo CharacterCategory.lo ViewStyle.lo \
 +	RESearch.lo RunStyles.lo Selection.lo Style.lo Indicator.lo AutoComplete.lo UniConversion.lo XPM.lo \
- 	$(MARSHALLER) $(LEXOBJS)
--	$(AR) rc $@ $^
+ 	$(MARSHALLER) $(LEXOBJS) $(LUAOBJS)
+-	$(AR) $(ARFLAGS) $@ $^
 -	$(RANLIB) $@
 +	libtool --tag=CXX --mode=link $(CXX) -o $@ $^ -rpath $(libdir) -version-info 3:0:0 $(shell pkg-config --libs $(GTKVERSION))
 +
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scintilla.git/commitdiff/89041e3448b600c4237f2ebaafeaa3172a45c60d

More information about the pld-cvs-commit mailing list