Author: qboosh Date: Thu Jun 23 10:51:11 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.27
- updated make patch
---- Files affected:
packages/scintilla:
scintilla-make.patch (1.14 -> 1.15) , scintilla.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: packages/scintilla/scintilla-make.patch
diff -u packages/scintilla/scintilla-make.patch:1.14
packages/scintilla/scintilla-make.patch:1.15
--- packages/scintilla/scintilla-make.patch:1.14 Mon May 17 01:41:34 2010
+++ packages/scintilla/scintilla-make.patch Thu Jun 23 12:51:05 2011
@@ -1,102 +1,77 @@
---- scintilla/gtk/makefile 2010-04-06 23:42:13.000000000 +0000
-+++ scintilla/gtk/makefile 2010-05-16 23:18:39.000000000 +0000
+--- scintilla/gtk/makefile.orig 2011-05-02 11:11:17.000000000 +0200
++++ scintilla/gtk/makefile 2011-06-23 10:07:29.202630717 +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
- CC = g++
- CCOMP = gcc
- AR = ar
-@@ -18,7 +18,7 @@
- endif
- endif
-
+ ifdef CLANG
+ CC = clang
+ CCOMP = clang
+@@ -36,7 +36,7 @@
+ COMPLIB=..\bin\scintilla.a
+ else
+ DEL = rm -f
-COMPLIB=../bin/scintilla.a
+COMPLIB=../bin/libscintilla.la
+ endif
- vpath %.h ../src ../include
- vpath %.cxx ../src
-@@ -33,52 +33,57 @@
+ vpath %.h ../src ../include ../lexlib
+@@ -55,22 +55,27 @@
endif
ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS=-DDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS=-DDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
else
- CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS=-DNDEBUG $(OPTFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS)
endif
--CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+ CFLAGS:=$(CXXFLAGS)
+
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
-MARSHALLER=scintilla-marshal.o
-+CONFIGFLAGS:=pkg-config --cflags gtk+-2.0 gthread-2.0
+MARSHALLER=scintilla-marshal.lo
.cxx.o:
$(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
.c.o:
- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
--
+ $(CCOMP) $(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 $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
+.c.lo:
-+ libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS)
-w -c $<
- #++Autogenerated -- run src/LexGen.py to regenerate
- #**LEXOBJS=\\\n\(\*.o \)
- LEXOBJS=\
--LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \
--LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \
--LexCOBOL.o LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o \
--LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o \
--LexGAP.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o \
--LexLout.o LexLua.o LexMagik.o LexMarkdown.o LexMatlab.o LexMetapost.o \
--LexMMIXAL.o LexMPT.o LexMSSQL.o LexMySQL.o LexNimrod.o LexNsis.o LexOpal.o \
--LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o \
--LexPowerShell.o LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o
\
--LexScriptol.o LexSmalltalk.o LexSML.o LexSorcus.o LexSpecman.o LexSpice.o \
--LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o
\
--LexVHDL.o LexYAML.o
-+LexAbaqus.lo LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexASY.lo LexAU3.lo
LexAVE.lo \
-+LexBaan.lo LexBash.lo LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo
LexCmake.lo \
-+LexCOBOL.lo LexConf.lo LexCPP.lo LexCrontab.lo LexCsound.lo LexCSS.lo LexD.lo
\
-+LexEiffel.lo LexErlang.lo LexEScript.lo LexFlagship.lo LexForth.lo
LexFortran.lo \
-+LexGAP.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexInno.lo LexKix.lo
LexLisp.lo \
-+LexLout.lo LexLua.lo LexMagik.lo LexMarkdown.lo LexMatlab.lo LexMetapost.lo \
-+LexMMIXAL.lo LexMPT.lo LexMSSQL.lo LexMySQL.lo LexNimrod.lo LexNsis.lo
LexOpal.lo \
-+LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPLM.lo LexPOV.lo
LexPowerPro.lo \
-+LexPowerShell.lo LexProgress.lo LexPS.lo LexPython.lo LexR.lo LexRebol.lo
LexRuby.lo \
-+LexScriptol.lo LexSmalltalk.lo LexSML.lo LexSorcus.lo LexSpecman.lo
LexSpice.lo \
-+LexSQL.lo LexTACL.lo LexTADS3.lo LexTAL.lo LexTCL.lo LexTeX.lo LexVB.lo
LexVerilog.lo \
-+LexVHDL.lo LexYAML.lo
- #--Autogenerated -- end of automatically generated section
++ libtool --tag=CC --mode=compile $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w
-c $<
++
++LEXOBJS:=$(addsuffix .lo,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
all: $(COMPLIB)
- clean:
-- rm -f *.o $(COMPLIB)
-+ rm -f *.o *.lo $(COMPLIB)
-
+@@ -80,14 +85,17 @@
deps:
$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
--$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
-- CharClassify.o Decoration.o Document.o PerLine.o CallTip.o \
-- ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o
PlatGTK.o \
+-$(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 \
- RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o
UniConversion.o XPM.o \
-+$(COMPLIB): DocumentAccessor.lo WindowAccessor.lo KeyWords.lo StyleContext.lo
\
-+ CharClassify.lo Decoration.lo Document.lo PerLine.lo CallTip.lo \
-+ ScintillaBase.lo ContractionState.lo Editor.lo ExternalLexer.lo
PropSet.lo PlatGTK.lo \
++$(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 \
+ 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)
`$(LIBCONFIG)`
-
++ libtool --tag=CXX --mode=link $(CC) -o $@ $^ -rpath $(libdir) $(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
================================================================
Index: packages/scintilla/scintilla.spec
diff -u packages/scintilla/scintilla.spec:1.29
packages/scintilla/scintilla.spec:1.30
--- packages/scintilla/scintilla.spec:1.29 Mon May 17 01:41:34 2010
+++ packages/scintilla/scintilla.spec Thu Jun 23 12:51:05 2011
@@ -2,13 +2,13 @@
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.11
+Version: 2.27
%define fver %(echo %{version} | tr -d .)
Release: 1
License: BSD-like
Group: Libraries
-Source0: http://dl.sourceforge.net/scintilla/%{name}%{fver}.tgz
-# Source0-md5: 266d1cb01a31fa070fb1855d10c60185
+Source0: http://downloads.sourceforge.net/scintilla/%{name}%{fver}.tgz
+# Source0-md5: f8a4175cb24d24dee32b05400aaea6ce
Patch0: %{name}-make.patch
URL: http://scintilla.org/
BuildRequires: gtk+2-devel >= 1:2.0.0
@@ -22,12 +22,13 @@
complete source code and a license that permits use in any free
project or commercial product. As well as features found in standard
text editing components, Scintilla includes features especially useful
-when editing and debugging source code. These include support for syntax
-styling, error indicators, code completion and call tips. The selection
-margin can contain markers like those used in debuggers to indicate
-breakpoints and the current line. Styling choices are more open than with
-many editors, allowing the use of proportional fonts, bold and italics,
-multiple foreground and background colours and multiple fonts.
+when editing and debugging source code. These include support for
+syntax styling, error indicators, code completion and call tips. The
+selection margin can contain markers like those used in debuggers to
+indicate breakpoints and the current line. Styling choices are more
+open than with many editors, allowing the use of proportional fonts,
+bold and italics, multiple foreground and background colours and
+multiple fonts.
%description -l pl.UTF-8
Scintilla to wolnodostępna kontrolka do edycji kodu. Przychodzi z
@@ -72,7 +73,6 @@
%prep
%setup -q -n %{name}
%patch0 -p1
-rm -r doc/CVS
%build
%{__make} -C gtk \
@@ -120,6 +120,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2011/06/23 10:51:05 qboosh
+- updated to 2.27
+- updated make patch
+
Revision 1.29 2010/05/16 23:41:34 arvenil
- up to 2.11
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scintilla/scintilla-make.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scintilla/scintilla.spec?r1=1.29&r2=1.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
