commit d048e74a993dc09d2353f5ebb4bc52988d4362c4
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 15 20:13:16 2014 +0100
- updated to 3.5.1
- updated make patch, switched to GTK+ 3.x, soname changed to
libscintilla.so.3
scintilla-make.patch | 53 +++++++++++++++++++++++++++++-----------------------
scintilla.spec | 17 +++++++++--------
2 files changed, 39 insertions(+), 31 deletions(-)
---
diff --git a/scintilla.spec b/scintilla.spec
index d6fb9f0..1bf0482 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: 2.29
+Version: 3.5.1
%define fver %(echo %{version} | tr -d .)
Release: 1
License: BSD-like
Group: Libraries
Source0: http://downloads.sourceforge.net/scintilla/%{name}%{fver}.tgz
-# Source0-md5: a450f34190bceb6ed3b9847f2c25736b
+# Source0-md5: f390d60422e5245bc26c6a1fde24ff43
Patch0: %{name}-make.patch
URL: http://scintilla.org/
-BuildRequires: gtk+2-devel >= 1:2.0.0
-BuildRequires: libstdc++-devel >= 6:4.1
+BuildRequires: gtk+3-devel >= 3.0
+BuildRequires: libstdc++-devel >= 6:4.3
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,7 +48,7 @@ Summary: scintilla header files
Summary(pl.UTF-8): Pliki nagłówkowe scintilli
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gtk+2-devel >= 1:2.0.0
+Requires: gtk+3-devel >= 3.0
Requires: libstdc++-devel
%description devel
@@ -75,8 +75,9 @@ Statyczna biblioteka scintilla.
%build
%{__make} -C gtk \
- CC="%{__cxx}" \
- CCOMP="%{__cc}" \
+ CC="%{__cc}" \
+ CXX="%{__cxx}" \
+ GTK3=1 \
OPTFLAGS="%{rpmcflags}" \
libdir="%{_libdir}" \
%{?debug:DEBUG=1}
@@ -101,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.0
+%attr(755,root,root) %ghost %{_libdir}/libscintilla.so.3
%files devel
%defattr(644,root,root,755)
diff --git a/scintilla-make.patch b/scintilla-make.patch
index ab2615e..40c960f 100644
--- a/scintilla-make.patch
+++ b/scintilla-make.patch
@@ -1,5 +1,5 @@
---- scintilla/gtk/makefile.orig 2011-05-02 11:11:17.000000000 +0200
-+++ scintilla/gtk/makefile 2011-06-23 10:07:29.202630717 +0200
+--- scintilla/gtk/makefile.orig 2014-08-10 01:52:02.000000000 +0200
++++ scintilla/gtk/makefile 2014-11-15 19:41:59.482473066 +0100
@@ -6,7 +6,7 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
@@ -7,8 +7,8 @@
-.SUFFIXES: .cxx .c .o .h .a
+.SUFFIXES: .cxx .c .o .h .a .lo .la
ifdef CLANG
+ CXX = clang++ -Wno-deprecated-register
CC = clang
- CCOMP = clang
@@ -36,7 +36,7 @@
COMPLIB=..\bin\scintilla.a
else
@@ -18,56 +18,63 @@
endif
vpath %.h ../src ../include ../lexlib
-@@ -55,22 +55,27 @@
- endif
+@@ -56,26 +56,31 @@
ifdef DEBUG
--CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
+ ifdef CLANG
+-CTFLAGS=-DDEBUG -g -fsanitize=$(SANITIZE) $(CXXBASEFLAGS) $(THREADFLAGS)
++CTFLAGS=-DDEBUG $(OPTFLAGS) -fsanitize=$(SANITIZE) $(CXXBASEFLAGS)
$(THREADFLAGS)
+ else
+-CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
++CTFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
+ endif
else
--CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
+-CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
++CTFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
endif
- CFLAGS:=$(CXXFLAGS)
+ CFLAGS:=$(CTFLAGS)
+ CXXTFLAGS:=--std=c++0x $(CTFLAGS)
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
-MARSHALLER=scintilla-marshal.o
+MARSHALLER=scintilla-marshal.lo
.cxx.o:
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
+ $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
.c.o:
- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+ $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
-LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+.cxx.lo:
-+ libtool --tag=CXX --mode=compile $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
++ libtool --tag=CXX --mode=compile $(CXX) $(CONFIGFLAGS) $(CXXTFLAGS)
$(CXXFLAGS) -c $<
+.c.lo:
-+ libtool --tag=CC --mode=compile $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w
-c $<
++ libtool --tag=CC --mode=compile $(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+
+LEXOBJS:=$(addsuffix .lo,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
all: $(COMPLIB)
-@@ -80,14 +85,17 @@
+@@ -88,15 +93,18 @@
deps:
- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ $(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx
../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z]
>deps.mak
-$(COMPLIB): 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 \
-- ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o
PropSetSimple.o PlatGTK.o \
-- KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o
ViewStyle.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 \
- 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 \
-+ CharClassify.lo Decoration.lo Document.lo PerLine.lo Catalogue.lo
CallTip.lo \
-+ ScintillaBase.lo ContractionState.lo Editor.lo ExternalLexer.lo
PropSetSimple.lo PlatGTK.lo \
-+ KeyMap.lo LineMarker.lo PositionCache.lo ScintillaGTK.lo CellBuffer.lo
ViewStyle.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 \
+ RESearch.lo RunStyles.lo Selection.lo Style.lo Indicator.lo
AutoComplete.lo UniConversion.lo XPM.lo \
$(MARSHALLER) $(LEXOBJS)
- $(AR) rc $@ $^
- $(RANLIB) $@
-+ libtool --tag=CXX --mode=link $(CC) -o $@ $^ -rpath $(libdir) $(shell
pkg-config --libs $(GTKVERSION))
++ libtool --tag=CXX --mode=link $(CXX) -o $@ $^ -rpath $(libdir)
-version-info 3:0:0 $(shell pkg-config --libs $(GTKVERSION))
+
+install: $(COMPLIB)
+ install -d $(DESTDIR)$(libdir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/scintilla.git/commitdiff/d048e74a993dc09d2353f5ebb4bc52988d4362c4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
