Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8492
Modified Files:
scite.patch
Log Message:
update scite to 3.3.2, build with fink lua51-dev and sync trees
Index: scite.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/scite.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scite.patch 16 Feb 2012 06:27:21 -0000 1.1
+++ scite.patch 30 May 2013 23:19:37 -0000 1.2
@@ -1,59 +1,47 @@
-diff -Nurd -x'*~' scintilla.orig/gtk/makefile scintilla/gtk/makefile
---- scintilla.orig/gtk/makefile 2011-09-16 04:21:43.000000000 -0400
-+++ scintilla/gtk/makefile 2011-09-19 10:47:43.000000000 -0400
-@@ -66,9 +66,9 @@
- MARSHALLER=scintilla-marshal.o
+--- scite/gtk/makefile.orig 2013-05-21 19:02:16.000000000 -0400
++++ scite/gtk/makefile 2013-05-27 13:42:33.000000000 -0400
+@@ -63,18 +63,15 @@
+ endif
- .cxx.o:
-- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
-+ $(CC) $(CXXFLAGS) $(CONFIGFLAGS) -c $<
- .c.o:
-- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
-+ $(CCOMP) $(CFLAGS) $(CONFIGFLAGS) -w -c $<
+ ifndef NO_LUA
+-LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.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
++LUA_CORE_OBJS =
- LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
+-LUA_LIB_OBJS = lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o
ltablib.o \
+- lstrlib.o loadlib.o loslib.o linit.o
++LUA_LIB_OBJS =
-@@ -78,7 +78,7 @@
- $(DEL) *.o $(COMPLIB)
+ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
- deps:
-- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+ $(CC) -MM $(CXXFLAGS) $(CONFIGFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+-vpath %.c ../lua/src ../lua/src/lib
++vpath %.c
- $(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 \
-diff -Nurd -x'*~' scite.orig/gtk/makefile scite/gtk/makefile
---- scite.orig/gtk/makefile 2011-09-16 04:21:45.000000000 -0400
-+++ scite/gtk/makefile 2011-09-19 10:42:32.000000000 -0400
-@@ -73,13 +73,13 @@
- INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
+-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
++INCLUDEDIRS=-I ../../scintilla/include -I ../src
.c.o:
-- $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o
$@
-+ $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o
$@
-
- else
- CXXFLAGS+=-DNO_LUA
- endif
-
--CXXFLAGS:=$(CXXFLAGS) $(CXXTFLAGS) -Wno-long-long
-+CXXFLAGS:= $(CXXTFLAGS)$(CXXFLAGS) -Wno-long-long
-
- UNAME:=$(shell uname -s)
- ifeq ($(UNAME), Linux)
-@@ -90,13 +90,13 @@
- endif
-
- .cxx.o:
-- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
-+ $(CC) $(CXXFLAGS) $(CONFIGFLAGS) -c $< -o $@
-
- clean:
- rm -f *.o $(PROG)
-
- deps:
-- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+ $(CC) -MM $(CXXFLAGS) $(CONFIGFLAGS) *.cxx ../src/*.cxx | sed -e
's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o
$@
+@@ -114,7 +111,7 @@
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o
SciTEIO.o StringList.o Exporters.o StringHelpers.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,--as-needed -Wl,--version-script
lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
++ $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script
lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++ -llua
- # make should be run in ../../scintilla/gtk to compile all the lexers.
- COMPLIB=../../scintilla/bin/scintilla.a
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
+--- scite/gtk/deps.mak.orig 2013-05-27 13:31:21.000000000 -0400
++++ scite/gtk/deps.mak 2013-05-27 13:31:43.000000000 -0400
+@@ -48,9 +48,7 @@
+ LuaExtension.o: ../src/LuaExtension.cxx \
+ ../../scintilla/include/Scintilla.h ../src/GUI.h ../src/SString.h \
+ ../src/FilePath.h ../src/StyleWriter.h ../src/Extender.h \
+- ../src/LuaExtension.h ../src/IFaceTable.h ../src/SciTEKeys.h \
+- ../lua/include/lua.h ../lua/include/luaconf.h ../lua/include/lualib.h \
+- ../lua/include/lua.h ../lua/include/lauxlib.h
++ ../src/LuaExtension.h ../src/IFaceTable.h ../src/SciTEKeys.h
+ MultiplexExtension.o: ../src/MultiplexExtension.cxx \
+ ../../scintilla/include/Scintilla.h ../src/GUI.h \
+ ../src/MultiplexExtension.h ../src/Extender.h
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
