Author: arvenil Date: Sun May 16 23:41:39 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 2.11
---- Files affected: packages/scite: scite-make.patch (1.6 -> 1.7) , scite.spec (1.20 -> 1.21) packages/scintilla: scintilla-make.patch (1.13 -> 1.14) , scintilla.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: packages/scite/scite-make.patch diff -u packages/scite/scite-make.patch:1.6 packages/scite/scite-make.patch:1.7 --- packages/scite/scite-make.patch:1.6 Fri Oct 23 15:05:31 2009 +++ packages/scite/scite-make.patch Mon May 17 01:41:34 2010 @@ -1,5 +1,5 @@ ---- scite-1.76/scite/gtk/makefile 2007-12-01 01:27:26.000000000 +0100 -+++ scite-1.76/scite/gtk/makefile-new 2008-03-30 14:47:49.000000000 +0200 +--- scite-2.11/scite/gtk/makefile 2010-03-14 01:41:15.000000000 +0000 ++++ scite-2.11/scite/gtk/makefile 2010-05-16 23:34:00.000000000 +0000 @@ -56,12 +56,12 @@ #CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -Wwrite-strings @@ -18,8 +18,8 @@ ifndef NO_LUA @@ -102,8 +102,8 @@ - $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \ - PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \ + $(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \ + PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \ - JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS) - $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) + JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS) ================================================================ Index: packages/scite/scite.spec diff -u packages/scite/scite.spec:1.20 packages/scite/scite.spec:1.21 --- packages/scite/scite.spec:1.20 Fri Oct 23 15:06:10 2009 +++ packages/scite/scite.spec Mon May 17 01:41:34 2010 @@ -1,22 +1,17 @@ # $Revision$, $Date$ -# -# Conditional build: -%bcond_with gtk1 # use GTK+ 1.2 instead of 2.0 -# Summary: SciTE - a programmers text editor Summary(pl.UTF-8): SciTE - edytor tekstu dla programistów Name: scite -Version: 2.01 +Version: 2.11 Release: 1 License: BSD-like Group: X11/Applications Source0: http://dl.sourceforge.net/scintilla/scite%(echo %{version} | tr -d .).tgz -# Source0-md5: ef4b6b4d903c29e4ab511488a0d20f46 +# Source0-md5: 129aad231c9618aaa2c2e41226db2327 Patch0: %{name}-make.patch Patch1: %{name}-desktop.patch URL: http://scintilla.org/SciTE.html -%{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} -%{!?with_gtk1:BuildRequires: gtk+2-devel >= 1:2.0.0} +BuildRequires: gtk+2-devel >= 1:2.0.0 BuildRequires: libstdc++-devel BuildRequires: scintilla-devel >= %{version} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -43,8 +38,7 @@ %{__make} -C scite/gtk \ CC="%{__cxx}" \ OPTFLAGS="%{rpmcflags}" \ - %{?debug:DEBUG=1} \ - %{!?with_gtk1:GTK2=1} + %{?debug:DEBUG=1} %install rm -rf $RPM_BUILD_ROOT @@ -75,6 +69,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2010/05/16 23:41:34 arvenil +- up to 2.11 + Revision 1.20 2009/10/23 13:06:10 pluto - updated to 2.01. ================================================================ Index: packages/scintilla/scintilla-make.patch diff -u packages/scintilla/scintilla-make.patch:1.13 packages/scintilla/scintilla-make.patch:1.14 --- packages/scintilla/scintilla-make.patch:1.13 Fri Oct 23 12:18:46 2009 +++ packages/scintilla/scintilla-make.patch Mon May 17 01:41:34 2010 @@ -1,16 +1,16 @@ ---- scintilla/gtk/makefile.orig 2009-08-13 03:35:23.000000000 +0200 -+++ scintilla/gtk/makefile 2009-10-23 11:56:42.738805415 +0200 -@@ -7,7 +7,7 @@ - # To force GTK+ 2 build, define GTK2 on the make command line. - # To force GTK+ 1 build, define GTK1 on the make command line. +--- scintilla/gtk/makefile 2010-04-06 23:42:13.000000000 +0000 ++++ scintilla/gtk/makefile 2010-05-16 23:18:39.000000000 +0000 +@@ -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 -@@ -17,7 +17,7 @@ - RANLIB = ranlib +@@ -18,7 +18,7 @@ + endif endif -COMPLIB=../bin/scintilla.a @@ -18,7 +18,7 @@ vpath %.h ../src ../include vpath %.cxx ../src -@@ -32,7 +32,7 @@ +@@ -33,52 +33,57 @@ endif ifdef DEBUG @@ -27,35 +27,21 @@ else CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) endif -@@ -40,15 +40,15 @@ - # If explicit setting of GTK1 or GTK2 then use that else look for - # pkg-config which is an OK indication that GTK2 is available - ifdef GTK2 --CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) --MARSHALLER=scintilla-marshal.o -+CONFIGFLAGS:=pkg-config --cflags gtk+-2.0 gthread-2.0 -+MARSHALLER=scintilla-marshal.lo - else - ifdef GTK1 - CONFIGFLAGS:=$(shell gtk-config --cflags) - else - ifneq (,$(findstring /,$(shell whereis pkg-config))) + -CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0) -MARSHALLER=scintilla-marshal.o +CONFIGFLAGS:=pkg-config --cflags gtk+-2.0 gthread-2.0 +MARSHALLER=scintilla-marshal.lo - else - CONFIGFLAGS:=$(shell gtk-config --cflags) - endif -@@ -59,39 +59,46 @@ + + .cxx.o: $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< .c.o: $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $< +- +.cxx.lo: + 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=\ @@ -64,23 +50,25 @@ -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 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 +-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 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 ++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 all: $(COMPLIB) @@ -106,10 +94,9 @@ - $(AR) rc $@ $^ - $(RANLIB) $@ + libtool --tag=CXX --mode=link $(CC) -o $@ $^ -rpath $(libdir) `$(LIBCONFIG)` -+ + +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.28 packages/scintilla/scintilla.spec:1.29 --- packages/scintilla/scintilla.spec:1.28 Fri Oct 23 15:01:42 2009 +++ packages/scintilla/scintilla.spec Mon May 17 01:41:34 2010 @@ -1,22 +1,17 @@ # $Revision$, $Date$ -# -# Conditional build: -%bcond_with gtk1 # use GTK+ 1.2 instead of 2.0 -# 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.01 +Version: 2.11 %define fver %(echo %{version} | tr -d .) Release: 1 License: BSD-like Group: Libraries Source0: http://dl.sourceforge.net/scintilla/%{name}%{fver}.tgz -# Source0-md5: 3eeb4f5ccf11292ed3a332fd995a788e +# Source0-md5: 266d1cb01a31fa070fb1855d10c60185 Patch0: %{name}-make.patch URL: http://scintilla.org/ -%{?with_gtk1:BuildRequires: gtk+-devel >= 1.2.0} -%{!?with_gtk1:BuildRequires: gtk+2-devel >= 1:2.0.0} +BuildRequires: gtk+2-devel >= 1:2.0.0 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -53,8 +48,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe scintilli Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%{?with_gtk1:Requires: gtk+-devel >= 1.2.0} -%{!?with_gtk1:Requires: gtk+2-devel >= 1:2.0.0} +Requires: gtk+2-devel >= 1:2.0.0 Requires: libstdc++-devel %description devel @@ -86,8 +80,7 @@ CCOMP="%{__cc}" \ OPTFLAGS="%{rpmcflags}" \ libdir="%{_libdir}" \ - %{?debug:DEBUG=1} \ - %{!?with_gtk1:GTK2=1} + %{?debug:DEBUG=1} %install rm -rf $RPM_BUILD_ROOT @@ -127,6 +120,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.29 2010/05/16 23:41:34 arvenil +- up to 2.11 + Revision 1.28 2009/10/23 13:01:42 pluto - updated to 2.01. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scite/scite-make.patch?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scite/scite.spec?r1=1.20&r2=1.21&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scintilla/scintilla-make.patch?r1=1.13&r2=1.14&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scintilla/scintilla.spec?r1=1.28&r2=1.29&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
