commit 9103605db5639923d28cc2c36b5e78d328f5036f
Author: Jakub Bogusz <[email protected]>
Date: Wed Apr 10 10:38:51 2019 +0200
- updated to 4.1.4 (C++17, requires gcc 7+)
scintilla-make.patch | 54 +++++++++++++++++-----------------------------------
scintilla.spec | 14 +++++++-------
2 files changed, 24 insertions(+), 44 deletions(-)
---
diff --git a/scintilla.spec b/scintilla.spec
index 4226a9b..9d3cabe 100644
--- a/scintilla.spec
+++ b/scintilla.spec
@@ -1,18 +1,18 @@
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.10.3
+Version: 4.1.4
%define fver %(echo %{version} | tr -d .)
Release: 1
License: BSD-like
Group: Libraries
Source0: http://downloads.sourceforge.net/scintilla/%{name}%{fver}.tgz
-# Source0-md5: 83db473eee8673970540197c9121c4f6
+# Source0-md5: 18656353d585085df15f2fec68f143e6
Patch0: %{name}-make.patch
URL: http://scintilla.org/
BuildRequires: gtk+3-devel >= 3.0
-BuildRequires: libstdc++-devel >= 6:4.8
-BuildRequires: libtool
+BuildRequires: libstdc++-devel >= 6:7
+BuildRequires: libtool >= 2:1.5
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 >= 6:4.8
+Requires: libstdc++-devel >= 6:7
%description devel
scintilla header files.
@@ -70,7 +70,7 @@ Static scintilla library.
Statyczna biblioteka scintilla.
%prep
-%setup -q -n %{name}%{fver}
+%setup -q -n %{name}
%patch0 -p1
%build
@@ -102,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc License.txt doc/*
%attr(755,root,root) %{_libdir}/libscintilla.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libscintilla.so.3
+%attr(755,root,root) %ghost %{_libdir}/libscintilla.so.4
%files devel
%defattr(644,root,root,755)
diff --git a/scintilla-make.patch b/scintilla-make.patch
index ca6315e..623c0ce 100644
--- a/scintilla-make.patch
+++ b/scintilla-make.patch
@@ -1,5 +1,5 @@
---- scintilla3103/gtk/makefile.orig 2019-04-10 09:45:15.191390693 +0200
-+++ scintilla3103/gtk/makefile 2019-04-10 09:48:56.756857036 +0200
+--- scintilla/gtk/makefile.orig 2019-04-10 07:15:44.649988285 +0200
++++ scintilla/gtk/makefile 2019-04-10 09:41:25.092637245 +0200
@@ -6,7 +6,7 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
@@ -14,11 +14,11 @@
else
DEL = rm -f
-COMPLIB=$(srcdir)/../bin/scintilla.a
-+COMPLIB=$(srcdir)/../bin/libscintilla.la
++COMPLIB=$(srcdir)/../bin/scintilla.la
endif
vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
-@@ -74,28 +74,28 @@
+@@ -74,18 +74,18 @@
ifdef DEBUG
ifdef CLANG
@@ -33,23 +33,7 @@
+CTFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- 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
+ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(REFLAGS)
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
-MARSHALLER=scintilla-marshal.o
@@ -57,23 +41,19 @@
all: $(COMPLIB)
-@@ -104,10 +104,12 @@
+@@ -97,6 +97,11 @@
+ .c.o:
+ $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
- .cxx.o:
- $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
+.cxx.lo:
+ libtool --tag=CXX --mode=compile $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS)
$(CXXFLAGS) -c $<
- $(MARSHALLER): scintilla-marshal.c
-- $(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
--$(LUAOBJS): %.o: ../lua/src/%.c
-- $(CC) $(LUA_CFLAGS) $(CFLAGS) -c $<
++.c.lo:
+ 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 $<
-
++
GLIB_GENMARSHAL = glib-genmarshal
GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
-@@ -117,7 +119,7 @@
+
+@@ -105,7 +110,7 @@
.list.c:
$(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@
@@ -82,7 +62,7 @@
analyze:
clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx
$(srcdir)/../src/*.cxx $(srcdir)/../lexlib/*.cxx $(srcdir)/../lexers/*.cxx
-@@ -129,15 +131,18 @@
+@@ -117,15 +122,18 @@
deps.mak:
$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) $(DEPSRCS) | sed -e 's/\/usr.*
//' | grep [a-zA-Z] > $@
@@ -98,14 +78,14 @@
+ PropSetSimple.lo PlatGTK.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) $(LUAOBJS)
+ $(MARSHALLER) $(LEXOBJS)
- $(AR) $(ARFLAGS) $@ $^
- $(RANLIB) $@
-+ libtool --tag=CXX --mode=link $(CXX) -o $@ $^ -rpath $(libdir)
-version-info 3:0:0 $(shell pkg-config --libs $(GTKVERSION))
-+
++ libtool --tag=CXX --mode=link $(CXX) -o $@ $^ -rpath $(libdir)
-version-info 4:0:0 $(shell pkg-config --libs $(GTKVERSION))
+
+install: $(COMPLIB)
+ install -d $(DESTDIR)$(libdir)
+ libtool --mode=install install $(COMPLIB) $(DESTDIR)$(libdir)
-
++
# Automatically generate header dependencies with "make deps"
include deps.mak
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scintilla.git/commitdiff/9103605db5639923d28cc2c36b5e78d328f5036f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
